ChangeLogTag:Thu Nov 07 12:21:21 2002 Nanbor Wang <nanbor@cs.wustl.edu>

5 files changed, 18 insertions, 18 deletions

diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw
index ffaad15c080..4ef0f9f8c59 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

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

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

 

 Package=<5>

 {{{

diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp
index e7a3b5279f3..ced3e56f3f7 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Logging_Service.dsp
@@ -8,12 +8,12 @@ CFG=Logging_Service - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "Basic_Logging_Service.mak".

+!MESSAGE NMAKE /f "Logging_Service.mak".

 !MESSAGE 

 !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 "Basic_Logging_Service.mak" CFG="Logging_Service - Win32 Debug"

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

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -37,15 +37,15 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release\Logging_Service"

-# PROP Intermediate_Dir "Release\Logging_Service"

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE CPP /nologo /W3 /GX /D "WIN32" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

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

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

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

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

 BSC32=bscmake.exe

@@ -53,7 +53,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 ACE.lib TAO.lib TAO_PortableServer.lib  TAO_DynamicAny.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_CosTrading.lib TAO_DsLogAdmin.lib /nologo /subsystem:console /machine:I386 /out:"Logging_Service.exe" /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"

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

 # SUBTRACT LINK32 /pdb:none

 

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

@@ -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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib 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 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp
index ad436c7e44d..d9bb0026417 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -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 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 TAO_CosNaming.lib TAO_DsLogAdmin.lib TAO_PortableServerd.lib TAO_CosEvent.lib ace.lib tao.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"

+# ADD LINK32 TAO.lib TAO_DsEventLogAdmin.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib TAO_CosEvent.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

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

@@ -77,7 +77,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 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 /pdbtype:sept

-# ADD LINK32 TAOd.lib TAO_DsEventLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib TAO_CosEventd.lib 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 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 TAOd.lib TAO_DsEventLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib TAO_CosEventd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp
index 8634b015b0e..45681d15530 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.dsp
@@ -37,13 +37,13 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 MTL=midl.exe

 # 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 0x809 /d "NDEBUG"

 # ADD RSC /l 0x809 /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 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 TAO_PortableServer.lib  TAO_DynamicAny.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_CosTrading.lib TAO_DsLogAdmin.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"

+# ADD LINK32 TAO_IORTable.lib TAO.lib TAO_CosNotification.lib TAO_DsNotifyLogAdmin.lib ace.lib TAO_PortableServer.lib TAO_DsLogAdmin.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

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

@@ -77,7 +77,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 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 /pdbtype:sept

-# ADD LINK32 TAO_IORTabled.lib TAOd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib 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 /pdbtype:sept /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

+# ADD LINK32 TAO_IORTabled.lib TAOd.lib TAO_CosNotificationd.lib TAO_DsNotifyLogAdmind.lib aced.lib TAO_PortableServerd.lib TAO_DsLogAdmind.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp
index 4b075260be1..2568185d719 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.dsp
@@ -37,13 +37,13 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 MTL=midl.exe

 # 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" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

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

 # ADD RSC /l 0x809 /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 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 TAO_PortableServer.lib  TAO_DynamicAny.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_CosTrading.lib TAO_DsLogAdmin.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 /libpath:"../../orbsvcs" /libpath:"../../tao" /libpath:"../../../ace" /libpath:"../../tao/PortableServer"

+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_PortableServer.lib TAO.lib ace.lib TAO_DsLogAdmin.lib TAO_RTEventLog.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

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