diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-19 19:46:38 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-09-19 19:46:38 +0000 |
| commit | 96ddafd9087bfadcc0739dd54970c065694cc57a (patch) | |
| tree | aba7585ad832b8f1128b42b5300e5d4ed066db76 | |
| parent | 4c7c9d9f30ba0a7e54c9695391e9c14d9025e27c (diff) | |
| download | ATCD-96ddafd9087bfadcc0739dd54970c065694cc57a.tar.gz | |
Updated projects that compile IDL files since tao_idl was moved to
$ACE_ROOT/bin.
30 files changed, 293 insertions, 279 deletions
diff --git a/TAO/examples/POA/DSI/client.dsp b/TAO/examples/POA/DSI/client.dsp index 03ea8e8f621..42bc61d8041 100644 --- a/TAO/examples/POA/DSI/client.dsp +++ b/TAO/examples/POA/DSI/client.dsp @@ -17,13 +17,12 @@ CFG=POA DSI Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA DSI Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA DSI Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA DSI Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA DSI Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
diff --git a/TAO/examples/POA/Forwarding/client.dsp b/TAO/examples/POA/Forwarding/client.dsp index c9597d19d9e..3aabb8fbfd7 100644 --- a/TAO/examples/POA/Forwarding/client.dsp +++ b/TAO/examples/POA/Forwarding/client.dsp @@ -17,13 +17,12 @@ CFG=POA Forwarding Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA Forwarding Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA Forwarding Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA Forwarding Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA Forwarding 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,13 +127,13 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA Forwarding Client - Win32 Release"
-USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -166,13 +165,14 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Forwarding Client - Win32 Debug"
-USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/POA/Forwarding/server.dsp b/TAO/examples/POA/Forwarding/server.dsp index 197d44e5ff9..563e402b979 100644 --- a/TAO/examples/POA/Forwarding/server.dsp +++ b/TAO/examples/POA/Forwarding/server.dsp @@ -17,13 +17,12 @@ CFG=POA Forwarding Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA Forwarding Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA Forwarding Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA Forwarding Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA Forwarding Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -144,13 +143,13 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA Forwarding Server - Win32 Release"
-USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -182,13 +181,14 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Forwarding Server - Win32 Debug"
-USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/POA/Generic_Servant/client.dsp b/TAO/examples/POA/Generic_Servant/client.dsp index a8fbda84406..572b8d43af6 100644 --- a/TAO/examples/POA/Generic_Servant/client.dsp +++ b/TAO/examples/POA/Generic_Servant/client.dsp @@ -17,13 +17,12 @@ CFG=POA Generic Servant Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA Generic Servant Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA Generic Servant Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA Generic Servant Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA Generic Servant Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -127,13 +126,14 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA Generic Servant Client - Win32 Release"
-# Begin Custom Build
+# PROP Ignore_Default_Tool 1
+USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ tao_idl -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -156,14 +156,14 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA Generic Servant Client - Win32 Debug"
-USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
+ tao_idl -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/POA/TIE/client.dsp b/TAO/examples/POA/TIE/client.dsp index 3d23aee1dce..14e5728d15a 100644 --- a/TAO/examples/POA/TIE/client.dsp +++ b/TAO/examples/POA/TIE/client.dsp @@ -17,13 +17,12 @@ CFG=POA TIE Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA TIE Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA TIE Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA TIE Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA TIE 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,13 +127,13 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA TIE Client - Win32 Release"
-USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -166,13 +165,14 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA TIE Client - Win32 Debug"
-USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/POA/TIE/server.dsp b/TAO/examples/POA/TIE/server.dsp index 7c5558a6123..6657b7de50c 100644 --- a/TAO/examples/POA/TIE/server.dsp +++ b/TAO/examples/POA/TIE/server.dsp @@ -17,13 +17,12 @@ CFG=POA TIE Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA TIE Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA TIE Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA TIE Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA TIE Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -136,13 +135,13 @@ SOURCE=.\Foo.idl !IF "$(CFG)" == "POA TIE Server - Win32 Release"
-USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__FOO_I="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputPath)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -174,13 +173,14 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "POA TIE Server - Win32 Debug"
-USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__FOO_I="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Foo.idl
InputName=Foo
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/Quoter/Factory_Finder.dsp b/TAO/examples/Quoter/Factory_Finder.dsp index 2154731b0e2..e8c3f237ce2 100644 --- a/TAO/examples/Quoter/Factory_Finder.dsp +++ b/TAO/examples/Quoter/Factory_Finder.dsp @@ -13,18 +13,16 @@ CFG=Quoter Factory Finder - Win32 Debug !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 "Factory_Finder.mak"\
- CFG="Quoter Factory Finder - Win32 Debug"
+!MESSAGE NMAKE /f "Factory_Finder.mak" CFG="Quoter Factory Finder - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Quoter Factory Finder - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Quoter Factory Finder - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Quoter Factory Finder - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Quoter Factory Finder - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -147,13 +145,13 @@ SOURCE=.\Quoter.idl !IF "$(CFG)" == "Quoter Factory Finder - Win32 Release"
-USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -185,13 +183,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Factory Finder - Win32 Debug"
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/Quoter/Generic_Factory.dsp b/TAO/examples/Quoter/Generic_Factory.dsp index 998edcd6be1..3a642604e7d 100644 --- a/TAO/examples/Quoter/Generic_Factory.dsp +++ b/TAO/examples/Quoter/Generic_Factory.dsp @@ -13,18 +13,16 @@ CFG=Quoter Generic Factory - Win32 Debug !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 "Generic_Factory.mak"\
- CFG="Quoter Generic Factory - Win32 Debug"
+!MESSAGE NMAKE /f "Generic_Factory.mak" CFG="Quoter Generic Factory - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Quoter Generic Factory - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Quoter Generic Factory - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Quoter Generic Factory - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Quoter Generic Factory - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -147,13 +145,13 @@ SOURCE=.\Quoter.idl !IF "$(CFG)" == "Quoter Generic Factory - Win32 Release"
-USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -185,13 +183,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Generic Factory - Win32 Debug"
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/Quoter/client.dsp b/TAO/examples/Quoter/client.dsp index 001cc1350a3..5e3dee9617c 100644 --- a/TAO/examples/Quoter/client.dsp +++ b/TAO/examples/Quoter/client.dsp @@ -17,13 +17,12 @@ CFG=Quoter Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Quoter Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Quoter Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Quoter Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Quoter Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -138,13 +137,13 @@ SOURCE=.\Quoter.idl !IF "$(CFG)" == "Quoter Client - Win32 Release"
-USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -176,13 +175,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Client - Win32 Debug"
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/Quoter/server.dsp b/TAO/examples/Quoter/server.dsp index 27da53ef3ed..222e15f2ac7 100644 --- a/TAO/examples/Quoter/server.dsp +++ b/TAO/examples/Quoter/server.dsp @@ -17,13 +17,12 @@ CFG=Quoter Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Quoter Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Quoter Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Quoter Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Quoter Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -147,13 +146,13 @@ SOURCE=.\Quoter.idl !IF "$(CFG)" == "Quoter Server - Win32 Release"
-USERDEP__QUOTE="..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -185,13 +184,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Quoter Server - Win32 Debug"
-USERDEP__QUOTE="..\..\tao_idl\tao_idl.exe"
+USERDEP__QUOTE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Quoter.idl
InputName=Quoter
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
+ tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/Simple/time/client.dsp b/TAO/examples/Simple/time/client.dsp index e3348a618d2..5a19d25c333 100644 --- a/TAO/examples/Simple/time/client.dsp +++ b/TAO/examples/Simple/time/client.dsp @@ -18,17 +18,14 @@ CFG=Simple Time Client - Win32 Alpha Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Simple Time Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple Time Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple Time Client - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Simple Time Client - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
+!MESSAGE "Simple Time Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple Time Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple Time Client - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "Simple Time Client - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -101,9 +98,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "client"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -130,9 +127,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "client"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -300,7 +297,6 @@ DEP_CPP_CLIEN=\ "..\..\..\..\ace\Synch_T.cpp"\
"..\..\..\..\ace\Synch_T.h"\
"..\..\..\..\ace\Synch_T.i"\
- "..\..\..\..\ace\sys_conf.h"\
"..\..\..\..\ace\Task.h"\
"..\..\..\..\ace\Task.i"\
"..\..\..\..\ace\Task_T.cpp"\
@@ -402,6 +398,7 @@ DEP_CPP_CLIEN=\ "..\..\..\tao\varout.i"\
NODEP_CPP_CLIEN=\
+ "..\..\..\..\ace\sys_conf.h"\
".\Client_impl.h"\
".\TimeC.h"\
@@ -571,7 +568,6 @@ DEP_CPP_TIMEC=\ "..\..\..\..\ace\Synch_T.cpp"\
"..\..\..\..\ace\Synch_T.h"\
"..\..\..\..\ace\Synch_T.i"\
- "..\..\..\..\ace\sys_conf.h"\
"..\..\..\..\ace\Task.h"\
"..\..\..\..\ace\Task.i"\
"..\..\..\..\ace\Task_T.cpp"\
@@ -673,6 +669,7 @@ DEP_CPP_TIMEC=\ "..\..\..\tao\varout.i"\
NODEP_CPP_TIMEC=\
+ "..\..\..\..\ace\sys_conf.h"\
".\TimeC.h"\
".\TimeC.i"\
".\TimeS.h"\
@@ -832,7 +829,6 @@ DEP_CPP_TIMES=\ "..\..\..\..\ace\Synch_T.cpp"\
"..\..\..\..\ace\Synch_T.h"\
"..\..\..\..\ace\Synch_T.i"\
- "..\..\..\..\ace\sys_conf.h"\
"..\..\..\..\ace\Task.h"\
"..\..\..\..\ace\Task.i"\
"..\..\..\..\ace\Task_T.cpp"\
@@ -934,6 +930,7 @@ DEP_CPP_TIMES=\ "..\..\..\tao\varout.i"\
NODEP_CPP_TIMES=\
+ "..\..\..\..\ace\sys_conf.h"\
".\TimeC.h"\
".\TimeC.i"\
".\TimeS.h"\
@@ -967,13 +964,13 @@ SOURCE=.\Time.idl !IF "$(CFG)" == "Simple Time Client - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__TIME_="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__TIME_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Time.idl
InputName=Time
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1006,13 +1003,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Simple Time Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__TIME_="..\..\..\tao_idl\tao_idl.exe"
+USERDEP__TIME_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Time.idl
InputName=Time
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/examples/Simple/time/server.dsp b/TAO/examples/Simple/time/server.dsp index aec657312ad..1837e2ba829 100644 --- a/TAO/examples/Simple/time/server.dsp +++ b/TAO/examples/Simple/time/server.dsp @@ -18,17 +18,14 @@ CFG=Simple Time Server - Win32 Alpha Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Simple Time Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple Time Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Simple Time Server - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Simple Time Server - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
+!MESSAGE "Simple Time Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple Time Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Simple Time Server - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "Simple Time Server - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -101,9 +98,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "server"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -130,9 +127,9 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir "server"
CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I "..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -300,7 +297,6 @@ DEP_CPP_SERVE=\ "..\..\..\..\ace\Synch_T.cpp"\
"..\..\..\..\ace\Synch_T.h"\
"..\..\..\..\ace\Synch_T.i"\
- "..\..\..\..\ace\sys_conf.h"\
"..\..\..\..\ace\Task.h"\
"..\..\..\..\ace\Task.i"\
"..\..\..\..\ace\Task_T.cpp"\
@@ -403,6 +399,7 @@ DEP_CPP_SERVE=\ "..\..\..\tao\varout.i"\
NODEP_CPP_SERVE=\
+ "..\..\..\..\ace\sys_conf.h"\
".\Server_impl.h"\
".\Time_impl.h"\
".\TimeC.h"\
@@ -594,7 +591,6 @@ DEP_CPP_TIMEC=\ "..\..\..\..\ace\Synch_T.cpp"\
"..\..\..\..\ace\Synch_T.h"\
"..\..\..\..\ace\Synch_T.i"\
- "..\..\..\..\ace\sys_conf.h"\
"..\..\..\..\ace\Task.h"\
"..\..\..\..\ace\Task.i"\
"..\..\..\..\ace\Task_T.cpp"\
@@ -696,6 +692,7 @@ DEP_CPP_TIMEC=\ "..\..\..\tao\varout.i"\
NODEP_CPP_TIMEC=\
+ "..\..\..\..\ace\sys_conf.h"\
".\TimeC.h"\
".\TimeC.i"\
".\TimeS.h"\
@@ -855,7 +852,6 @@ DEP_CPP_TIMES=\ "..\..\..\..\ace\Synch_T.cpp"\
"..\..\..\..\ace\Synch_T.h"\
"..\..\..\..\ace\Synch_T.i"\
- "..\..\..\..\ace\sys_conf.h"\
"..\..\..\..\ace\Task.h"\
"..\..\..\..\ace\Task.i"\
"..\..\..\..\ace\Task_T.cpp"\
@@ -957,6 +953,7 @@ DEP_CPP_TIMES=\ "..\..\..\tao\varout.i"\
NODEP_CPP_TIMES=\
+ "..\..\..\..\ace\sys_conf.h"\
".\TimeC.h"\
".\TimeC.i"\
".\TimeS.h"\
@@ -993,13 +990,13 @@ SOURCE=.\Time.idl !IF "$(CFG)" == "Simple Time Server - Win32 Release"
-USERDEP__TIME_="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__TIME_="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Time.idl
InputName=Time
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -1032,13 +1029,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Simple Time Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__TIME_="..\..\..\tao_idl\tao_idl.exe"
+USERDEP__TIME_="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Time.idl
InputName=Time
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp index ace0fafab53..3f6c88be194 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp @@ -18,17 +18,14 @@ CFG=Naming_Service - Win32 Alpha Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Naming_Service - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Naming_Service - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Naming_Service - Win32 Alpha Debug" (based on\
- "Win32 (ALPHA) Console Application")
-!MESSAGE "Naming_Service - Win32 Alpha Release" (based on\
- "Win32 (ALPHA) Console Application")
+!MESSAGE "Naming_Service - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Naming_Service - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Naming_Service - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE "Naming_Service - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
@@ -304,7 +301,6 @@ DEP_CPP_NAMIN=\ "..\..\..\ace\Synch_T.cpp"\
"..\..\..\ace\Synch_T.h"\
"..\..\..\ace\Synch_T.i"\
- "..\..\..\ace\sys_conf.h"\
"..\..\..\ace\Task.h"\
"..\..\..\ace\Task.i"\
"..\..\..\ace\Task_T.cpp"\
@@ -419,6 +415,9 @@ DEP_CPP_NAMIN=\ "..\orbsvcs\orbsvcs_export.h"\
".\Naming_Service.h"\
+NODEP_CPP_NAMIN=\
+ "..\..\..\ace\sys_conf.h"\
+
!ELSEIF "$(CFG)" == "Naming_Service - Win32 Alpha Release"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp index 2bc99bd8ad1..ed2a6b7d076 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp @@ -17,13 +17,12 @@ CFG=IDL_Cubit Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IDL_Cubit Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -134,13 +133,14 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "IDL_Cubit Client - Win32 Release"
-USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+# PROP Ignore_Default_Tool 1
+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -172,13 +172,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "IDL_Cubit Client - Win32 Debug"
-USERDEP__CUBIT="..\..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp index 48c2ac45270..cf2a1a2c921 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp @@ -13,18 +13,16 @@ CFG=IDL_Cubit Collocation Test - Win32 Debug !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 "collocation_test.mak"\
- CFG="IDL_Cubit Collocation Test - Win32 Debug"
+!MESSAGE NMAKE /f "collocation_test.mak" CFG="IDL_Cubit Collocation Test - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IDL_Cubit Collocation Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "IDL_Cubit Collocation Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Collocation Test - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Collocation Test - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -151,13 +149,14 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "IDL_Cubit Collocation Test - Win32 Release"
-USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+# PROP Ignore_Default_Tool 1
+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -189,13 +188,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "IDL_Cubit Collocation Test - Win32 Debug"
-USERDEP__CUBIT="..\..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp index 3a2e2f40148..7e28e4b3f64 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp @@ -17,13 +17,12 @@ CFG=IDL_Cubit Server - Win32 Release !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IDL_Cubit Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "IDL_Cubit Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IDL_Cubit Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -142,13 +141,14 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "IDL_Cubit Server - Win32 Release"
-USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+# PROP Ignore_Default_Tool 1
+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -180,13 +180,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "IDL_Cubit Server - Win32 Debug"
-USERDEP__CUBIT="..\..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO_IDL compiler
+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp index 78f7770fd34..3cf60385233 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp @@ -158,13 +158,13 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "MT_Cubit Client - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -197,13 +197,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "MT_Cubit Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\tao_idl\tao_idl.exe"
+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp index 07d51181044..95ac205c102 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp @@ -162,13 +162,13 @@ SOURCE=.\cubit.idl !IF "$(CFG)" == "MT_Cubit Server - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -201,13 +201,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "MT_Cubit Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__CUBIT="..\..\..\..\tao_idl\tao_idl.exe"
+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\cubit.idl
InputName=cubit
BuildCmds= \
- ..\..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/Multiple_Inheritance/client.dsp b/TAO/tests/Multiple_Inheritance/client.dsp index ec2be5a993e..597e103cb84 100644 --- a/TAO/tests/Multiple_Inheritance/client.dsp +++ b/TAO/tests/Multiple_Inheritance/client.dsp @@ -17,13 +17,12 @@ CFG=Multiple Inheritance Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Multiple Inheritance Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Multiple Inheritance Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Multiple Inheritance Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multiple Inheritance 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,12 +127,13 @@ SOURCE=.\Multiple_Inheritance.idl !IF "$(CFG)" == "Multiple Inheritance Client - Win32 Release"
+USERDEP__MULTI="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Multiple_Inheritance.idl
InputName=Multiple_Inheritance
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -165,13 +165,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Multiple Inheritance Client - Win32 Debug"
-USERDEP__MULTI="..\..\tao_idl\tao_idl.exe"
+USERDEP__MULTI="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Multiple_Inheritance.idl
InputName=Multiple_Inheritance
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/Multiple_Inheritance/server.dsp b/TAO/tests/Multiple_Inheritance/server.dsp index 1638fa0fe19..e21db9eb48d 100644 --- a/TAO/tests/Multiple_Inheritance/server.dsp +++ b/TAO/tests/Multiple_Inheritance/server.dsp @@ -17,13 +17,12 @@ CFG=Multiple Inheritance Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Multiple Inheritance Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "Multiple Inheritance Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "Multiple Inheritance Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multiple Inheritance Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -132,12 +131,13 @@ SOURCE=.\Multiple_Inheritance.idl !IF "$(CFG)" == "Multiple Inheritance Server - Win32 Release"
+USERDEP__MULTI="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL compiler
InputPath=.\Multiple_Inheritance.idl
InputName=Multiple_Inheritance
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -169,13 +169,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "Multiple Inheritance Server - Win32 Debug"
-USERDEP__MULTI="..\..\tao_idl\tao_idl.exe"
+USERDEP__MULTI="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\Multiple_Inheritance.idl
InputName=Multiple_Inheritance
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp index addf2be2bfb..c3b2a70528d 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp @@ -17,13 +17,12 @@ CFG=NU MT_Client_Test Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU MT_Client_Test Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU MT_Client_Test Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU MT_Client_Test Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU MT_Client_Test Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -138,13 +137,13 @@ SOURCE=.\MT_Client_Test.idl !IF "$(CFG)" == "NU MT_Client_Test Client - Win32 Release"
-USERDEP__MT_CL="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__MT_CL="..\..\..\.\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\MT_Client_Test.idl
InputName=MT_Client_Test
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -176,13 +175,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU MT_Client_Test Client - Win32 Debug"
-USERDEP__MT_CL="..\..\..\tao_idl\tao_idl.exe"
+USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\MT_Client_Test.idl
InputName=MT_Client_Test
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp index 15f5f8c0303..b10aedbb27e 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp @@ -17,13 +17,12 @@ CFG=NU MT_Client_Test Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU MT_Client_Test Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU MT_Client_Test Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU MT_Client_Test Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU MT_Client_Test Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -134,13 +133,13 @@ SOURCE=.\MT_Client_Test.idl !IF "$(CFG)" == "NU MT_Client_Test Server - Win32 Release"
-USERDEP__MT_CL="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__MT_CL="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\MT_Client_Test.idl
InputName=MT_Client_Test
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -172,13 +171,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU MT_Client_Test Server - Win32 Debug"
-USERDEP__MT_CL="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\MT_Client_Test.idl
InputName=MT_Client_Test
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/Reactor/client.dsp b/TAO/tests/NestedUpcall/Reactor/client.dsp index d14ce86cd58..826a005a597 100644 --- a/TAO/tests/NestedUpcall/Reactor/client.dsp +++ b/TAO/tests/NestedUpcall/Reactor/client.dsp @@ -17,13 +17,12 @@ CFG=NU Reactor Client - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU Reactor Client - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU Reactor Client - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU Reactor Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Reactor Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -138,13 +137,13 @@ SOURCE=.\Reactor.idl !IF "$(CFG)" == "NU Reactor Client - Win32 Release"
-USERDEP__REACT="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Reactor.idl
InputName=Reactor
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -176,13 +175,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU Reactor Client - Win32 Debug"
-USERDEP__REACT="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\Reactor.idl
InputName=Reactor
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/Reactor/server.dsp b/TAO/tests/NestedUpcall/Reactor/server.dsp index 8cf461d4a10..7dcf1b8d61b 100644 --- a/TAO/tests/NestedUpcall/Reactor/server.dsp +++ b/TAO/tests/NestedUpcall/Reactor/server.dsp @@ -17,13 +17,12 @@ CFG=NU Reactor Server - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU Reactor Server - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU Reactor Server - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU Reactor Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Reactor Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -138,13 +137,13 @@ SOURCE=.\Reactor.idl !IF "$(CFG)" == "NU Reactor Server - Win32 Release"
-USERDEP__REACT="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Reactor.idl
InputName=Reactor
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -176,13 +175,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU Reactor Server - Win32 Debug"
-USERDEP__REACT="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\Reactor.idl
InputName=Reactor
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp index 7ce8af2d304..4114915c5b2 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp @@ -17,13 +17,12 @@ CFG=NU Triangle Initiator - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU Triangle Initiator - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Initiator - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Initiator - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Initiator - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -134,13 +133,13 @@ SOURCE=.\Triangle_Test.idl !IF "$(CFG)" == "NU Triangle Initiator - Win32 Release"
-USERDEP__TRIAN="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -172,13 +171,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU Triangle Initiator - Win32 Debug"
-USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp index a00e7cb31ab..f15327233b2 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp @@ -17,13 +17,12 @@ CFG=NU Triangle Server_A - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU Triangle Server_A - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Server_A - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Server_A - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Server_A - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -134,13 +133,13 @@ SOURCE=.\Triangle_Test.idl !IF "$(CFG)" == "NU Triangle Server_A - Win32 Release"
-USERDEP__TRIAN="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -172,13 +171,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU Triangle Server_A - Win32 Debug"
-USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp index b11cc875521..eef5ffbbaf5 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp @@ -17,13 +17,12 @@ CFG=NU Triangle Server_B - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "NU Triangle Server_B - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Server_B - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Server_B - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "NU Triangle Server_B - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -134,13 +133,13 @@ SOURCE=.\Triangle_Test.idl !IF "$(CFG)" == "NU Triangle Server_B - Win32 Release"
-USERDEP__TRIAN="..\..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
BuildCmds= \
- ..\..\..\tao_idl\Release\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -172,13 +171,13 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "NU Triangle Server_B - Win32 Debug"
-USERDEP__TRIAN="..\..\..\tao_idl\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\Triangle_Test.idl
InputName=Triangle_Test
BuildCmds= \
- ..\..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/OctetSeq/OctetSeq.dsp b/TAO/tests/OctetSeq/OctetSeq.dsp index d98a1580650..1735ba58424 100644 --- a/TAO/tests/OctetSeq/OctetSeq.dsp +++ b/TAO/tests/OctetSeq/OctetSeq.dsp @@ -17,12 +17,12 @@ CFG=OctetSeq - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "OctetSeq - Win32 Release" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "OctetSeq - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "OctetSeq - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -118,18 +118,54 @@ SOURCE=.\testS.h # Begin Source File
SOURCE=.\test.idl
-USERDEP__TEST_="..\..\tao_idl\tao_idl.exe"
!IF "$(CFG)" == "OctetSeq - Win32 Release"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL compiler
+InputPath=.\test.idl
+InputName=test
+
+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)" == "OctetSeq - Win32 Debug"
-# Begin Custom Build - Invoking TAO IDL compiler
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\test.idl
InputName=test
BuildCmds= \
- ..\..\tao_idl\tao_idl $(InputName).idl
+ tao_idl $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp index a9827d61e67..b446f7d288b 100644 --- a/TAO/tests/Param_Test/client.dsp +++ b/TAO/tests/Param_Test/client.dsp @@ -370,52 +370,52 @@ SOURCE=.\param_test.idl !IF "$(CFG)" == "Param_Test Client - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__PARAM="..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__PARAM="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
+ tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Param_Test Client - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__PARAM="..\..\tao_idl\tao_idl.exe"
+USERDEP__PARAM="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
BuildCmds= \
- ..\..\tao_idl\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
+ tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/Param_Test/server.dsp b/TAO/tests/Param_Test/server.dsp index 5c97b765122..d22d2142c47 100644 --- a/TAO/tests/Param_Test/server.dsp +++ b/TAO/tests/Param_Test/server.dsp @@ -146,78 +146,78 @@ SOURCE=.\param_test.idl !IF "$(CFG)" == "Param_Test Server - Win32 Release"
# PROP Ignore_Default_Tool 1
-USERDEP__PARAM="..\..\tao_idl\Release\tao_idl.exe"
+USERDEP__PARAM="..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
BuildCmds= \
- ..\..\tao_idl\Release\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
+ tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Param_Test Server - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__PARAM="..\..\tao_idl\tao_idl.exe"
+USERDEP__PARAM="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO_IDL Compiler
InputPath=.\param_test.idl
InputName=param_test
BuildCmds= \
- ..\..\tao_idl\tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
+ tao_idl -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
|