From 82017693c2dcaab03556154d990fe44591fb6f0a Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Fri, 18 May 2001 18:32:42 +0000 Subject: :registerFactory(factory) now generate a dummy name based on a serial number instead of using RTTI. * Symbol CU_USE_TYPEINFO must be defined instead of USE_TYPEINFO to compile RTTI. * Added back default constructor to TestSuiteBuilder which use RTTI. It is available only if CU_USE_TYPEINFO is defined. * Moved TypeInfoHelper.h from src/cppunit to include/cppunit/extensions. * Macro CU_TEST_SUITE in HelperMacros.h now use TestSuiteBuilder default constructor if CU_USE_TYPEINFO is defined, otherwise it use the type name given to the CU_TEST_SUITE macro. * TestFactoryRegistry::registerFactory(factory) now generate a dummy name based on a serial number instead of using RTTI. The macro CU_TEST_SUITE_REGISTRATION and class AutoRegisterSuite can now when CU_USE_TYPEINFO is not defined. * Added a new Configuration named "Debug Without CU_USE_TYPEINFO" to msvc6 projects. The flag CU_USE_TYPEINFO is not defined in that configuration. --- src/cppunit/cppunit.dsp | 61 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 16 deletions(-) (limited to 'src/cppunit/cppunit.dsp') diff --git a/src/cppunit/cppunit.dsp b/src/cppunit/cppunit.dsp index c2a23e5..040b006 100644 --- a/src/cppunit/cppunit.dsp +++ b/src/cppunit/cppunit.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=cppunit - Win32 Debug +CFG=cppunit - Win32 Debug Without CU_USE_TYPEINFO !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,13 @@ CFG=cppunit - 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 "cppunit.mak" CFG="cppunit - Win32 Debug" +!MESSAGE NMAKE /f "cppunit.mak" CFG="cppunit - Win32 Debug Without CU_USE_TYPEINFO" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "cppunit - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "cppunit - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "cppunit - Win32 Debug Without CU_USE_TYPEINFO" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -41,7 +42,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\include" /D "_MBCS" /D "_LIB" /D "USE_TYPEINFO" /D "NDEBUG" /D "WIN32" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "CU_USE_TYPEINFO" /D "WIN32" /YX /FD /c # ADD BASE RSC /l 0x40c /d "NDEBUG" # ADD RSC /l 0x40c /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_MBCS" /D "_LIB" /D "USE_TYPEINFO" /D "_DEBUG" /D "WIN32" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "CU_USE_TYPEINFO" /D "WIN32" /YX /FD /GZ /c # ADD BASE RSC /l 0x40c /d "_DEBUG" # ADD RSC /l 0x40c /d "_DEBUG" BSC32=bscmake.exe @@ -74,21 +75,41 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\..\lib\cppunitd.lib" +!ELSEIF "$(CFG)" == "cppunit - Win32 Debug Without CU_USE_TYPEINFO" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "cppunit___Win32_Debug_Without_CU_USE_TYPEINFO" +# PROP BASE Intermediate_Dir "cppunit___Win32_Debug_Without_CU_USE_TYPEINFO" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugNoTypeInfo" +# PROP Intermediate_Dir "DebugNoTypeInfo" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "CU_USE_TYPEINFO" /D "WIN32" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "WIN32" /YX /FD /GZ /c +# ADD BASE RSC /l 0x40c /d "_DEBUG" +# ADD RSC /l 0x40c /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo /out:"..\..\lib\cppunitd.lib" +# ADD LIB32 /nologo /out:"..\..\lib\cppunitnotypeinfod.lib" + !ENDIF # Begin Target # Name "cppunit - Win32 Release" # Name "cppunit - Win32 Debug" +# Name "cppunit - Win32 Debug Without CU_USE_TYPEINFO" # Begin Group "extensions" # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\cppunit\extensions\TestFactory.h -# End Source File -# Begin Source File - SOURCE=..\..\include\cppunit\extensions\AutoRegisterSuite.h # End Source File # Begin Source File @@ -109,6 +130,10 @@ SOURCE=..\..\include\cppunit\extensions\TestDecorator.h # End Source File # Begin Source File +SOURCE=..\..\include\cppunit\extensions\TestFactory.h +# End Source File +# Begin Source File + SOURCE=.\TestFactoryRegistry.cpp # End Source File # Begin Source File @@ -127,9 +152,21 @@ SOURCE=..\..\include\cppunit\extensions\TestSuiteBuilder.h SOURCE=..\..\include\cppunit\extensions\TestSuiteFactory.h # End Source File +# Begin Source File + +SOURCE=.\TypeInfoHelper.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\include\cppunit\extensions\TypeInfoHelper.h +# End Source File # End Group # Begin Source File +SOURCE=..\..\ChangeLog +# End Source File +# Begin Source File + SOURCE=.\estring.h # End Source File # Begin Source File @@ -204,13 +241,5 @@ SOURCE=.\TextTestResult.cpp SOURCE=..\..\include\cppunit\TextTestResult.h # End Source File -# Begin Source File - -SOURCE=.\TypeInfoHelper.cpp -# End Source File -# Begin Source File - -SOURCE=.\TypeInfoHelper.h -# End Source File # End Target # End Project -- cgit v1.2.1