diff options
| author | Baptiste Lepilleur <gaiacrtn@free.fr> | 2001-10-24 19:03:29 +0000 |
|---|---|---|
| committer | Baptiste Lepilleur <gaiacrtn@free.fr> | 2001-10-24 19:03:29 +0000 |
| commit | a0f9257fc47db541d7a1daee6153de0af30d2cb9 (patch) | |
| tree | a73bf4e6346d84924ee4198aa2528e2f012cdd17 /examples | |
| parent | 7c940841ddb85a4be6aec81acfa88fb6abc314bf (diff) | |
| download | cppunit-a0f9257fc47db541d7a1daee6153de0af30d2cb9.tar.gz | |
Examples/msvc6/CppUnitTestApp/CppUnitTestApp.
examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp:
* examples/msvc6/HostApp/HostApp.dsp: use custom file build instead
of post-build/pre-link step to copy the TestRunner DLL to the
Release/Debug directory.
* src/msvc6/ProgressBar.cpp:
* src/msvc6/ProgressBar.h:
* src/msvc6/TestRunner.rc:
* src/msvc6/TestRunnerDlg.cpp:
* src/msvc6/TestRunnerDlg.h:
* src/msvc6/testRunner.dsp:
* src/msvc6/TestRunnerModel.cpp:
* src/msvc6/TestRunnerModel.h: included Gigi Sayfan (gigi@morphink.com)
patch. The dialog can now be resized, and list view columns and dialog
sizes are saved.
* src/msvc6/ProgressBar.cpp:
* src/msvc6/ProgressBar.h: Minor refactoring.
* THANKS: added Gigi Sayfan to the list.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp | 75 | ||||
| -rw-r--r-- | examples/msvc6/HostApp/HostApp.dsp | 97 |
2 files changed, 150 insertions, 22 deletions
diff --git a/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp b/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp index fc29222..f733a31 100644 --- a/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp +++ b/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp @@ -54,11 +54,6 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 # ADD LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunner.lib /nologo /subsystem:windows /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=copy testrunner dll to Release -PostBuild_Cmds=copy ..\..\..\Lib\testrunner.dll Release -# End Special Build Tool !ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" @@ -85,11 +80,6 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 ../../../Lib/cppunitd.lib ../../../Lib/testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=copy testrunner dll to debug -PostBuild_Cmds=copy ..\..\..\Lib\testrunnerd.dll Debug -# End Special Build Tool !ENDIF @@ -409,6 +399,71 @@ SOURCE=.\res\CppUnitTestApp.ico SOURCE=.\res\CppUnitTestApp.rc2 # End Source File # End Group +# Begin Group "DLL Dependencies" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\lib\testrunner.dll + +!IF "$(CFG)" == "CppUnitTestApp - Win32 Release" + +# Begin Custom Build - $(IntDir)\$(InputName).dll +IntDir=.\Release +InputPath=..\..\..\lib\testrunner.dll +InputName=testrunner + +"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(IntDir)\$(InputName).dll + +# End Custom Build + +!ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\testrunnercd.dll + +!IF "$(CFG)" == "CppUnitTestApp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\testrunnerd.dll + +!IF "$(CFG)" == "CppUnitTestApp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "CppUnitTestApp - Win32 Debug" + +# Begin Custom Build - $(IntDir)\$(InputName).dll +IntDir=.\Debug +InputPath=..\..\..\lib\testrunnerd.dll +InputName=testrunnerd + +"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(IntDir)\$(InputName).dll + +# End Custom Build + +!ENDIF + +# End Source File +# End Group # Begin Source File SOURCE=..\..\cppunittest\Makefile.am diff --git a/examples/msvc6/HostApp/HostApp.dsp b/examples/msvc6/HostApp/HostApp.dsp index d48cbaf..2331f0c 100644 --- a/examples/msvc6/HostApp/HostApp.dsp +++ b/examples/msvc6/HostApp/HostApp.dsp @@ -55,10 +55,6 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 # ADD LINK32 ../../../Lib/cppunit.lib ../../../Lib/testrunner.lib /nologo /subsystem:windows /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Cmds=copy ..\..\..\lib\testrunner.dll Release -# End Special Build Tool !ELSEIF "$(CFG)" == "HostApp - Win32 Debug" @@ -86,10 +82,6 @@ LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # ADD LINK32 ..\..\..\lib\cppunitd.lib ..\..\..\lib\testrunnerd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # SUBTRACT LINK32 /pdb:none /map /nodefaultlib -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Cmds=copy ..\..\..\lib\testrunnerd.dll Debug -# End Special Build Tool !ELSEIF "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting" @@ -119,10 +111,6 @@ LINK32=link.exe # SUBTRACT BASE LINK32 /pdb:none /map /nodefaultlib # ADD LINK32 ..\..\..\lib\cppunitcd.lib ..\..\..\lib\testrunnercd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # SUBTRACT LINK32 /pdb:none /map /nodefaultlib -# Begin Special Build Tool -SOURCE="$(InputPath)" -PreLink_Cmds=copy ..\..\..\lib\testrunnercd.dll DebugCrossplatform -# End Special Build Tool !ENDIF @@ -217,6 +205,91 @@ SOURCE=.\res\HostAppDoc.ico SOURCE=.\res\Toolbar.bmp # End Source File # End Group +# Begin Group "DLL Dependencies" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\lib\testrunner.dll + +!IF "$(CFG)" == "HostApp - Win32 Release" + +# Begin Custom Build - $(IntDir)\$(InputName).dll +IntDir=.\Release +InputPath=..\..\..\lib\testrunner.dll +InputName=testrunner + +"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(IntDir)\$(InputName).dll + +# End Custom Build + +!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\testrunnercd.dll + +!IF "$(CFG)" == "HostApp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting" + +# Begin Custom Build - $(IntDir)\$(InputName).dll +IntDir=.\DebugCrossplatform +InputPath=..\..\..\lib\testrunnercd.dll +InputName=testrunnercd + +"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(IntDir)\$(InputName).dll + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\testrunnerd.dll + +!IF "$(CFG)" == "HostApp - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "HostApp - Win32 Debug" + +# Begin Custom Build - $(IntDir)\$(InputName).dll +IntDir=.\Debug +InputPath=..\..\..\lib\testrunnerd.dll +InputName=testrunnerd + +"$(IntDir)\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) $(IntDir)\$(InputName).dll + +# End Custom Build + +!ELSEIF "$(CFG)" == "HostApp - Win32 Debug Crossplatform Setting" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# End Group # Begin Source File SOURCE=.\ReadMe.txt |
