Mon May 19 15:14:22 UTC 2003 Don Hinton <dhinton@dresystems.com>

5 files changed, 25 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 8105a314d1b..b5897da7878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon May 19 15:14:22 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * tests/Test_Output.dsp:
+		  Changed output location for dll so that other projects can find it.
+
+        * tests/DLL_Test_Impl.dsp:
+        * tests/Framework_Component_DLL.dsp:
+        * tests/Service_Config_DLL.dsp:
+		  Removed dependency on Test_Output.dll which isn't needed and causes
+          build failures in the autobuilds since they don't honor the dependencies
+          in tests.dsw.
+
 Mon May 19 11:13:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/SSL/Makefile.bor:
diff --git a/tests/DLL_Test_Impl.dsp b/tests/DLL_Test_Impl.dsp
index c83ee5e57ec..c8a48fbc599 100644
--- a/tests/DLL_Test_Impl.dsp
+++ b/tests/DLL_Test_Impl.dsp
@@ -56,7 +56,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 /dll /machine:I386

-# ADD LINK32 ace.lib Test_Output.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"..\ace"

+# ADD LINK32 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "DLL_Test DLL - Win32 Debug"

 

@@ -83,7 +83,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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib Test_Outputd.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace" /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace" /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "DLL_Test DLL - Win32 Static Debug"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace"

-# ADD LINK32 acesd.lib advapi32.lib Test_Outputsd.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace" /libpath:"..\ace"

+# ADD LINK32 acesd.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace" /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "DLL_Test DLL - Win32 Static Release"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace"

-# ADD LINK32 aces.lib advapi32.lib Test_Outputs.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace" /libpath:"..\ace"

+# ADD LINK32 aces.lib advapi32.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace" /libpath:"..\ace"

 

 !ENDIF 

 

diff --git a/tests/Framework_Component_DLL.dsp b/tests/Framework_Component_DLL.dsp
index dc6b1664bcf..5f3f889cb74 100644
--- a/tests/Framework_Component_DLL.dsp
+++ b/tests/Framework_Component_DLL.dsp
@@ -56,7 +56,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 /dll /machine:I386

-# ADD LINK32 ace.lib Test_Output.lib /nologo /dll /machine:I386 /libpath:"..\ace"

+# ADD LINK32 ace.lib /nologo /dll /machine:I386 /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "Framework_Component_Test DLL - Win32 Debug"

 

@@ -83,7 +83,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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib Test_Outputd.lib /nologo /dll /debug /machine:I386 /out:"Framework_Component_DLLd.dll" /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"Framework_Component_DLLd.dll" /pdbtype:sept /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "Framework_Component_Test DLL - Win32 Static Debug"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace"

-# ADD LINK32 acesd.lib advapi32.lib Test_Outputsd.lib /nologo /dll /debug /machine:I386 /out:"Framework_Component_DLLd.dll" /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 acesd.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"Framework_Component_DLLd.dll" /pdbtype:sept /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "Framework_Component_Test DLL - Win32 Static Release"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace"

-# ADD LINK32 aces.lib advapi32.lib Test_Outputs.lib /nologo /dll /machine:I386 /out:"Framework_Component_DLL.dll" /libpath:"..\ace"

+# ADD LINK32 aces.lib advapi32.lib /nologo /dll /machine:I386 /out:"Framework_Component_DLL.dll" /libpath:"..\ace"

 

 !ENDIF 

 

diff --git a/tests/Service_Config_DLL.dsp b/tests/Service_Config_DLL.dsp
index b95542b4d55..6958569e7b1 100644
--- a/tests/Service_Config_DLL.dsp
+++ b/tests/Service_Config_DLL.dsp
@@ -81,7 +81,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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib Test_Outputd.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Service_Config_DLLd.dll" /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Service_Config_DLLd.dll" /libpath:"..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/tests/Test_Output.dsp b/tests/Test_Output.dsp
index 44b36748351..aa6326f5bb1 100644
--- a/tests/Test_Output.dsp
+++ b/tests/Test_Output.dsp
@@ -56,7 +56,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 /dll /machine:I386

-# ADD LINK32 ace.lib Test_Output.lib /nologo /dll /machine:I386 /libpath:"..\ace"

+# ADD LINK32 ace.lib /nologo /dll /machine:I386 /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "Test_Output DLL - Win32 Debug"

 

@@ -83,7 +83,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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"Test_Outputd.dll" /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Test_Outputd.dll" /pdbtype:sept /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "Test_Output DLL - Win32 Static Debug"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace"

-# ADD LINK32 acesd.lib advapi32.lib Test_Outputsd.lib /nologo /dll /debug /machine:I386 /out:"Test_Outputsd.dll" /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 acesd.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Test_Outputsd.dll" /pdbtype:sept /libpath:"..\ace"

 

 !ELSEIF  "$(CFG)" == "Test_Output DLL - Win32 Static Release"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace"

-# ADD LINK32 aces.lib advapi32.lib Test_Outputs.lib /nologo /dll /machine:I386 /out:"Test_Outputs.dll" /libpath:"..\ace"

+# ADD LINK32 aces.lib advapi32.lib /nologo /dll /machine:I386 /out:"..\bin\Test_Outputs.dll" /libpath:"..\ace"

 

 !ENDIF