ChangeLogTag:

3 files changed, 49 insertions, 100 deletions

diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Client.dsp b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Client.dsp
index 6ea962aec52..b81aefc26fc 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Client.dsp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Client.dsp
@@ -6,21 +6,20 @@
 

 CFG=Bug 1395 Client EXE - Win32 Debug

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

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

 !MESSAGE NMAKE /f "Bug_1395_Client.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

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

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "Bug_1395_Client.mak" CFG="Bug 1395 Client EXE - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Bug 1395 Client EXE - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Bug 1395 Client EXE - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -36,13 +35,14 @@ RSC=rc.exe
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /GX /O2 /MD /GR /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "$(ACE_ROOT)" /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)"

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)" /d NDEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO.lib ACE.lib /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /nologo /version:1.2.8 /subsystem:console  /machine:I386 /out:"client.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /version:1.2.8

 

 !ELSEIF  "$(CFG)" == "Bug 1395 Client EXE - Win32 Debug"

 

@@ -51,15 +51,16 @@ LINK32=link.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "$(ACE_ROOT)" /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)"

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\\" /I "..\..\..\..\\" /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)" /d _DEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAOd.lib ACEd.lib /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /nologo /version:1.2.8 /subsystem:console /debug /machine:I386 /out:"client.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"client.exe" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /version:1.2.8

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -112,10 +113,9 @@ SOURCE=.\Test.idl
 

 # PROP Ignore_Default_Tool 1

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

+OutDir=.\Release

 InputPath=.\Test.idl

 InputName=Test

-InputDir=.

-OutDir=.

 

 BuildCmds= \

 	$(ACE_ROOT)\bin\tao_idl -o $(OutDir) -Ge 1 -Sc $(InputPath)

@@ -137,17 +137,15 @@ BuildCmds= \
 

 "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

-

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "Bug 1395 Client EXE - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

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

+OutDir=.

 InputPath=.\Test.idl

 InputName=Test

-InputDir=.

-OutDir=.

 

 BuildCmds= \

 	$(ACE_ROOT)\bin\tao_idl -o $(OutDir) -Ge 1 -Sc $(InputPath)

@@ -169,10 +167,9 @@ BuildCmds= \
 

 "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.dsw b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.dsw
index b19744e82d5..dbb7c6ecc39 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.dsw
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Regression.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

-Project: "Bug 1395 Server EXE"=Bug_1395_Server.dsp - Package Owner=<4>

+Project: "Bug 1395 Client EXE"=".\Bug_1395_Client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -12,9 +12,6 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name PortableServer DLL

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name tao DLL

     End Project Dependency

     Begin Project Dependency

@@ -27,7 +24,7 @@ Package=<4>
 

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

 

-Project: "Bug 1395 Server Static EXE"=Bug_1395_Server_Static.dsp - Package Owner=<4>

+Project: "Bug 1395 Server EXE"=".\Bug_1395_Server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -36,29 +33,8 @@ Package=<5>
 Package=<4>

 {{{

     Begin Project Dependency

-    Project_Dep_Name PortableServer LIB

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name tao LIB

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL_EXE Static EXE

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ace LIB

+    Project_Dep_Name PortableServer DLL

     End Project Dependency

-}}}

-

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

-

-Project: "Bug 1395 Client EXE"=Bug_1395_Client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

     Begin Project Dependency

     Project_Dep_Name tao DLL

     End Project Dependency

@@ -72,27 +48,6 @@ Package=<4>
 

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

 

-Project: "Bug 1395 Client Static EXE"=Bug_1395_Client_Static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name tao LIB

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL_EXE Static EXE

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ace LIB

-    End Project Dependency

-}}}

-

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

-

 Global:

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Server.dsp b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Server.dsp
index e444bd30c18..b17388558fa 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Server.dsp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Bug_1395_Server.dsp
@@ -6,21 +6,20 @@
 

 CFG=Bug 1395 Server EXE - Win32 Debug

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

-!MESSAGE run the tool that generated this project file and specify the

-!MESSAGE nmake output type.  You can then use the following command:

-!MESSAGE

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

 !MESSAGE NMAKE /f "Bug_1395_Server.mak".

-!MESSAGE

+!MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

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

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "Bug_1395_Server.mak" CFG="Bug 1395 Server EXE - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Bug 1395 Server EXE - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Bug 1395 Server EXE - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -36,13 +35,14 @@ RSC=rc.exe
 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /GX /O2 /MD /GR /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "$(ACE_ROOT)" /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG=1 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)"

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)" /d NDEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_PortableServer.lib TAO.lib ACE.lib /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /nologo /version:1.2.8 /subsystem:console  /machine:I386 /out:"server.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_PortableServer.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /version:1.2.8

 

 !ELSEIF  "$(CFG)" == "Bug 1395 Server EXE - Win32 Debug"

 

@@ -51,15 +51,16 @@ LINK32=link.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /MDd /GR /Gy /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "$(ACE_ROOT)" /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d _DEBUG=1 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)"

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\\" /I "..\..\..\..\\" /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "$(ACE_ROOT)" /d _DEBUG=1

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_PortableServerd.lib TAOd.lib ACEd.lib /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /nologo /version:1.2.8 /subsystem:console /debug /machine:I386 /out:"server.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_PortableServerd.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"server.exe" /libpath:"$(TAO_ROOT)\tao\PortableServer" /libpath:"$(TAO_ROOT)\tao" /libpath:"$(ACE_ROOT)\ace" /version:1.2.8

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -132,10 +133,9 @@ SOURCE=.\Test.idl
 

 # PROP Ignore_Default_Tool 1

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

+OutDir=.\Release

 InputPath=.\Test.idl

 InputName=Test

-InputDir=.

-OutDir=.

 

 BuildCmds= \

 	$(ACE_ROOT)\bin\tao_idl -o $(OutDir) -Ge 1 -Sc $(InputPath)

@@ -157,17 +157,15 @@ BuildCmds= \
 

 "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

-

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "Bug 1395 Server EXE - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

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

+OutDir=.

 InputPath=.\Test.idl

 InputName=Test

-InputDir=.

-OutDir=.

 

 BuildCmds= \

 	$(ACE_ROOT)\bin\tao_idl -o $(OutDir) -Ge 1 -Sc $(InputPath)

@@ -189,10 +187,9 @@ BuildCmds= \
 

 "$(OutDir)\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group