From d9a5612c9e0d75e86670629cde11b345c730251f Mon Sep 17 00:00:00 2001 From: parsons Date: Sun, 20 Jan 2002 21:59:22 +0000 Subject: ChangeLogTag: Sun Jan 20 15:56:47 2002 Jeff Parsons --- TAO/tests/OBV/Any/Any.dsw | 1 + TAO/tests/OBV/Any/client.dsp | 105 +++++++++---------------------------------- TAO/tests/OBV/Any/server.dsp | 14 ++++-- 3 files changed, 33 insertions(+), 87 deletions(-) (limited to 'TAO/tests') diff --git a/TAO/tests/OBV/Any/Any.dsw b/TAO/tests/OBV/Any/Any.dsw index bcfe0861e05..8545c65a965 100644 --- a/TAO/tests/OBV/Any/Any.dsw +++ b/TAO/tests/OBV/Any/Any.dsw @@ -38,3 +38,4 @@ Package=<3> }}} ############################################################################### + diff --git a/TAO/tests/OBV/Any/client.dsp b/TAO/tests/OBV/Any/client.dsp index 00bbd290fa8..e211c38f91d 100644 --- a/TAO/tests/OBV/Any/client.dsp +++ b/TAO/tests/OBV/Any/client.dsp @@ -42,16 +42,15 @@ RSC=rc.exe # 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 -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # 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 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" +# 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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" !ELSEIF "$(CFG)" == "OBV Any Client - Win32 Debug" @@ -62,21 +61,20 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" +# PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # 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 -# SUBTRACT CPP /YX +# 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" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" +# 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 /debug /machine:I386 /pdbtype:sept +# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" !ENDIF @@ -86,104 +84,43 @@ LINK32=link.exe # Name "OBV Any Client - Win32 Debug" # Begin Group "Source Files" -# PROP Default_Filter ".cpp" +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=.\client.cpp +SOURCE=.\AnyC.cpp # End Source File # Begin Source File -SOURCE=.\AnyC.cpp +SOURCE=.\client.cpp # End Source File -# Begin Source File +# End Group +# Begin Group "Header Files" -# PROP Default_Filter ".h" +# PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\AnyC.h # End Source File -# Begin Source File +# End Group +# Begin Group "IDL Files" -# PROP Default_Filter ".idl" +# PROP Default_Filter "" # Begin Source File SOURCE=.\Any.idl !IF "$(CFG)" == "OBV Any Client - Win32 Release" -# PROP Ignore_Default_Tool 1 -USERDEP__FACTO="..\..\..\..\bin\Release\tao_idl.exe" -# Begin Custom Build - Invoking TAO_IDL Compiler -InputPath=.\Any.idl -InputName=Any - -BuildCmds= \ - ..\..\..\..\bin\Release\tao_idl -Gv -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)" == "OBV Any Client - Win32 Debug" -USERDEP__FACTO="..\..\..\..\bin\tao_idl.exe" -# Begin Custom Build - Invoking TAO_IDL Compiler +USERDEP__ANY_I="..\..\..\..\bin\tao_idl.exe" +# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName) InputPath=.\Any.idl InputName=Any -BuildCmds= \ - ..\..\..\..\bin\tao_idl -Gv -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) + ..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl -"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) # End Custom Build !ENDIF @@ -192,7 +129,7 @@ BuildCmds= \ # End Group # Begin Group "Inline Files" -# PROP Default_Filter ".i" +# PROP Default_Filter "" # Begin Source File SOURCE=.\AnyC.i diff --git a/TAO/tests/OBV/Any/server.dsp b/TAO/tests/OBV/Any/server.dsp index 68b6edc0f33..e1171efe689 100644 --- a/TAO/tests/OBV/Any/server.dsp +++ b/TAO/tests/OBV/Any/server.dsp @@ -109,6 +109,14 @@ SOURCE=.\server.cpp # PROP Default_Filter ".h" # Begin Source File +SOURCE=.\AnyC.h +# End Source File +# Begin Source File + +SOURCE=.\AnyS.h +# End Source File +# Begin Source File + SOURCE=.\AnyS_impl.h # End Source File # End Group @@ -122,7 +130,7 @@ SOURCE=.\Any.idl !IF "$(CFG)" == "OBV Any Server - Win32 Release" # PROP Ignore_Default_Tool 1 -USERDEP__FACTO="..\..\..\..\bin\Release\tao_idl.exe" +USERDEP__ANY_I="..\..\..\..\bin\Release\tao_idl.exe" # Begin Custom Build - Invoking TAO_IDL Compiler InputPath=.\Any.idl InputName=Any @@ -160,8 +168,8 @@ BuildCmds= \ !ELSEIF "$(CFG)" == "OBV Any Server - Win32 Debug" -USERDEP__FACTO="..\..\..\..\bin\tao_idl.exe" -# Begin Custom Build - Invoking TAO_IDL Compiler +USERDEP__ANY_I="..\..\..\..\bin\tao_idl.exe" +# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName) InputPath=.\Any.idl InputName=Any -- cgit v1.2.1