ChangeLogTag:Thu Nov 27 13:10:48 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

4 files changed, 124 insertions, 104 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
index f722e3cb83b..c4bf154431a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.dsp
@@ -6,21 +6,20 @@
 

 CFG=airplane_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 "airplane_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 "airplane_client.mak" CFG="airplane_client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

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

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

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -35,14 +34,18 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release\airplane_client"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:"Release\airplane_client.pdb"  /machine:I386 /out:"Release\airplane_client.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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

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

 

@@ -50,16 +53,20 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\airplane_client"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:".\airplane_client.pdb" /debug /machine:I386 /out:".\airplane_client.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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -132,13 +139,13 @@ SOURCE=".\Airplane.idl"
 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Airplane.idl

+InputPath=".\Airplane.idl"

 InputName=Airplane

-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)

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

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

    $(BuildCmds)

-

 # End Custom Build

 

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

 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Airplane.idl

+InputPath=".\Airplane.idl"

 InputName=Airplane

-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 +195,9 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
index da05c4d050e..11be647e997 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.dsp
@@ -6,21 +6,20 @@
 

 CFG=airplane_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 "airplane_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 "airplane_server.mak" CFG="airplane_server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

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

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

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -35,14 +34,18 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release\airplane_server"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:"Release\airplane_server.pdb"  /machine:I386 /out:"Release\airplane_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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

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

 

@@ -50,16 +53,20 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\airplane_server"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:".\airplane_server.pdb" /debug /machine:I386 /out:".\airplane_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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -140,13 +147,13 @@ SOURCE=".\Airplane.idl"
 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Airplane.idl

+InputPath=".\Airplane.idl"

 InputName=Airplane

-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)

@@ -165,20 +172,19 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

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

 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Airplane.idl

+InputPath=".\Airplane.idl"

 InputName=Airplane

-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)

@@ -197,10 +203,9 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
index ce65041ec5a..84e46feb536 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
@@ -6,21 +6,20 @@
 

 CFG=nestea_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 "nestea_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 "nestea_client.mak" CFG="nestea_client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

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

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

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -35,14 +34,18 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release\nestea_client"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:"Release\nestea_client.pdb"  /machine:I386 /out:"Release\nestea_client.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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

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

 

@@ -50,16 +53,20 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\nestea_client"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:".\nestea_client.pdb" /debug /machine:I386 /out:".\nestea_client.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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -132,13 +139,13 @@ SOURCE=".\Nestea.idl"
 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Nestea.idl

+InputPath=".\Nestea.idl"

 InputName=Nestea

-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)

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

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

    $(BuildCmds)

-

 # End Custom Build

 

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

 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Nestea.idl

+InputPath=".\Nestea.idl"

 InputName=Nestea

-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 +195,9 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
index 27d6a0d16a8..f04f7edb051 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
@@ -6,21 +6,20 @@
 

 CFG=nestea_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 "nestea_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 "nestea_server.mak" CFG="nestea_server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

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

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

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -35,14 +34,18 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release\nestea_server"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:"Release\nestea_server.pdb"  /machine:I386 /out:"Release\nestea_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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

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

 

@@ -50,16 +53,20 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir "Debug\nestea_server"

+# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

 # SUBTRACT CPP /YX

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

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409 /i "..\..\..\orbsvcs" /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:"..\..\..\..\lib" /nologo /version:1.3.4 /subsystem:console /pdb:".\nestea_server.pdb" /debug /machine:I386 /out:".\nestea_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 /libpath:"../../orbsvcs" /libpath:"../../../tao/IORTable" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/Valuetype" /libpath:"../../../tao/IORInterceptor" /libpath:"../../../tao/ObjRefTemplate" /libpath:"../../../tao" /libpath:"../../../../ace"

+# SUBTRACT LINK32 /pdb:none

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -140,13 +147,13 @@ SOURCE=".\Nestea.idl"
 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Nestea.idl

+InputPath=".\Nestea.idl"

 InputName=Nestea

-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)

@@ -165,20 +172,19 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

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

 

 # PROP Ignore_Default_Tool 1

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

-InputPath=.\Nestea.idl

+InputPath=".\Nestea.idl"

 InputName=Nestea

-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)

@@ -197,10 +203,9 @@ BuildCmds= \
 

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

    $(BuildCmds)

-

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group