Updated to include in TAO_Examples.dsw and changed the tao_idl references

in the projects.

5 files changed, 147 insertions, 29 deletions

diff --git a/TAO/examples/Simple/echo/client.dsp b/TAO/examples/Simple/echo/client.dsp
index ecb92dab48e..05520c61811 100644
--- a/TAO/examples/Simple/echo/client.dsp
+++ b/TAO/examples/Simple/echo/client.dsp
@@ -8,23 +8,21 @@ CFG=Simple Echo Client - 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 "Simple Echo Client.mak".

+!MESSAGE NMAKE /f "client.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 "Simple Echo Client.mak"\

- CFG="Simple Echo Client - Win32 Debug"

+!MESSAGE NMAKE /f "client.mak" CFG="Simple Echo Client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Echo Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Echo Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Simple Echo Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Echo Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -52,7 +50,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 orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

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

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "Simple Echo Client - Win32 Debug"

@@ -77,7 +75,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 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

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

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -132,18 +130,53 @@ SOURCE=.\EchoS_T.h
 # Begin Source File

 

 SOURCE=.\Echo.idl

-USERDEP__ECHO_="..\..\..\..\bin\tao_idl.exe"	

 

 !IF  "$(CFG)" == "Simple Echo Client - Win32 Release"

 

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Echo.idl

+InputName=Echo

+

+BuildCmds= \

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "Simple Echo Client - Win32 Debug"

 

+USERDEP__ECHO_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Echo.idl

 InputName=Echo

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/Simple/echo/server.dsp b/TAO/examples/Simple/echo/server.dsp
index fe159d81be0..2cf91d55070 100644
--- a/TAO/examples/Simple/echo/server.dsp
+++ b/TAO/examples/Simple/echo/server.dsp
@@ -8,23 +8,21 @@ CFG=Simple Echo Server - 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 "Simple Echo Server.mak".

+!MESSAGE NMAKE /f "server.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 "Simple Echo Server.mak"\

- CFG="Simple Echo Server - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="Simple Echo Server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Echo Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Echo Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Simple Echo Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Echo Server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -52,7 +50,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 orbsvcs.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

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

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "Simple Echo Server - Win32 Debug"

@@ -77,7 +75,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 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

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

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -140,18 +138,53 @@ SOURCE=.\Server_i.h
 # Begin Source File

 

 SOURCE=.\Echo.idl

-USERDEP__ECHO_="..\..\..\..\bin\tao_idl.exe"	

 

 !IF  "$(CFG)" == "Simple Echo Server - Win32 Release"

 

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Echo.idl

+InputName=Echo

+

+BuildCmds= \

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ELSEIF  "$(CFG)" == "Simple Echo Server - Win32 Debug"

 

+USERDEP__ECHO_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Echo.idl

 InputName=Echo

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/Simple/grid/client.dsp b/TAO/examples/Simple/grid/client.dsp
index 074695c225a..e94c7978a77 100644
--- a/TAO/examples/Simple/grid/client.dsp
+++ b/TAO/examples/Simple/grid/client.dsp
@@ -121,12 +121,13 @@ SOURCE=.\Grid.idl
 

 !IF  "$(CFG)" == "Simple Grid Client - Win32 Release"

 

+USERDEP__GRID_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\tao_idl\Release\tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

@@ -158,12 +159,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Simple Grid Client - Win32 Debug"

 

+USERDEP__GRID_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/Simple/grid/server.dsp b/TAO/examples/Simple/grid/server.dsp
index 1daaefd440d..fb15ebf4d5b 100644
--- a/TAO/examples/Simple/grid/server.dsp
+++ b/TAO/examples/Simple/grid/server.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Simple Grid Server - Win32 Alpha Release

+CFG=Simple Grid Server - Win32 Release

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,7 +13,7 @@ CFG=Simple Grid Server - Win32 Alpha 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 "server.mak" CFG="Simple Grid Server - Win32 Alpha Release"

+!MESSAGE NMAKE /f "server.mak" CFG="Simple Grid Server - Win32 Release"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -125,12 +125,13 @@ SOURCE=.\Grid.idl
 

 !IF  "$(CFG)" == "Simple Grid Server - Win32 Release"

 

+USERDEP__GRID_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\tao_idl\Release\tao_idl $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

@@ -162,12 +163,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "Simple Grid Server - Win32 Debug"

 

+USERDEP__GRID_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Grid.idl

 InputName=Grid

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl $(InputName).idl

+	..\..\..\..\bin\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/TAO_Examples.dsw b/TAO/examples/TAO_Examples.dsw
index f5ddb93985b..4445e8f7d16 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -66,7 +66,7 @@ Package=<4>
 

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

 

-Project: "POA FindPOA Server"=.\POA\FindPOA\FindPOA.dsp - Package Owner=<4>

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

 

 Package=<5>

 {{{

@@ -252,6 +252,54 @@ Package=<4>
 

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

 

+Project: "Simple Echo Client"=.\Simple\echo\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

+Project: "Simple Echo Server"=.\Simple\echo\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

+Project: "Simple Grid Client"=.\Simple\grid\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

+Project: "Simple Grid Server"=.\Simple\grid\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "Simple Time Client"=.\Simple\time\client.dsp - Package Owner=<4>

 

 Package=<5>