Changeset 19085

Show
Ignore:
Timestamp:
07/20/06 16:23:48 (2 years ago)
Author:
patrick
Message:

Merged CppUnit? 1.12.0 from its vendor branch. This was much less painful
than the 1.8.0 —> 1.11.0 merge.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cppunit/trunk/ChangeLog

    r19076 r19085  
     12006-06-29 Baptiste Lepilleur <gaiacrtn@free.fr> 
     2  * include/cppunit/ui/text/TextTestRunner.h 
     3  * src/cppunit/TextTestRunner.cpp: applied patch #1210013 to remove 
     4    hidden virtual function warning. 
     5 
     6  * autogen.sh: applied patch #1449380 contributed by Sander Temme 
     7    to allow running autogen on Mac OS X. 
     8 
     9  * doc/header.html: updated to handle new tabs css required for 
     10    html doc generated with doxygen 1.4.7. 
     11 
     12  * src/msvc6/testrunner/MsDevCallerListCtrl.cpp: applied correction 
     13    provided to fix bug #1498175 (double click on failure does not 
     14    goto failure). 
     15 
     162006-03-04 Baptiste Lepilleur <gaiacrtn@free.fr> 
     17  * contrib/xml-xsl/report.xsl: reported correction posted on the wiki. 
     18 
     19  * removed debian/ directory. An up to date patch can be found at: 
     20    packages.debian.org. 
     21 
     22  * cppunit.spec.in: applied patch #1242905 partially (%post and %postun). 
     23 
     24  * cppunit.pc.in: 
     25  * configure.in: 
     26  * Makefile.am: integrated patch from Robert Leight to generate pkg-config. 
     27 
     282006-02-04 Baptiste Lepilleur <gaiacrtn@free.fr> 
     29  * include/cppunit/TestListener.h:  
     30  * src/qttestrunner/TestRunnerModel.cpp: removed compilation warning. 
     31 
     322006-02-01 Baptiste Lepilleur <gaiacrtn@free.fr> 
     33  * examples/qt: integrated Ernst patch from qt examples. 
     34 
     352005-12-12 Baptiste Lepilleur <gaiacrtn@free.fr> 
     36  * src/qttestrunner: integrated Ernst patch for QtTestRunner and Qt 3.x. 
     37    Enhanced qmake project files to handle multiple build configuration 
     38 
     392005-11-27 Baptiste Lepilleur <gaiacrtn@free.fr> 
     40  * doc/cookbook.dox: fixed type (patch #1334567) 
     41 
     422005-11-06 Baptiste Lepilleur <gaiacrtn@free.fr> 
     43  * include/cppunit/config/SourcePrefix.h: disable warning #4996 
     44    (sprintf is deprecated) for visual studio 2005. 
     45   
     46  * include/cppunit/TestAssert.h: use sprintf_s instead of sprintf for  
     47    visual studio 2005. 
     48     
     49  * examples/ClockerPlugIn/ClockerPlugIn.cpp 
     50  * examples/DumperPlugIn/DumperPlugIn.cpp: use SourcePrefix.h. Fixed 
     51    wrong macro usage to implement DllMain. 
     52     
     53  * examples/msvc6/HostApp/ExamplesTestCase.h 
     54  * examples/msvc6/HostApp/ExamplesTestCase.cpp 
     55  * examples/simple/ExamplesTestCase.h 
     56  * examples/simple/ExamplesTestCase.cpp: removed divideByZero test case 
     57    as it cause some crash on some platforms. 
     58  
     59 
     602005-10-27 Baptiste Lepilleur <gaiacrtn@free.fr> 
     61  * include/cppunit/TestAssert.h: added missing #include <stdio.h> 
     62 
     632005-07-30 Baptiste Lepilleur <gaiacrtn@free.fr> 
     64  * include/cppunit/config/SourcePrefix.h: added, prefix added at begining of sources 
     65    to remove warning. Removed most warning when compiling with VC++ 6sp6. 
     66 
     67  * examples/money/Money.h:  
     68  * examples/money/MoneyTest.cpp: added assert equal usage. 
     69 
     702005-07-30 Baptiste Lepilleur <gaiacrtn@free.fr> 
     71 
     72  * include/cppunit/config/config-msvc6.h: auto-detect if RTTI are enabled  
     73    the _CPPRTTI macro (defined by the compiler when enabling RTTI). 
     74 
     75  * include/cppunit/config/config-msvc6.h: added missing macro definition 
     76    CPPUNIT_HAVE_CPP_CAST. 
     77   
     78  * src/cppunit/TestResultCollector.cpp: fixed memory leak in destructor. 
     79 
    1802005-07-15 Baptiste Lepilleur <gaiacrtn@free.fr> 
    281 

  • cppunit/trunk/INSTALL-WIN32.txt

    r19076 r19085  
    1010- Make HostApp the Active project 
    1111- Compile 
    12 - in VC++, Tools/Customize.../Add-ins and macro files/Browse... 
    13 - select the file lib/TestRunnerDSPlugIn.dll and press ok to register 
    14   the add-ins (double-click on failure = open file in VC++). 
     12- For Visual Studio 6 only: 
     13   - in VC++, Tools/Customize.../Add-ins and macro files/Browse... 
     14   - select the file lib/TestRunnerDSPlugIn.dll and press ok to register 
     15     the add-ins (double-click on failure = open file in VC++). 
    1516- Run the project 
    1617 
    …… 
    3233tests from a GUI. 
    3334 
    34 * DSPlugIn (lib/TestRunnerDSPlugIn.dll) : a VC++ add-in used by  
     35* DSPlugIn (lib/TestRunnerDSPlugIn.dll) : a VC++ 6.0 add-in used by  
    3536testrunner.dll. If you double-click on a failure in the MFC TestRunner, 
    3637a running instance of VC++ will open the file and highlight the line. 
     38This add-ins is not required for Visual Studio 7. 
    3739 
    3840* TestPlugInRunner : (Warning: experimental) a VC++  
    …… 
    144146Notes that the DllPlugInTester(d).exe version of this tools does not allow 
    145147to use the automatic test registration that comes along with test plug-in. 
    146 You probably don't want to use them unless you really now what you are doing. 
     148You probably don't want to use them unless you really know what you are doing. 
    147149 
    148150 

  • cppunit/trunk/Makefile.am

    r19076 r19085  
    33 
    44SUBDIRS = src include examples doc 
     5 
     6pkgconfigdatadir = $(libdir)/pkgconfig 
     7 
     8pkgconfigdata_DATA = cppunit.pc 
    59 
    610bin_SCRIPTS = cppunit-config 

  • cppunit/trunk/NEWS

    r19076 r19085  
    1   New in CppUnit 1.11.0: 
     1  New in CppUnit 1.12.0: 
     2  ---------------------- 
     3 
     4* Portability: 
     5 
     6  - autogen.sh can now be run on Mac OS X (patch #1449380 
     7    contributed by Sander Temme). 
     8     
     9* MFC Test runner: 
     10 
     11  - fixed bug #1498175: double click on failure would sometime  
     12    not goto failed assertion in visual studio. 
     13 
     14* Documentation: 
     15 
     16  - now generated with doxygen 1.4.7 new 'tabs' style. 
     17 
     18 
     19  New in CppUnit 1.11.4: 
    220  ---------------------- 
    321 
    …… 
    5977* Compilation: 
    6078 
     79  - The standard pkg-config file is now generated on unix (contributed by  
     80    Robert Leight). 
     81 
    6182  - MinGW: patch #1024428 contributed by astar, fixed compilation issue in 
    6283    Win32DynamicLibraryManager.cpp. 
    …… 
    7293                instead of 
    7394                AM_PATH_CPPUNIT(1.9.0)" 
     95                 
     96  - Visual Studio 2005: removed deprecated warning. 
    7497 
    7598* Documentation: 
    …… 
    94117    Patch #1112053 contributed by Norbert Barbosa. 
    95118    See xml-xsl/cppunit2junit.xsl and cppunit2junit.txt for details. 
     119 
     120  - xml-xsl/report.xsl has been fixed to work with current xml output. 
    96121 
    97122* (Possible) Compatiblity break: 

  • cppunit/trunk/README.sourceforge

    r19076 r19085  
    66        Bump up release version in: 
    77         - include/cppunit/Portability.h 
     8         - configure.in 
    89         - doc/makedox.bat 
     10         - NEWS 
    911 
    1012        make distcheck 

  • cppunit/trunk/THANKS

    r19076 r19085  
    2121Abdessattar Sassi <abdesassi@users.sourceforge.net> (hp-ux plug-in support) 
    2222Max Quatember and Andreas Pfaffenbichler (VC++ 7 MFC TestRunner go to source line) 
     23Vincent Rivière 

  • cppunit/trunk/autogen.sh

    r13544 r19085  
    77aclocal $ACLOCAL_FLAGS  || \ 
    88    aclocal $ACLOCAL_FLAGS -I /usr/local/share/aclocal 
    9 libtoolize --force  
     9 
     10for l in libtoolize glibtoolize; 
     11do 
     12 ($l --version) < /dev/null > /dev/null 2>&1 && { 
     13 LIBTOOLIZE=$l 
     14 break 
     15 } 
     16done 
     17 
     18$LIBTOOLIZE --force 
    1019autoheader 
    1120automake --add-missing 

  • cppunit/trunk/configure.in

    r19076 r19085  
    1515# 
    1616CPPUNIT_MAJOR_VERSION=1 
    17 CPPUNIT_MINOR_VERSION=11 
     17CPPUNIT_MINOR_VERSION=12 
    1818CPPUNIT_MICRO_VERSION=0 
    1919CPPUNIT_INTERFACE_AGE=0 
    …… 
    118118AC_OUTPUT([ 
    119119  Makefile  
     120  cppunit.pc 
    120121  cppunit.spec 
    121122  cppunit-config 

  • cppunit/trunk/contrib/xml-xsl/report.xsl

    r11469 r19085  
    11<?xml version="1.0" encoding='shift_jis' standalone='yes' ?> 
    22 
    3 <xsl:stylesheet xmlns:xsl="http://www.w3.org/TR/WD-xsl" version="1.0" xml:lang="ja"> 
     3<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xml:lang="ja"> 
    44 
    55<xsl:template match="/"> 
    …… 
    6767</xsl:template> 
    6868   
    69 <xsl:template match="SucessfulTests"> 
    70     <H2>SucessfulTests</H2> 
     69<xsl:template match="SuccessfulTests"> 
     70    <H2>SuccessfulTests</H2> 
    7171    <xsl:choose> 
    7272        <xsl:when test="Test"> 

  • cppunit/trunk/cppunit.spec.in

    r19076 r19085  
    5252%doc AUTHORS COPYING INSTALL NEWS README THANKS ChangeLog TODO BUGS doc/FAQ 
    5353 
     54%post -p /sbin/ldconfig 
     55 
     56%postun -p /sbin/ldconfig 
     57  
    5458%files doc 
    5559%doc doc/html/* 

  • cppunit/trunk/doc/cookbook.dox

    r19076 r19085  
    148148 
    149149Once we have this fixture, we can add the complex  
    150 addition test case any any others that we need  
     150addition test case and any others that we need  
    151151over the course of our development. 
    152152 

  • cppunit/trunk/doc/header.html

    r11459 r19085  
    55</title> 
    66<link href="doxygen.css" rel="stylesheet" type="text/css"> 
     7<link href="tabs.css" rel="stylesheet" type="text/css"> 
    78</head> 
    89 

  • cppunit/trunk/doc/makedox.bat

    r19076 r19085  
    1 SET VERSION=1.10.4 
     1SET VERSION=1.12.0 
    22doxygen CppUnit-win.dox 
    33xcopy FAQ html /Y 

  • cppunit/trunk/doc/other_documentation.dox

    r19076 r19085  
    3636 \author Michael Feathers (mfeathers@objectmentor.com) 
    3737 \author Jerome Lacoste (lacostej@altern.org) 
    38  \author Baptiste Lepilleur <gaiacrtn@free.fr> 
     38 \author Baptiste Lepilleur <blep@users.sourceforge.net> 
    3939 \author Bastiaan Bakker <bastiaan.bakker@lifeline.nl> 
    4040 \author Steve Robbins <smr99@sourceforge.net> 
    …… 
    8787 * 
    8888 * The interface CppUnitTestPlugIn is automatically implemented by the previous 
    89  * macro. You can define your one implementation. 
     89 * macro. You can define your own implementation. 
    9090 * 
    9191 * To provide your custom implementation of the plug-in interface, you must: 

  • cppunit/trunk/examples/ClockerPlugIn/ClockerModel.cpp

    r11469 r19085  
    55// ////////////////////////////////////////////////////////////////////////// 
    66#include "ClockerModel.h" 
     7#include <cppunit/config/SourcePrefix.h> 
    78 
    89 

  • cppunit/trunk/examples/ClockerPlugIn/ClockerPlugIn.cpp

    r19080 r19085  
     1#include <cppunit/config/SourcePrefix.h>  // disabled unwanted warning on vc++ 6.0 
    12#include <cppunit/TestResult.h> 
    23#include <cppunit/XmlOutputter.h> 
    …… 
    7576CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( ClockerPlugIn ); 
    7677 
    77 CPPUNIT_TESTPLUGIN_MAIN(); 
     78CPPUNIT_PLUGIN_IMPLEMENT_MAIN(); 

  • cppunit/trunk/examples/ClockerPlugIn/ClockerPlugIn.dsp

    r19080 r19085  
    4545# PROP Target_Dir "" 
    4646# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLOCKERPLUGIN_EXPORTS" /YX /FD /c 
    47 # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /c 
     47# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /c 
    4848# SUBTRACT CPP /YX 
    4949# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 
    …… 
    7272# PROP Target_Dir "" 
    7373# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLOCKERPLUGIN_EXPORTS" /YX /FD /GZ /c 
    74 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /GZ /c 
     74# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /GZ /c 
    7575# SUBTRACT CPP /YX 
    7676# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 
    …… 
    101101# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /GZ /c 
    102102# SUBTRACT BASE CPP /YX 
    103 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /D "CLOCKER_USE_WINNTTIMER" /FD /GZ /c 
     103# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /D "CLOCKER_USE_WINNTTIMER" /FD /GZ /c 
    104104# SUBTRACT CPP /YX 
    105105# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 

  • cppunit/trunk/examples/DumperPlugIn/DumperPlugIn.cpp

    r11469 r19085  
    6363CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( DumperPlugIn ); 
    6464 
    65 CPPUNIT_TESTPLUGIN_MAIN(); 
     65CPPUNIT_PLUGIN_IMPLEMENT_MAIN(); 

  • cppunit/trunk/examples/DumperPlugIn/DumperPlugIn.dsp

    r19004 r19085  
    4141# PROP Output_Dir "Release" 
    4242# PROP Intermediate_Dir "Release" 
    43 # PROP Ignore_Export_Lib 1 
     43# PROP Ignore_Export_Lib 0 
    4444# PROP Target_Dir "" 
    4545# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /c 
    46 # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /c 
     46# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /c 
    4747# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 
    4848# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 
    …… 
    5555# 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 
    5656# 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 cppunit_dll.lib /nologo /dll /machine:I386 /out:"../../lib/DumperPlugIn.dll" /libpath:"../../lib/" 
     57# SUBTRACT LINK32 /incremental:yes 
    5758 
    5859!ELSEIF  "$(CFG)" == "DumperPlugIn - Win32 Debug" 
    …… 
    6768# PROP Output_Dir "Debug" 
    6869# PROP Intermediate_Dir "Debug" 
    69 # PROP Ignore_Export_Lib 1 
     70# PROP Ignore_Export_Lib 0 
    7071# PROP Target_Dir "" 
    7172# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /GZ /c 
    72 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /GZ /c 
     73# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DUMPERPLUGIN_EXPORTS" /YX /FD /GZ /c 
    7374# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 
    7475# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 
    …… 
    8081LINK32=link.exe 
    8182# 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 
    82 # 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 cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"../../lib/DumperPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" 
     83# 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 cppunitd_dll.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../../lib/DumperPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" 
    8384 
    8485!ENDIF  

  • cppunit/trunk/examples/cppunittest/BaseTestCase.cpp

    r11459 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include "BaseTestCase.h" 
    23 

  • cppunit/trunk/examples/cppunittest/CppUnitTestMain.dsp

    r19004 r19085  
    4545# PROP Target_Dir "" 
    4646# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c 
    47 # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c 
     47# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c 
    4848# SUBTRACT CPP /YX /Yc /Yu 
    4949# ADD BASE RSC /l 0x40c /d "NDEBUG" 
    …… 
    5555# 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 
    5656# 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 cppunit.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/" 
     57# SUBTRACT LINK32 /incremental:yes 
    5758# Begin Special Build Tool 
    5859TargetPath=.\Release\CppUnitTestMain.exe 
    …… 
    7677# PROP Target_Dir "" 
    7778# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c 
    78 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c 
     79# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c 
    7980# SUBTRACT CPP /YX /Yc /Yu 
    8081# ADD BASE RSC /l 0x40c /d "_DEBUG" 
    …… 
    8586LINK32=link.exe 
    8687# 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 
    87 # 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 cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" 
     88# 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 cppunitd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" 
    8889# Begin Special Build Tool 
    8990TargetPath=.\Debug\CppUnitTestMain.exe 
    …… 
    109110# ADD BASE CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /FD /c 
    110111# SUBTRACT BASE CPP /YX /Yc /Yu 
    111 # ADD CPP /nologo /MD /W3 /GR /GX /Ox /Ot /Oa /Ow /Og /Oi /Op /Ob0 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c 
     112# ADD CPP /nologo /MD /W3 /GR /GX /Zd /Ox /Ot /Oa /Ow /Og /Oi /Op /Ob0 /I "../../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c 
    112113# SUBTRACT CPP /YX /Yc /Yu 
    113114# ADD BASE RSC /l 0x40c /d "NDEBUG" 
    …… 
    119120# 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 ../../lib/cppunit.lib /nologo /subsystem:console /machine:I386 
    120121# 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 cppunit_dll.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/" 
     122# SUBTRACT LINK32 /incremental:yes 
    121123# Begin Special Build Tool 
    122124TargetPath=.\ReleaseDLL\CppUnitTestMain.exe 
    …… 
    142144# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c 
    143145# SUBTRACT BASE CPP /YX /Yc /Yu 
    144 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c 
     146# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c 
    145147# SUBTRACT CPP /YX /Yc /Yu 
    146148# ADD BASE RSC /l 0x40c /d "_DEBUG" 
    …… 
    151153LINK32=link.exe 
    152154# 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 ../../lib/cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept 
    153 # 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 cppunitd_dll.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" 
     155# 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 cppunitd_dll.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/" 
    154156# Begin Special Build Tool 
    155157TargetPath=.\DebugDLL\CppUnitTestMain.exe 

  • cppunit/trunk/examples/cppunittest/CppUnitTestPlugIn.dsp

    r19004 r19085  
    4444# PROP Target_Dir "" 
    4545# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNITTESTPLUGIN_EXPORTS" /YX /FD /c 
    46 # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../include" /D "NDEBUG" /D "CPPUNITTESTPLUGIN_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /YX /FD /c 
     46# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "../../include" /D "NDEBUG" /D "CPPUNITTESTPLUGIN_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /YX /FD /c 
    4747# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 
    4848# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 
    …… 
    5555# 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 
    5656# 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 cppunit_dll.lib /nologo /dll /machine:I386 /libpath:"../../lib/" 
     57# SUBTRACT LINK32 /incremental:yes 
    5758 
    5859!ELSEIF  "$(CFG)" == "CppUnitTestPlugIn - Win32 Debug" 
    …… 
    7071# PROP Target_Dir "" 
    7172# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNITTESTPLUGIN_EXPORTS" /YX /FD /GZ /c 
    72 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../include" /D "_DEBUG" /D "CPPUNIT_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c 
     73# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../include" /D "_DEBUG" /D "CPPUNIT_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c 
    7374# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 
    7475# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 
    …… 
    8081LINK32=link.exe 
    8182# 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 
    82 # 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 cppunitd_dll.lib /nologo /dll /debug /machine:I386 /out:"DebugPlugIn/CppUnitTestPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" 
     83# 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 cppunitd_dll.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"DebugPlugIn/CppUnitTestPlugInd.dll" /pdbtype:sept /libpath:"../../lib/" 
    8384 
    8485!ENDIF  

  • cppunit/trunk/examples/cppunittest/CppUnitTestSuite.cpp

    r19076 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include <cppunit/extensions/HelperMacros.h> 
    23#include "CoreSuite.h" 

  • cppunit/trunk/examples/cppunittest/HelperMacrosTest.cpp

    r19076 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include "FailureException.h" 
    23#include "HelperMacrosTest.h" 

  • cppunit/trunk/examples/cppunittest/StringToolsTest.cpp

    r11469 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include "StringToolsTest.h" 
    23 

  • cppunit/trunk/examples/cppunittest/SubclassedTestCase.cpp

    r11459 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include "SubclassedTestCase.h" 
    23 

  • cppunit/trunk/examples/cppunittest/XmlElementTest.cpp

    r11469 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include <cppunit/tools/XmlElement.h> 
    23#include "ToolsSuite.h" 

  • cppunit/trunk/examples/cppunittest/XmlOutputterTest.cpp

    r19076 r19085  
     1#include <cppunit/config/SourcePrefix.h> 
    12#include <cppunit/XmlOutputter.h> 
    23#include <cppunit/TestFailure.h> 

  • cppunit/trunk/examples/hierarchy/hierarchy.dsp

    r19076 r19085  
    55# TARGTYPE "Win32 (x86) Console Application" 0x0103 
    66 
    7 CFG=hierarchy - Win32 Debug Crossplatform Setting 
     7CFG=hierarchy - Win32 Release 
    88!MESSAGE This is not a valid makefile. To build this project using NMAKE, 
    99!MESSAGE use the Export Makefile command and run 
    …… 
    1414!MESSAGE by defining the macro CFG on the command line. For example: 
    1515!MESSAGE  
    16 !MESSAGE NMAKE /f "hierarchy.mak" CFG="hierarchy - Win32 Debug Crossplatform Setting" 
     16!MESSAGE NMAKE /f "hierarchy.mak" CFG="hierarchy - Win32 Release" 
    1717!MESSAGE  
    1818!MESSAGE Possible choices for configuration are: 
    …… 
    4343# PROP Target_Dir "" 
    4444# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 
    45 # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /YX /FD /c 
     45# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /YX /FD /c 
    4646# ADD BASE RSC /l 0x40c /d "NDEBUG" 
    4747# ADD RSC /l 0x40c /d "NDEBUG" 
    …… 
    5252# 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 
    5353# 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 ..\..\lib\cppunit.lib /nologo /subsystem:console /machine:I386 
     54# SUBTRACT LINK32 /incremental:yes 
    5455 
    5556!ELSEIF  "$(CFG)" == "hierarchy - Win32 Debug" 
    …… 
    6768# PROP Target_Dir "" 
    6869# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c 
    69 # ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /YX /FD /GZ /c 
     70# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "..\..\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_USE_TYPEINFO" /YX /FD /GZ /c 
    7071# ADD BASE RSC /l 0x40c /d "_DEBUG" 
    7172# ADD RSC /l 0x40c /d "_DEBUG" 
    …… 
    7576LINK32=link.exe 
    7677# 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 
    77 # 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 ..\..\lib\cppunitd.lib