diff options
author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-01 17:30:18 +0000 |
---|---|---|
committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-05-01 17:30:18 +0000 |
commit | 3c579bdb92ee618ee038bddf51036d16684e14b3 (patch) | |
tree | 45f6a606f353b39410539a48a4b136ee8a8c53ba | |
parent | 2c553b48a8507a0d7a9171ff5413ee8b7fed943c (diff) | |
download | ATCD-3c579bdb92ee618ee038bddf51036d16684e14b3.tar.gz |
ChangeLogTag:Mon May 1 10:25:11 2000 Darrell Brunsch <brunsch@uci.edu>
23 files changed, 524 insertions, 84 deletions
diff --git a/ChangeLog b/ChangeLog index a5558af0c55..e2bdc93c851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon May 1 10:27:48 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_compile_win32.pl: + + Some minor changes that should make the Win32 builds clean + ( which I want to see once before bugging Nanbor to switch + to my script :-) ) + Mon May 01 02:06:02 2000 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Malloc_T.cpp (avail_chunks): Changed to use do-while loop to diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a5558af0c55..e2bdc93c851 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Mon May 1 10:27:48 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_compile_win32.pl: + + Some minor changes that should make the Win32 builds clean + ( which I want to see once before bugging Nanbor to switch + to my script :-) ) + Mon May 01 02:06:02 2000 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Malloc_T.cpp (avail_chunks): Changed to use do-while loop to diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a5558af0c55..e2bdc93c851 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Mon May 1 10:27:48 2000 Darrell Brunsch <brunsch@uci.edu> + + * bin/auto_compile_win32.pl: + + Some minor changes that should make the Win32 builds clean + ( which I want to see once before bugging Nanbor to switch + to my script :-) ) + Mon May 01 02:06:02 2000 Nanbor Wang <nanbor@cs.wustl.edu> * ace/Malloc_T.cpp (avail_chunks): Changed to use do-while loop to diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index a4c507a6501..046607620ac 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,28 @@ +Mon May 1 10:25:11 2000 Darrell Brunsch <brunsch@uci.edu> + + * examples/POA/FindPOA/FindPOA.dsp: + * examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp: + * examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp: + * examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp: + * orbsvcs/examples/CosEC/Factory/FactoryClient.dsp: + * orbsvcs/examples/CosEC/Factory/FactoryServer.dsp: + * orbsvcs/tests/Simple_Naming/client.dsp: + * orbsvcs/tests/Trading/TradingLib.dsp: + * performance-tests/Pluggable/client.dsp: + * performance-tests/Pluggable/server.dsp: + * performance-tests/RTCorba/Oneways/Reliable/client.dsp: + * performance-tests/RTCorba/Oneways/Reliable/server.dsp: + * tests/AMI/AMI_Test_Client.dsp: + * tests/AMI/AMI_Test_Server.dsp: + * tests/AMI/AMI_Test_Simple_Client.dsp: + * tests/IDL_Test/idl_test.dsp: + * tests/Smart_Proxies/client.dsp: + * tests/Smart_Proxies/server.dsp: + + All of these files had some problem with either the release + config not being set up correctly or the IDL file compile + command not being totally compliant. + Mon May 1 09:15:18 2000 Carlos O'Ryan <coryan@uci.edu> * TAOC.h: diff --git a/TAO/examples/POA/FindPOA/FindPOA.dsp b/TAO/examples/POA/FindPOA/FindPOA.dsp index b7acb911923..2e84fceda89 100644 --- a/TAO/examples/POA/FindPOA/FindPOA.dsp +++ b/TAO/examples/POA/FindPOA/FindPOA.dsp @@ -17,13 +17,12 @@ CFG=POA FindPOA - Win32 Debug !MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "POA FindPOA - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "POA FindPOA - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "POA FindPOA - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "POA FindPOA - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
+# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
@@ -52,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "POA FindPOA - Win32 Debug"
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp index bf4e6ef170a..f0ede4a72d3 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp +++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="Persistent Grid Client Files" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Persistent Grid Client" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Persistent Grid Client Files - Win32 Debug
+CFG=Persistent Grid Client - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=Persistent Grid Client Files - 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 "Persistent_Grid_Client_Files.mak" CFG="Persistent Grid Client Files - Win32 Debug"
+!MESSAGE NMAKE /f "Persistent_Grid_Client_Files.mak" CFG="Persistent Grid Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Persistent Grid Client Files - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Persistent Grid Client Files - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent Grid Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent Grid Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=Persistent Grid Client Files - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Persistent Grid Client Files - Win32 Release"
+!IF "$(CFG)" == "Persistent Grid Client - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -53,7 +53,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
-!ELSEIF "$(CFG)" == "Persistent Grid Client Files - Win32 Debug"
+!ELSEIF "$(CFG)" == "Persistent Grid Client - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target
-# Name "Persistent Grid Client Files - Win32 Release"
-# Name "Persistent Grid Client Files - Win32 Debug"
+# Name "Persistent Grid Client - Win32 Release"
+# Name "Persistent Grid Client - Win32 Debug"
# Begin Group "Source FIles"
# PROP Default_Filter ""
@@ -131,9 +131,9 @@ SOURCE=.\GridS.h SOURCE=.\Grid.idl
-!IF "$(CFG)" == "Persistent Grid Client Files - Win32 Release"
+!IF "$(CFG)" == "Persistent Grid Client - Win32 Release"
-!ELSEIF "$(CFG)" == "Persistent Grid Client Files - Win32 Debug"
+!ELSEIF "$(CFG)" == "Persistent Grid Client - Win32 Debug"
# Begin Custom Build
InputPath=.\Grid.idl
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp index 9ad8cd2689a..651caae9221 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp +++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="Persistent Grid Second Client FIles" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Persistent Grid Second Client" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Persistent Grid Second Client FIles - Win32 Debug
+CFG=Persistent Grid Second Client - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=Persistent Grid Second Client FIles - 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 "Persistent_Grid_Second_Client_Files.mak" CFG="Persistent Grid Second Client FIles - Win32 Debug"
+!MESSAGE NMAKE /f "Persistent_Grid_Second_Client_Files.mak" CFG="Persistent Grid Second Client - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Persistent Grid Second Client FIles - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Persistent Grid Second Client FIles - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent Grid Second Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent Grid Second Client - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=Persistent Grid Second Client FIles - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Persistent Grid Second Client FIles - Win32 Release"
+!IF "$(CFG)" == "Persistent Grid Second Client - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -53,7 +53,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
-!ELSEIF "$(CFG)" == "Persistent Grid Second Client FIles - Win32 Debug"
+!ELSEIF "$(CFG)" == "Persistent Grid Second Client - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target
-# Name "Persistent Grid Second Client FIles - Win32 Release"
-# Name "Persistent Grid Second Client FIles - Win32 Debug"
+# Name "Persistent Grid Second Client - Win32 Release"
+# Name "Persistent Grid Second Client - Win32 Debug"
# Begin Group "Source FIles"
# PROP Default_Filter ""
@@ -131,9 +131,9 @@ SOURCE=.\Persistent_Client.h SOURCE=.\Grid.idl
-!IF "$(CFG)" == "Persistent Grid Second Client FIles - Win32 Release"
+!IF "$(CFG)" == "Persistent Grid Second Client - Win32 Release"
-!ELSEIF "$(CFG)" == "Persistent Grid Second Client FIles - Win32 Debug"
+!ELSEIF "$(CFG)" == "Persistent Grid Second Client - Win32 Debug"
# Begin Custom Build
InputPath=.\Grid.idl
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp index 229a37f649d..e2f56ec1c4b 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp +++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="Persistent Grid Server FIles" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Persistent Grid Server" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=Persistent Grid Server FIles - Win32 Debug
+CFG=Persistent Grid Server - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=Persistent Grid Server FIles - 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 "Persistent_Grid_Server_Files.mak" CFG="Persistent Grid Server FIles - Win32 Debug"
+!MESSAGE NMAKE /f "Persistent_Grid_Server_Files.mak" CFG="Persistent Grid Server - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "Persistent Grid Server FIles - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Persistent Grid Server FIles - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent Grid Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent Grid Server - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=Persistent Grid Server FIles - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "Persistent Grid Server FIles - Win32 Release"
+!IF "$(CFG)" == "Persistent Grid Server - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -53,7 +53,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
-!ELSEIF "$(CFG)" == "Persistent Grid Server FIles - Win32 Debug"
+!ELSEIF "$(CFG)" == "Persistent Grid Server - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target
-# Name "Persistent Grid Server FIles - Win32 Release"
-# Name "Persistent Grid Server FIles - Win32 Debug"
+# Name "Persistent Grid Server - Win32 Release"
+# Name "Persistent Grid Server - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter ""
@@ -135,9 +135,9 @@ SOURCE=.\Simple_util.h SOURCE=.\Grid.idl
-!IF "$(CFG)" == "Persistent Grid Server FIles - Win32 Release"
+!IF "$(CFG)" == "Persistent Grid Server - Win32 Release"
-!ELSEIF "$(CFG)" == "Persistent Grid Server FIles - Win32 Debug"
+!ELSEIF "$(CFG)" == "Persistent Grid Server - Win32 Debug"
# Begin Custom Build
InputPath=.\Grid.idl
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp index 2d551087303..46afe5d7752 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp @@ -133,7 +133,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "FactoryClient - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__COSEV="..\..\..\..\..\bin\tao_idl"
+USERDEP__COSEV="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\CosEventChannelFactory.idl
InputName=CosEventChannelFactory
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp index 1fb164f2db7..fa194907eb9 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp +++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp @@ -177,7 +177,7 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "FactoryServer - Win32 Debug"
# PROP Ignore_Default_Tool 1
-USERDEP__COSEV="..\..\..\..\..\bin\tao_idl"
+USERDEP__COSEV="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler
InputPath=.\CosEventChannelFactory.idl
InputName=CosEventChannelFactory
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp index 44f47f1281f..7c773617906 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.dsp @@ -136,7 +136,7 @@ InputPath=.\test_object.idl InputName=test_object
BuildCmds= \
- tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -175,7 +175,7 @@ InputPath=.\test_object.idl InputName=test_object
BuildCmds= \
- tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\bin\tao_idl -Ge 1 $(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 bd88b946f18..70d2e28dc24 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"
@@ -38,12 +40,11 @@ CPP=cl.exe # PROP Output_Dir ""
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
# 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,12 +64,11 @@ LIB32=link.exe -lib # PROP Output_Dir ""
# PROP Intermediate_Dir ".\Debug"
# PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
# 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
@@ -161,7 +161,7 @@ InputPath=.\TTest.idl InputName=TTest
BuildCmds= \
- tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -200,7 +200,7 @@ InputPath=.\TTest.idl InputName=TTest
BuildCmds= \
- tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/performance-tests/Pluggable/client.dsp b/TAO/performance-tests/Pluggable/client.dsp index 4dc06510218..7ac683900a0 100644 --- a/TAO/performance-tests/Pluggable/client.dsp +++ b/TAO/performance-tests/Pluggable/client.dsp @@ -39,6 +39,7 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
@@ -128,16 +129,80 @@ SOURCE=.\PP_Test.idl !IF "$(CFG)" == "Pluggable Client - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__PP_TE="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
+InputPath=.\PP_Test.idl
+InputName=PP_Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(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)" == "Pluggable Client - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__PP_TE="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler
InputPath=.\PP_Test.idl
InputName=PP_Test
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+BuildCmds= \
..\..\..\bin\tao_idl -Ge 1 $(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
!ENDIF
diff --git a/TAO/performance-tests/Pluggable/server.dsp b/TAO/performance-tests/Pluggable/server.dsp index bd12a9864cc..5660c092d1f 100644 --- a/TAO/performance-tests/Pluggable/server.dsp +++ b/TAO/performance-tests/Pluggable/server.dsp @@ -39,6 +39,7 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
@@ -137,6 +138,87 @@ SOURCE=.\PP_TestS.i # Begin Source File
SOURCE=.\PP_Test.idl
+
+!IF "$(CFG)" == "Pluggable Server - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__PP_TE="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
+InputPath=.\PP_Test.idl
+InputName=PP_Test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(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)" == "Pluggable Server - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__PP_TE="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler
+InputPath=.\PP_Test.idl
+InputName=PP_Test
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(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
+
+!ENDIF
+
# End Source File
# End Group
# End Target
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp index 814ecde4e04..ae0902332f3 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.dsp @@ -121,18 +121,20 @@ SOURCE=.\test.idl !IF "$(CFG)" == "Reliable Oneways Client - Win32 Release"
-USERDEP__TEST_="..\..\..\..\..\bin\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
!ELSEIF "$(CFG)" == "Reliable Oneways Client - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__TEST_="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler on $(InputPath)
InputPath=.\test.idl
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp index 724e6d31c4c..c5afb25e952 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.dsp @@ -145,18 +145,20 @@ SOURCE=.\test.idl !IF "$(CFG)" == "Reliable Oneways Server - Win32 Release"
-USERDEP__TEST_="..\..\..\..\..\bin\tao_idl.exe"
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\..\bin\Release\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL Compiler on $(InputPath)
InputPath=.\test.idl
InputName=test
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- tao_idl -Ge 1 $(InputName).idl
+ ..\..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl
# End Custom Build
!ELSEIF "$(CFG)" == "Reliable Oneways Server - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__TEST_="..\..\..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO IDL compiler on $(InputPath)
InputPath=.\test.idl
diff --git a/TAO/tests/AMI/AMI_Test_Client.dsp b/TAO/tests/AMI/AMI_Test_Client.dsp index ef2eb8cfeb9..8be579c89e0 100644 --- a/TAO/tests/AMI/AMI_Test_Client.dsp +++ b/TAO/tests/AMI/AMI_Test_Client.dsp @@ -128,7 +128,7 @@ InputPath=.\ami_test.idl InputName=ami_test
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/AMI/AMI_Test_Server.dsp b/TAO/tests/AMI/AMI_Test_Server.dsp index 357533d247b..76e847c6991 100644 --- a/TAO/tests/AMI/AMI_Test_Server.dsp +++ b/TAO/tests/AMI/AMI_Test_Server.dsp @@ -136,7 +136,7 @@ InputPath=.\ami_test.idl InputName=ami_test
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/AMI/AMI_Test_Simple_Client.dsp b/TAO/tests/AMI/AMI_Test_Simple_Client.dsp index 7496f0a18fa..02f6199f9c1 100644 --- a/TAO/tests/AMI/AMI_Test_Simple_Client.dsp +++ b/TAO/tests/AMI/AMI_Test_Simple_Client.dsp @@ -126,7 +126,7 @@ InputPath=.\ami_test.idl InputName=ami_test
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/TAO/tests/IDL_Test/idl_test.dsp b/TAO/tests/IDL_Test/idl_test.dsp index 51441fce7b7..e65949bf30a 100644 --- a/TAO/tests/IDL_Test/idl_test.dsp +++ b/TAO/tests/IDL_Test/idl_test.dsp @@ -39,9 +39,10 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\\" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -50,7 +51,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /out:"Release/main.exe" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
!ELSEIF "$(CFG)" == "idl_test - Win32 Debug"
@@ -66,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -430,7 +431,7 @@ SOURCE=.\anonymous.idl # PROP Ignore_Default_Tool 1
USERDEP__ANONY="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\anonymous.idl
InputName=anonymous
@@ -515,7 +516,7 @@ SOURCE=.\array.idl # PROP Ignore_Default_Tool 1
USERDEP__ARRAY="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\array.idl
InputName=array
@@ -600,7 +601,7 @@ SOURCE=.\constants.idl # PROP Ignore_Default_Tool 1
USERDEP__CONST="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\constants.idl
InputName=constants
@@ -685,7 +686,7 @@ SOURCE=.\enum_in_struct.idl # PROP Ignore_Default_Tool 1
USERDEP__ENUM_="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\enum_in_struct.idl
InputName=enum_in_struct
@@ -770,7 +771,7 @@ SOURCE=.\generic_object.idl # PROP Ignore_Default_Tool 1
USERDEP__GENER="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\generic_object.idl
InputName=generic_object
@@ -855,7 +856,7 @@ SOURCE=.\included.idl # PROP Ignore_Default_Tool 1
USERDEP__INCLU="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\included.idl
InputName=included
@@ -940,7 +941,7 @@ SOURCE=.\including.idl # PROP Ignore_Default_Tool 1
USERDEP__INCLUD="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\including.idl
InputName=including
@@ -1025,7 +1026,7 @@ SOURCE=.\interface.idl # PROP Ignore_Default_Tool 1
USERDEP__INTER="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\interface.idl
InputName=interface
@@ -1110,7 +1111,7 @@ SOURCE=.\keywords.idl # PROP Ignore_Default_Tool 1
USERDEP__KEYWO="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\keywords.idl
InputName=keywords
@@ -1193,6 +1194,43 @@ SOURCE=.\nested_scope.idl !IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__NESTE="..\..\..\bin\release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
+InputPath=.\nested_scope.idl
+InputName=nested_scope
+
+BuildCmds= \
+ ..\..\..\bin\release\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)" == "idl_test - Win32 Debug"
USERDEP__NESTE="..\..\..\bin\tao_idl.exe"
@@ -1200,9 +1238,35 @@ USERDEP__NESTE="..\..\..\bin\tao_idl.exe" InputPath=.\nested_scope.idl
InputName=nested_scope
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+BuildCmds= \
..\..\..\bin\tao_idl -Ge 1 $(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
!ENDIF
@@ -1214,6 +1278,43 @@ SOURCE=.\params.idl !IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__PARAM="..\..\..\bin\release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
+InputPath=.\params.idl
+InputName=params
+
+BuildCmds= \
+ ..\..\..\bin\release\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)" == "idl_test - Win32 Debug"
USERDEP__PARAM="..\..\..\bin\tao_idl.exe"
@@ -1221,9 +1322,35 @@ USERDEP__PARAM="..\..\..\bin\tao_idl.exe" InputPath=.\params.idl
InputName=params
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+BuildCmds= \
..\..\..\bin\tao_idl -Ge 1 $(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
!ENDIF
@@ -1235,6 +1362,43 @@ SOURCE=.\pragma.idl !IF "$(CFG)" == "idl_test - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__PRAGM="..\..\..\bin\release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
+InputPath=.\pragma.idl
+InputName=pragma
+
+BuildCmds= \
+ ..\..\..\bin\release\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)" == "idl_test - Win32 Debug"
USERDEP__PRAGM="..\..\..\bin\tao_idl.exe"
@@ -1284,7 +1448,7 @@ SOURCE=.\reopened_modules.idl # PROP Ignore_Default_Tool 1
USERDEP__REOPE="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\reopened_modules.idl
InputName=reopened_modules
@@ -1369,7 +1533,7 @@ SOURCE=.\sequence.idl # PROP Ignore_Default_Tool 1
USERDEP__SEQUE="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\sequence.idl
InputName=sequence
@@ -1454,7 +1618,7 @@ SOURCE=.\typedef.idl # PROP Ignore_Default_Tool 1
USERDEP__TYPED="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\typedef.idl
InputName=typedef
@@ -1539,7 +1703,7 @@ SOURCE=.\union.idl # PROP Ignore_Default_Tool 1
USERDEP__UNION="..\..\..\bin\release\tao_idl.exe"
-# Begin Custom Build - Invoking TAO IDL Compiler
+# Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
InputPath=.\union.idl
InputName=union
diff --git a/TAO/tests/Smart_Proxies/client.dsp b/TAO/tests/Smart_Proxies/client.dsp index 5b4d6203d21..80a55e3485c 100644 --- a/TAO/tests/Smart_Proxies/client.dsp +++ b/TAO/tests/Smart_Proxies/client.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
!ELSEIF "$(CFG)" == "client - Win32 Debug"
@@ -121,8 +121,46 @@ SOURCE=.\test.idl !IF "$(CFG)" == "client - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(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)" == "client - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
diff --git a/TAO/tests/Smart_Proxies/server.dsp b/TAO/tests/Smart_Proxies/server.dsp index f653c5cf8a5..072aa86a068 100644 --- a/TAO/tests/Smart_Proxies/server.dsp +++ b/TAO/tests/Smart_Proxies/server.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
!ELSEIF "$(CFG)" == "server - Win32 Debug"
@@ -117,8 +117,46 @@ SOURCE=.\test.idl !IF "$(CFG)" == "server - Win32 Release"
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl -Ge 1 $(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)" == "server - Win32 Debug"
+# PROP Ignore_Default_Tool 1
USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
# Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
InputPath=.\test.idl
diff --git a/bin/auto_compile_win32.pl b/bin/auto_compile_win32.pl index 1f9f322babf..494f1faa2ba 100755 --- a/bin/auto_compile_win32.pl +++ b/bin/auto_compile_win32.pl @@ -120,7 +120,7 @@ TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw, Airplane Server: TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw, Airplane Client: TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw, Nestea Server: TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw, Nestea Client: -TAO/orbsvcs/tests/Trading/Trading.dsw, TradingLig: +TAO/orbsvcs/tests/Trading/Trading.dsw, TradingLib: TAO/orbsvcs/tests/Trading/Trading.dsw, Import_Test: TAO/orbsvcs/tests/Trading/Trading.dsw, Export_Test: TAO/orbsvcs/tests/Trading/Trading.dsw, Colocated_Test: @@ -136,7 +136,7 @@ TAO/examples/Callback_Quoter/Callback_Quoter.dsw, Callback Quoter Notifier: TAO/examples/Callback_Quoter/Callback_Quoter.dsw, Callback Quoter Supplier: TAO/examples/Callback_Quoter/Callback_Quoter.dsw, Callback Quoter Consumer: TAO/examples/POA/Generic_Servant/Generic_Servant.dsw, POA Generic Servant DLL: -TAO/examples/POA/Generic_Servant/Generic_Servant.dsw, POA Generic Servant: +TAO/examples/POA/Generic_Servant/Generic_Servant.dsw, POA Generic Servant Client: TAO/examples/POA/RootPOA/RootPOA.dsw, POA RootPOA: TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.dsw, POA Reference Counted Servant Server: TAO/examples/POA/Adapter_Activator/Adaptor_Activator.dsw, POA Adapter Activator Server: @@ -185,7 +185,7 @@ TAO/examples/Buffered_AMI/Buffered_AMI.dsw, Buffered_AMI Server: TAO/examples/Buffered_AMI/Buffered_AMI.dsw, Buffered_AMI Client: TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Server: TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Client: -TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Collocations Test: +TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Collocation Test: TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw, MT_Cubit Server: TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw, MT_Cubit Client: TAO/performance-tests/POA/Object_Creation_And_Registration/registration.dsw, POA Registration: @@ -211,13 +211,13 @@ TAO/tests/InterOp-Naming/InterOp-Naming.dsw, InterOp Naming Server: TAO/tests/InterOp-Naming/InterOp-Naming.dsw, InterOp Naming Client: TAO/tests/NestedUpcall/Simple/Simple.dsw, Nested Upcall Simple Server: TAO/tests/NestedUpcall/Simple/Simple.dsw, Nested Upcall Simple Client: -TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw, Nested Upcall Server_A: -TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw, Nested Upcall Server_B: +TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw, Nested Upcall Triangle Server_A: +TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw, Nested Upcall Triangle Server_B: TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw, Nested Upcall Triangle Initiator: TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.dsw, Nested Upcall MT_Client Server: TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.dsw, Nested Upcall MT_Client Client: TAO/tests/Multiple_Inheritance/Multiple_Inheritance.dsw, Multiple Inheritance Server: -TAO/tests/Multiple_Inheritance/Multiple_Inheritance.dsw, Multiple Inheritance Slient: +TAO/tests/Multiple_Inheritance/Multiple_Inheritance.dsw, Multiple Inheritance Client: TAO/tests/MT_Client/MT_Client.dsw, MT_Client ORB Creation: TAO/tests/MT_Client/MT_Client.dsw, MT_Client Server: TAO/tests/MT_Client/MT_Client.dsw, MT_Client Simple Client: @@ -568,6 +568,7 @@ sub Build_Config ($Project_File, $Project_Name) = split /,\s*/, $Bname; chdir ("$ENV{ACE_ROOT}/$Project_Dir"); $Command_Line = "msdev.com $Project_File /MAKE \"$Project_Name - $Config\" /USEENV $Build_Cmd /Y3"; + print "Auto_compiling $Project_File : $Project_Name - $Config\n" if ( $Debug == 0 ) { $Status = |