ChangeLogTag:Thu Jul 01 18:01:13 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

8 files changed, 19 insertions, 41 deletions

diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
index 40b8420b51c..152f6fe028d 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
@@ -39,6 +39,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

@@ -49,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

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

 

diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
index e2e9c42fe0f..72422a83105 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
@@ -40,9 +40,10 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -50,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

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

 

diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
index b9ecd48409b..479c87d0b52 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

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

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib aced.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

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

 

diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
index fa1d0de9124..fc2a0e0d5d9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

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

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Sched_Conf.exe"

+# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Sched_Conf.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 

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

 

diff --git a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
index cd02ac9321c..e4c31473eb5 100644
--- a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/orbsvcs/tests/Trading/Import_Test.dsp b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
index d3fa87a6b1f..8669aeead50 100644
--- a/TAO/orbsvcs/tests/Trading/Import_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
index 7974f093e51..a89d4112e49 100644
--- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp
+++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
@@ -22,11 +22,9 @@ CFG=TradingLib - Win32 Debug
 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "TradingLib - Win32 Release"

 

@@ -40,11 +38,12 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Release"

 # PROP Target_Dir ""

+RSC=rc.exe

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -64,11 +63,12 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Debug"

 # PROP Target_Dir ""

+RSC=rc.exe

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -160,7 +160,7 @@ InputPath=.\TTest.idl
 InputName=TTest

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -198,7 +198,7 @@ InputPath=.\TTest.idl
 InputName=TTest

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/tests.dsw b/TAO/orbsvcs/tests/tests.dsw
index b03ae5e6b85..0a1808a77b9 100644
--- a/TAO/orbsvcs/tests/tests.dsw
+++ b/TAO/orbsvcs/tests/tests.dsw
@@ -132,30 +132,6 @@ Package=<4>
 

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

 

-Project: "Logger Test Client"=.\Logger\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Logger Test Server"=.\Logger\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Sched_Conf"=.\Sched_Conf\Sched_Conf.dsp - Package Owner=<4>

 

 Package=<5>