ChangeLogTag: Fri Dec 5 14:03:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 58 insertions, 52 deletions

diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Client.dsp b/TAO/tests/Bug_1627_Regression/Bug_1627_Client.dsp
index 240468da8dc..35a388df030 100644
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Client.dsp
+++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Client.dsp
@@ -6,21 +6,20 @@
 

 CFG=Bug_1627_Client - 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_1627_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_1627_Client.mak" CFG="Bug_1627_Client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

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

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

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

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

 # PROP Intermediate_Dir "Release\Bug_1627_Client"

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG /i "..\.." /i "..\..\tao" /i "..\..\.."

+# ADD BASE RSC /l 0x413

+# ADD RSC /l 0x409 /i "..\.." /i "..\..\tao" /i "..\..\.." /d "NDEBUG"

 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:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /nologo /version:1.3.5 /subsystem:console /pdb:"Release\client.pdb"  /machine:I386 /out:"Release\client.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\client.exe" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /version:1.3.5

+# SUBTRACT LINK32 /pdb:none

 

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

 

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

 # PROP Intermediate_Dir "Debug\Bug_1627_Client"

 # PROP Target_Dir ""

-# ADD CPP /nologo /Ob0 /W3 /Gm /GX /Zi /MDd /GR /Gy /I "..\.." /I "..\..\tao" /I "..\..\.." /D _DEBUG /D WIN32 /D _CONSOLE /FD /c

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

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d _DEBUG /i "..\.." /i "..\..\tao" /i "..\..\.."

+# ADD BASE RSC /l 0x413

+# ADD RSC /l 0x409 /i "..\.." /i "..\..\tao" /i "..\..\.." /d "_DEBUG"

 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:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /nologo /version:1.3.5 /subsystem:console /pdb:".\client.pdb" /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:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /version:1.3.5

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -112,13 +117,13 @@ SOURCE=".\Test.idl"
 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Test.idl

+InputPath=".\Test.idl"

 InputName=Test

-InputDir=.

 

 BuildCmds= \

 	PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\tao_idl -o . -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath)

+	..\..\..\bin\release\tao_idl -o . -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \

+	

 

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

    $(BuildCmds)

@@ -137,20 +142,19 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

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

 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Test.idl

+InputPath=".\Test.idl"

 InputName=Test

-InputDir=.

 

 BuildCmds= \

 	PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\tao_idl -o . -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath)

+	..\..\..\bin\tao_idl -o . -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \

+	

 

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

    $(BuildCmds)

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

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

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Server.dsp b/TAO/tests/Bug_1627_Regression/Bug_1627_Server.dsp
index a957706f4e5..5a96e613ca6 100644
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Server.dsp
+++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Server.dsp
@@ -6,21 +6,20 @@
 

 CFG=Bug_1627_Server - 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_1627_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_1627_Server.mak" CFG="Bug_1627_Server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

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

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

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

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

 # PROP Intermediate_Dir "Release\Bug_1627_Server"

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d NDEBUG /i "..\.." /i "..\..\tao" /i "..\..\.."

+# ADD BASE RSC /l 0x413

+# ADD RSC /l 0x409 /i "..\.." /i "..\..\tao" /i "..\..\.." /d "NDEBUG"

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_IORTable.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO.lib ACE.lib /libpath:"..\..\tao\IORTable" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /nologo /version:1.3.5 /subsystem:console /pdb:"Release\server.pdb"  /machine:I386 /out:"Release\server.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_IORTable.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /out:"Release\server.exe" /libpath:"..\..\tao\IORTable" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /version:1.3.5

+# SUBTRACT LINK32 /pdb:none

 

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

 

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

 # PROP Intermediate_Dir "Debug\Bug_1627_Server"

 # PROP Target_Dir ""

-# ADD CPP /nologo /Ob0 /W3 /Gm /GX /Zi /MDd /GR /Gy /I "..\.." /I "..\..\tao" /I "..\..\.." /D _DEBUG /D WIN32 /D _CONSOLE /FD /c

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

 # SUBTRACT CPP /YX

-# ADD RSC /l 0x409 /d _DEBUG /i "..\.." /i "..\..\tao" /i "..\..\.."

+# ADD BASE RSC /l 0x413

+# ADD RSC /l 0x409 /i "..\.." /i "..\..\tao" /i "..\..\.." /d "_DEBUG"

 BSC32=bscmake.exe

-# ADD BSC32 /nologo 

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_IORTabled.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_ObjRefTemplated.lib TAOd.lib ACEd.lib /libpath:"..\..\tao\IORTable" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /nologo /version:1.3.5 /subsystem:console /pdb:".\server.pdb" /debug /machine:I386 /out:".\server.exe"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_IORTabled.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_ObjRefTemplated.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:".\server.exe" /libpath:"..\..\tao\IORTable" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\..\lib" /version:1.3.5

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -132,13 +137,13 @@ SOURCE=".\Test.idl"
 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Test.idl

+InputPath=".\Test.idl"

 InputName=Test

-InputDir=.

 

 BuildCmds= \

 	PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\tao_idl -o . -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath)

+	..\..\..\bin\release\tao_idl -o . -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \

+	

 

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

    $(BuildCmds)

@@ -157,20 +162,19 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

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

 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Test.idl

+InputPath=".\Test.idl"

 InputName=Test

-InputDir=.

 

 BuildCmds= \

 	PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\tao_idl -o . -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath)

+	..\..\..\bin\tao_idl -o . -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \

+	

 

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

    $(BuildCmds)

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

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

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group