Tue Jul 31 22:46:33 2001 Ossama Othman <ossama@uci.edu>

6 files changed, 49 insertions, 127 deletions

diff --git a/ChangeLog b/ChangeLog
index 59cf2ed14c4..7b88ddabec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul 31 22:46:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tests/Service_Config_DLL.dsp:
+	* tests/Service_Config_Test.dsp:
+
+	  Removed the static library configurations.  The
+	  Service_Config_Test currently requires dynamically loadable
+	  objects.  Fixes Win32 "LIB" build failures.
+
 Tue Jul 31 22:10:48 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/Service_Config_Test.cpp (run_test):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 59cf2ed14c4..7b88ddabec4 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Tue Jul 31 22:46:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tests/Service_Config_DLL.dsp:
+	* tests/Service_Config_Test.dsp:
+
+	  Removed the static library configurations.  The
+	  Service_Config_Test currently requires dynamically loadable
+	  objects.  Fixes Win32 "LIB" build failures.
+
 Tue Jul 31 22:10:48 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/Service_Config_Test.cpp (run_test):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 59cf2ed14c4..7b88ddabec4 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,12 @@
+Tue Jul 31 22:46:33 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tests/Service_Config_DLL.dsp:
+	* tests/Service_Config_Test.dsp:
+
+	  Removed the static library configurations.  The
+	  Service_Config_Test currently requires dynamically loadable
+	  objects.  Fixes Win32 "LIB" build failures.
+
 Tue Jul 31 22:10:48 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tests/Service_Config_Test.cpp (run_test):
diff --git a/tests/Service_Config_DLL.dsp b/tests/Service_Config_DLL.dsp
index 4fe6dc04b72..d5bbc4f85d9 100644
--- a/tests/Service_Config_DLL.dsp
+++ b/tests/Service_Config_DLL.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=Service_Config_DLL - Win32 Static Release

+CFG=Service_Config_DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,14 +13,12 @@ CFG=Service_Config_DLL - Win32 Static Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Service_Config_DLL.mak" CFG="Service_Config_DLL - Win32 Static Release"

+!MESSAGE NMAKE /f "Service_Config_DLL.mak" CFG="Service_Config_DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Service_Config_DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "Service_Config_DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "Service_Config_DLL - Win32 Static Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "Service_Config_DLL - Win32 Static Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -86,76 +84,12 @@ LINK32=link.exe
 # ADD LINK32 ACEd.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Service_Config_DLLd.dll" /libpath:"../ace"

 # SUBTRACT LINK32 /pdb:none

 

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Service_Config_DLL___Win32_Static_Debug"

-# PROP BASE Intermediate_Dir "Service_Config_DLL___Win32_Static_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\LIB\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TEST_BUILD_DLL" /FD /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT CPP /Fr /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

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

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 ACEsd.lib /nologo /dll /debug /machine:I386 /out:"Static_Debug\Service_Config_DLLsd.lib" /libpath:"../ace"

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Service_Config_DLL___Win32_Static_Release"

-# PROP BASE Intermediate_Dir "Service_Config_DLL___Win32_Static_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\LIB\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TEST_BUILD_DLL" /FD /c

-# SUBTRACT BASE CPP /Fr /YX

-# ADD CPP /nologo /MT /W3 /Gm /GX /Zi /Od /I ".." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

-# SUBTRACT CPP /Fr /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

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

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 ACEs.lib /nologo /dll /debug /machine:I386 /out:"Service_Config_DLLs.lib" /libpath:"../ace"

-# SUBTRACT LINK32 /pdb:none

-

 !ENDIF 

 

 # Begin Target

 

 # Name "Service_Config_DLL - Win32 Release"

 # Name "Service_Config_DLL - Win32 Debug"

-# Name "Service_Config_DLL - Win32 Static Debug"

-# Name "Service_Config_DLL - Win32 Static Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx"

diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp
index 190cc4a74ac..a7dce09aa41 100644
--- a/tests/Service_Config_Test.dsp
+++ b/tests/Service_Config_Test.dsp
@@ -17,8 +17,6 @@ CFG=Service_Config_Test - Win32 Release
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Service_Config_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Service_Config_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Service_Config_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Service_Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

@@ -30,57 +28,7 @@ CFG=Service_Config_Test - Win32 Release
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Service_Config_Test - Win32 Static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Static_Release"

-# PROP Intermediate_Dir "Static_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# 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 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 Release"

+!IF  "$(CFG)" == "Service_Config_Test - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -134,8 +82,6 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "Service_Config_Test - Win32 Static Debug"

-# Name "Service_Config_Test - Win32 Static Release"

 # Name "Service_Config_Test - Win32 Release"

 # Name "Service_Config_Test - Win32 Debug"

 # Begin Group "Source Files"

@@ -146,6 +92,10 @@ LINK32=link.exe
 SOURCE=.\Service_Config_Test.cpp

 # End Source File

 # End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

@@ -154,9 +104,5 @@ SOURCE=.\Service_Config_Test.cpp
 SOURCE=.\test_config.h

 # End Source File

 # End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

 # End Target

 # End Project

diff --git a/tests/tests.dsw b/tests/tests.dsw
index 2b1ce685164..d0dd0fd564f 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -930,6 +930,18 @@ Package=<4>
 

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

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

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

 

 Package=<5>

@@ -938,6 +950,9 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name Service_Config_DLL

+    End Project Dependency

 }}}

 

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