TAO_IDL moved.

3 files changed, 272 insertions, 103 deletions

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 8bc4129deb0..0ccd54eca35 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -57,7 +57,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:windows /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\bin\orbsvcs.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

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

 

@@ -87,7 +87,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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"orbsvcsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\bin\orbsvcsd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

@@ -27116,13 +27116,13 @@ SOURCE=.\CosConcurrencyControl.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSCONC="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosConcurrencyControl.idl

 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27155,13 +27155,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSCONC="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosConcurrencyControl.idl

 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -27172,13 +27181,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -27261,13 +27270,13 @@ SOURCE=.\CosLifeCycle.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLIFE="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27300,13 +27309,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLIFE="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -27317,13 +27335,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -27406,13 +27424,13 @@ SOURCE=.\CosNaming.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNAMIN="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27445,13 +27463,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNAMIN="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -27462,13 +27489,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -27551,13 +27578,13 @@ SOURCE=.\CosTimeBase.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTIME="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosTimeBase.idl

 InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27590,13 +27617,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTIME="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosTimeBase.idl

 InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -27607,13 +27643,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -27696,13 +27732,13 @@ SOURCE=.\CosTrading.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosTrading.idl

 InputName=CosTrading

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27735,13 +27771,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\tao_idl\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\CosTrading.idl

 InputName=CosTrading

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27859,13 +27895,13 @@ SOURCE=.\LifeCycleService.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFECYC="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -27898,13 +27934,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFECYC="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -27915,13 +27960,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -28004,13 +28049,13 @@ SOURCE=.\Logger.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LOGGER_="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\Logger.idl

 InputName=Logger

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28043,13 +28088,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LOGGER_="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\Logger.idl

 InputName=Logger

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -28060,13 +28114,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -28149,13 +28203,13 @@ SOURCE=.\RtecEventChannelAdmin.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEVENT="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28188,13 +28242,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEVENT="..\..\TAO_IDL\tao_idl.exe"	"RtecEventComm.idl"	"RtecScheduler.idl"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -28205,13 +28268,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -28294,13 +28357,13 @@ SOURCE=.\RtecEventComm.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEVENTC="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28333,13 +28396,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEVENTC="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -28350,13 +28422,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -28439,13 +28511,13 @@ SOURCE=.\RtecScheduler.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECSCH="..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28478,13 +28550,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECSCH="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -28495,13 +28576,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

@@ -28584,12 +28665,13 @@ SOURCE=.\RtecUDPAdmin.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\tao_idl\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -28622,13 +28704,22 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\TAO_IDL\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

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

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

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\tao_idl\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=TAO_ORBSVCS_Export                                 -Wb,export_include=orbsvcs_export.h $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

 

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

    $(BuildCmds)

@@ -28639,13 +28730,13 @@ BuildCmds= \
 "$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 # End Custom Build

 

diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
index df177405f77..6b4abfba040 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
@@ -17,13 +17,12 @@ CFG=Simple Naming Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

- "Win32 (x86) Console Application")

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

- "Win32 (x86) Console Application")

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

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

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -128,14 +127,51 @@ SOURCE=.\test_object.idl
 

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

 

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\test_object.idl

+InputName=test_object

+

+BuildCmds= \

+	tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

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

 

+# PROP Ignore_Default_Tool 1

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test_object.idl

 InputName=test_object

 

 BuildCmds= \

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

+	tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
index e1a1f4781b1..7974f093e51 100644
--- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp
+++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
@@ -22,9 +22,11 @@ CFG=TradingLib - Win32 Debug
 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "TradingLib - Win32 Release"

 

@@ -41,6 +43,8 @@ CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -63,6 +67,8 @@ LIB32=link.exe -lib
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -149,14 +155,50 @@ SOURCE=.\TTest.idl
 

 !IF  "$(CFG)" == "TradingLib - Win32 Release"

 

+# Begin Custom Build - Invoking TAO_IDL compiler

+InputPath=.\TTest.idl

+InputName=TTest

+

+BuildCmds= \

+	tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

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

 

+# PROP Ignore_Default_Tool 1

 # Begin Custom Build - Invoking TAO_IDL compiler

 InputPath=.\TTest.idl

 InputName=TTest

 

 BuildCmds= \

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

+	tao_idl $(InputName).idl

 

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

    $(BuildCmds)