From 43c98300c289170e713e437256aa7a93d58405f1 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Wed, 25 Jul 2001 20:11:24 +0000 Subject: Added new MSVC project files. Also, Test_i impl should not be ref counted. --- TAO/tests/DLL_ORB/DLL_ORB.dsw | 41 ++++++ TAO/tests/DLL_ORB/Test_Client_Module.dsp | 217 ++++++++++++++++++++++++++++ TAO/tests/DLL_ORB/Test_Server_Module.dsp | 237 +++++++++++++++++++++++++++++++ TAO/tests/DLL_ORB/Test_i.h | 4 +- 4 files changed, 496 insertions(+), 3 deletions(-) create mode 100644 TAO/tests/DLL_ORB/DLL_ORB.dsw create mode 100644 TAO/tests/DLL_ORB/Test_Client_Module.dsp create mode 100644 TAO/tests/DLL_ORB/Test_Server_Module.dsp diff --git a/TAO/tests/DLL_ORB/DLL_ORB.dsw b/TAO/tests/DLL_ORB/DLL_ORB.dsw new file mode 100644 index 00000000000..14954dd6028 --- /dev/null +++ b/TAO/tests/DLL_ORB/DLL_ORB.dsw @@ -0,0 +1,41 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "Test_Client_Module"=.\Test_Client_Module.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "Test_Server_Module"=.\Test_Server_Module.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.dsp b/TAO/tests/DLL_ORB/Test_Client_Module.dsp new file mode 100644 index 00000000000..61ef68d1471 --- /dev/null +++ b/TAO/tests/DLL_ORB/Test_Client_Module.dsp @@ -0,0 +1,217 @@ +# Microsoft Developer Studio Project File - Name="Test_Client_Module" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Test_Client_Module - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Test_Client_Module.mak". +!MESSAGE +!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 "Test_Client_Module.mak" CFG="Test_Client_Module - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Test_Client_Module - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Test_Client_Module - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Test_Client_Module - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir ".\DLL\Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Test_Client_Module_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../.." /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "TEST_CLIENT_MODULE_BUILD_DLL" /FD /c +# SUBTRACT CPP /X /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# 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 /dll /machine:I386 +# ADD LINK32 ACE.lib TAO.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\bin\Test_Client_Module.dll" /libpath:"../../../ace" /libpath:"../../tao" + +!ELSEIF "$(CFG)" == "Test_Client_Module - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir ".\DLL\Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Test_Client_Module_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TEST_CLIENT_MODULE_BUILD_DLL" /FD /c +# SUBTRACT CPP /Fr /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# 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 /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ACEd.lib TAOd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\Test_Client_Moduled.dll" /libpath:"../../../ace" /libpath:"../../tao" +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "Test_Client_Module - Win32 Release" +# Name "Test_Client_Module - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx" +# Begin Source File + +SOURCE=.\Test_Client_Module.cpp +# End Source File +# Begin Source File + +SOURCE=.\TestC.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm" +# Begin Source File + +SOURCE=.\Test_Client_Module.h +# End Source File +# Begin Source File + +SOURCE=.\Test_Client_Module_Export.h +# End Source File +# Begin Source File + +SOURCE=.\TestC.h +# End Source File +# End Group +# Begin Group "Inline Files" + +# PROP Default_Filter "i;inl" +# Begin Source File + +SOURCE=.\TestC.i +# End Source File +# End Group +# Begin Group "IDL Files" + +# PROP Default_Filter "idl" +# Begin Source File + +SOURCE=.\Test.idl + +!IF "$(CFG)" == "Test_Client_Module - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputPath=.\Test.idl +InputName=Test + +BuildCmds= \ + ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h $(InputName).idl + +"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(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)" == "Test_Client_Module - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputPath=.\Test.idl +InputName=Test + +BuildCmds= \ + ..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h $(InputName).idl + +"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(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 +# End Project diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.dsp b/TAO/tests/DLL_ORB/Test_Server_Module.dsp new file mode 100644 index 00000000000..d6534abe657 --- /dev/null +++ b/TAO/tests/DLL_ORB/Test_Server_Module.dsp @@ -0,0 +1,237 @@ +# Microsoft Developer Studio Project File - Name="Test_Server_Module" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Test_Server_Module - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Test_Server_Module.mak". +!MESSAGE +!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 "Test_Server_Module.mak" CFG="Test_Server_Module - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Test_Server_Module - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Test_Server_Module - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Test_Server_Module - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "" +# PROP Intermediate_Dir ".\DLL\Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Test_Server_Module_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../.." /I "../.." /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "TEST_SERVER_MODULE_BUILD_DLL" /FD /c +# SUBTRACT CPP /X /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# 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 /dll /machine:I386 +# ADD LINK32 ACE.lib TAO.lib TAO_PortableServer.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\bin\Test_Server_Module.dll" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer" + +!ELSEIF "$(CFG)" == "Test_Server_Module - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir ".\DLL\Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Test_Server_Module_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TEST_SERVER_MODULE_BUILD_DLL" /FD /c +# SUBTRACT CPP /Fr /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# 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 /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ACEd.lib TAOd.lib TAO_PortableServerd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\Test_Server_Moduled.dll" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer" +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "Test_Server_Module - Win32 Release" +# Name "Test_Server_Module - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx" +# Begin Source File + +SOURCE=.\Test_i.cpp +# End Source File +# Begin Source File + +SOURCE=.\Test_Server_Module.cpp +# End Source File +# Begin Source File + +SOURCE=.\TestC.cpp +# End Source File +# Begin Source File + +SOURCE=.\TestS.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm" +# Begin Source File + +SOURCE=.\Test_i.h +# End Source File +# Begin Source File + +SOURCE=.\Test_Server_Module.h +# End Source File +# Begin Source File + +SOURCE=.\Test_Server_Module_Export.h +# End Source File +# Begin Source File + +SOURCE=.\TestC.h +# End Source File +# Begin Source File + +SOURCE=.\TestS.h +# End Source File +# End Group +# Begin Group "Inline Files" + +# PROP Default_Filter "i;inl" +# Begin Source File + +SOURCE=.\TestC.i +# End Source File +# Begin Source File + +SOURCE=.\TestS.i +# End Source File +# End Group +# Begin Group "IDL Files" + +# PROP Default_Filter "idl" +# Begin Source File + +SOURCE=.\Test.idl + +!IF "$(CFG)" == "Test_Server_Module - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputPath=.\Test.idl +InputName=Test + +BuildCmds= \ + ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h $(InputName).idl + +"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(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)" == "Test_Server_Module - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputPath=.\Test.idl +InputName=Test + +BuildCmds= \ + ..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h $(InputName).idl + +"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(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 +# End Project diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index 62c8321b560..e4e3d04a920 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -25,9 +25,7 @@ * * This class implements the "Test" interface used in this test. */ -class Test_i - : public virtual POA_Test, - public virtual PortableServer::RefCountServantBase +class Test_i : public virtual POA_Test { public: -- cgit v1.2.1