From b54ebf44fe032a2ee5b481c13923cb7645a414da Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 29 Aug 2000 06:21:03 +0000 Subject: ChangeLogTag:Tue Aug 29 01:26:06 2000 Marina Spivak --- TAO/ChangeLogs/ChangeLog-02a | 14 +++++- TAO/tests/RTCORBA/Client_Propagated/client.dsp | 20 ++++---- TAO/tests/RTCORBA/Client_Propagated/server.dsp | 20 ++++---- TAO/tests/RTCORBA/RTCORBA_tests.dsw | 65 ++++++++++++++++++++++++++ TAO/tests/RTCORBA/Server_Protocol/client.dsp | 20 ++++---- TAO/tests/RTCORBA/Server_Protocol/server.dsp | 20 ++++---- 6 files changed, 118 insertions(+), 41 deletions(-) create mode 100644 TAO/tests/RTCORBA/RTCORBA_tests.dsw diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c60f5dbf213..0a1e22708a2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,5 +1,17 @@ -Tue Aug 29 00:39:49 2000 Marina Spivak +Tue Aug 29 01:26:06 2000 Marina Spivak + * tests/RTCORBA/Server_Protocol/client.dsp + * tests/RTCORBA/Client_Propagated/client.dsp + * tests/RTCORBA/Server_Protocol/server.dsp + * tests/RTCORBA/Client_Propagated/server.dsp: + + Changed project names, so they are more descriptive when + included into big workspaces. + + * tests/RTCORBA/RTCORBA_tests.dsw: + + Added workspace for RTCORBA tests. + * tests/RTCORBA/Server_Protocol/Makefile * tests/RTCORBA/Client_Propagated/Makefile: diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.dsp b/TAO/tests/RTCORBA/Client_Propagated/client.dsp index 452f7f44135..be579f539bd 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.dsp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=client - Win32 Debug +CFG=Client_Propagated 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=client - 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 "client.mak" CFG="client - Win32 Debug" +!MESSAGE NMAKE /f "client.mak" CFG="Client_Propagated Client - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "Client_Propagated Client - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Client_Propagated Client - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=client - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "client - Win32 Release" +!IF "$(CFG)" == "Client_Propagated 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 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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" -!ELSEIF "$(CFG)" == "client - Win32 Debug" +!ELSEIF "$(CFG)" == "Client_Propagated Client - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target -# Name "client - Win32 Release" -# Name "client - Win32 Debug" +# Name "Client_Propagated Client - Win32 Release" +# Name "Client_Propagated Client - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -119,7 +119,7 @@ SOURCE=.\testC.i SOURCE=.\test.idl -!IF "$(CFG)" == "client - Win32 Release" +!IF "$(CFG)" == "Client_Propagated Client - Win32 Release" USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build @@ -157,7 +157,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "client - Win32 Debug" +!ELSEIF "$(CFG)" == "Client_Propagated Client - Win32 Debug" # PROP Ignore_Default_Tool 1 USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe" diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.dsp b/TAO/tests/RTCORBA/Client_Propagated/server.dsp index 13a6ff7357f..0b03c8ce7f7 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.dsp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=server - Win32 Debug +CFG=Client_Propagated 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=server - 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 "server.mak" CFG="server - Win32 Debug" +!MESSAGE NMAKE /f "server.mak" CFG="Client_Propagated Server - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "Client_Propagated Server - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Client_Propagated Server - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=server - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "server - Win32 Release" +!IF "$(CFG)" == "Client_Propagated 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 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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" -!ELSEIF "$(CFG)" == "server - Win32 Debug" +!ELSEIF "$(CFG)" == "Client_Propagated Server - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target -# Name "server - Win32 Release" -# Name "server - Win32 Debug" +# Name "Client_Propagated Server - Win32 Release" +# Name "Client_Propagated Server - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -131,7 +131,7 @@ SOURCE=.\testS.i SOURCE=.\test.idl -!IF "$(CFG)" == "server - Win32 Release" +!IF "$(CFG)" == "Client_Propagated Server - Win32 Release" USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build @@ -169,7 +169,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "server - Win32 Debug" +!ELSEIF "$(CFG)" == "Client_Propagated Server - Win32 Debug" # PROP Ignore_Default_Tool 1 USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe" diff --git a/TAO/tests/RTCORBA/RTCORBA_tests.dsw b/TAO/tests/RTCORBA/RTCORBA_tests.dsw new file mode 100644 index 00000000000..d73bba5d4ee --- /dev/null +++ b/TAO/tests/RTCORBA/RTCORBA_tests.dsw @@ -0,0 +1,65 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "Client_Propagated Client"=.\Client_Propagated\client.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Client_Propagated Server"=.\Client_Propagated\server.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Server_Protocol Client"=.\Server_Protocol\client.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Server_Protocol Server"=.\Server_Protocol\server.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.dsp b/TAO/tests/RTCORBA/Server_Protocol/client.dsp index 452f7f44135..eaee341f444 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.dsp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=client - Win32 Debug +CFG=Server_Protocol 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=client - 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 "client.mak" CFG="client - Win32 Debug" +!MESSAGE NMAKE /f "client.mak" CFG="Server_Protocol Client - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "Server_Protocol Client - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Server_Protocol Client - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=client - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "client - Win32 Release" +!IF "$(CFG)" == "Server_Protocol 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 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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" -!ELSEIF "$(CFG)" == "client - Win32 Debug" +!ELSEIF "$(CFG)" == "Server_Protocol Client - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target -# Name "client - Win32 Release" -# Name "client - Win32 Debug" +# Name "Server_Protocol Client - Win32 Release" +# Name "Server_Protocol Client - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -119,7 +119,7 @@ SOURCE=.\testC.i SOURCE=.\test.idl -!IF "$(CFG)" == "client - Win32 Release" +!IF "$(CFG)" == "Server_Protocol Client - Win32 Release" USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build @@ -157,7 +157,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "client - Win32 Debug" +!ELSEIF "$(CFG)" == "Server_Protocol Client - Win32 Debug" # PROP Ignore_Default_Tool 1 USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe" diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.dsp b/TAO/tests/RTCORBA/Server_Protocol/server.dsp index 13a6ff7357f..15095de4d98 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.dsp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=server - Win32 Debug +CFG=Server_Protocol 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=server - 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 "server.mak" CFG="server - Win32 Debug" +!MESSAGE NMAKE /f "server.mak" CFG="Server_Protocol Server - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "Server_Protocol Server - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Server_Protocol Server - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=server - Win32 Debug CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "server - Win32 Release" +!IF "$(CFG)" == "Server_Protocol 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 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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" -!ELSEIF "$(CFG)" == "server - Win32 Debug" +!ELSEIF "$(CFG)" == "Server_Protocol Server - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -82,8 +82,8 @@ LINK32=link.exe # Begin Target -# Name "server - Win32 Release" -# Name "server - Win32 Debug" +# Name "Server_Protocol Server - Win32 Release" +# Name "Server_Protocol Server - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -131,7 +131,7 @@ SOURCE=.\testS.i SOURCE=.\test.idl -!IF "$(CFG)" == "server - Win32 Release" +!IF "$(CFG)" == "Server_Protocol Server - Win32 Release" USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build @@ -169,7 +169,7 @@ BuildCmds= \ $(BuildCmds) # End Custom Build -!ELSEIF "$(CFG)" == "server - Win32 Debug" +!ELSEIF "$(CFG)" == "Server_Protocol Server - Win32 Debug" # PROP Ignore_Default_Tool 1 USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe" -- cgit v1.2.1