ChangeLogTag: Sun Nov 30 12:15:45 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 10 insertions, 4 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp b/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp
index 211697dd711..2262385358d 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Notify_Test_Destroy.dsp
@@ -34,6 +34,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release\Notify_Test_Destroy"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\orbsvcs\tests\Notify\lib" /I "..\..\..\..\orbsvcs" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

@@ -43,7 +44,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib NotifyTests.lib TAO_CosNotification.lib TAO_DynamicAny.lib TAO_ETCL.lib TAO_CosEvent.lib TAO_Messaging.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO_IORTable.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\Notify_Tests_Destroy.exe" /libpath:"..\..\..\..\..\lib" /version:1.3.4

+# ADD LINK32 advapi32.lib user32.lib TAO_NotifyTests.lib TAO_CosNotification.lib TAO_DynamicAny.lib TAO_ETCL.lib TAO_CosEvent.lib TAO_Messaging.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO_IORTable.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\Notify_Tests_Destroy.exe" /libpath:"..\..\..\..\..\lib" /libpath:"..\lib" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\Messaging" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\IORTable" /version:1.3.4

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "Notify_Test_Destroy - Win32 Debug"

@@ -62,7 +63,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib NotifyTestsd.lib TAO_CosNotificationd.lib TAO_DynamicAnyd.lib TAO_ETCLd.lib TAO_CosEventd.lib TAO_Messagingd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_ObjRefTemplated.lib TAO_IORTabled.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\Notify_Tests_Destroy.exe" /libpath:"..\..\..\..\..\lib" /version:1.3.4

+# ADD LINK32 advapi32.lib user32.lib TAO_NotifyTestsd.lib TAO_CosNotificationd.lib TAO_DynamicAnyd.lib TAO_ETCLd.lib TAO_CosEventd.lib TAO_Messagingd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_ObjRefTemplated.lib TAO_IORTabled.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\Notify_Tests_Destroy.exe" /libpath:"..\lib" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\orbsvcs\orbsvcs\ETCL" /libpath:"..\..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\tao\Messaging" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Valuetype" /libpath:"..\..\..\..\tao\IORInterceptor" /libpath:"..\..\..\..\tao\ObjRefTemplate" /libpath:"..\..\..\..\tao\IORTable" /version:1.3.4

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
index 805c776767b..1855be47f08 100644
--- a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
+++ b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
@@ -357,7 +357,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Notify_Test_Destroy EXE"=.\Destroy\Notify_Test_Destroy.dsp - Package Owner=<4>

+Project: "Notify_Test_Destroy"=.\Destroy\Notify_Test_Destroy.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -365,6 +365,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name TAO_NotifyTests DLL

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -516,7 +519,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TAO_RT_NotifyTests_Filter DLL"=.\Test_Filter\TAO_RT_NotifyTests_Filter.dsp - Package Owner=<4>

+Project: "TAO_RT_NotifyTests_Filter"=.\Test_Filter\TAO_RT_NotifyTests_Filter.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
index 5687cbcac13..9c9dc64fcd5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
+++ b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
@@ -398,6 +398,7 @@ SOURCE=.\Activation_Manager.idl
 !IF  "$(CFG)" == "TAO_NotifyTests DLL - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

+USERDEP__ACTIV="..\..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 OutDir=.\.

 InputPath=.\Activation_Manager.idl

@@ -428,6 +429,7 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "TAO_NotifyTests DLL - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

+USERDEP__ACTIV="..\..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler on $(InputPath)

 OutDir=.\.

 InputPath=.\Activation_Manager.idl