mockpp-commits Mailing List for Mock Objects for C++ (Page 11)
Brought to you by:
ewald-arnold
Menu
▾
▴
mockpp-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(17) |
Mar
(178) |
Apr
(119) |
May
(60) |
Jun
(3) |
Jul
(60) |
Aug
(16) |
Sep
(55) |
Oct
(156) |
Nov
(136) |
Dec
(255) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(98) |
Feb
(8) |
Mar
(57) |
Apr
(43) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/mockpp/config Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/config/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 10 Dec 2005 20:11:13 -0000 1.2 +++ .cvsignore 28 Dec 2005 21:41:32 -0000 1.3 @@ -1 +1,3 @@ Makefile.in +Makefile + |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:43
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177 Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- .cvsignore 15 Aug 2004 10:18:51 -0000 1.9 +++ .cvsignore 28 Dec 2005 21:41:31 -0000 1.10 @@ -23,3 +23,6 @@ *.gz *.bz2 *.zip +mockpp.spec +mockpp.doxygen +x |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:43
|
Update of /cvsroot/mockpp/mockpp/mockpp/framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/mockpp/framework Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/framework/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- .cvsignore 10 Dec 2005 20:07:21 -0000 1.2 +++ .cvsignore 28 Dec 2005 21:41:32 -0000 1.3 @@ -1 +1,4 @@ Makefile.in +Makefile +.deps + |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:43
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/3party/cxxtest/cxxtest Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- .cvsignore 18 Dec 2005 17:19:57 -0000 1.3 +++ .cvsignore 28 Dec 2005 21:41:31 -0000 1.4 @@ -3,3 +3,4 @@ *.bak *.BAK *.~* +.deps |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:43
|
Update of /cvsroot/mockpp/mockpp/3party/cxxtest/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/3party/cxxtest/docs Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/3party/cxxtest/docs/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 9 Dec 2005 16:19:16 -0000 1.1 +++ .cvsignore 28 Dec 2005 21:41:31 -0000 1.2 @@ -1 +1,2 @@ Makefile.in +Makefile |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:41:43
|
Update of /cvsroot/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3177/config Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/config/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 27 Nov 2005 17:36:55 -0000 1.1 +++ .cvsignore 28 Dec 2005 21:41:31 -0000 1.2 @@ -1 +1,3 @@ Makefile.in +Makefile + |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:35:23
|
Update of /cvsroot/mockpp/mockpp/mockpp/docs/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2190/mockpp/docs/en Modified Files: dev_helper.docbook Log Message: avoid name collision on win32 Index: dev_helper.docbook =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_helper.docbook,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dev_helper.docbook 27 Dec 2005 18:01:44 -0000 1.11 +++ dev_helper.docbook 28 Dec 2005 21:35:12 -0000 1.12 @@ -74,7 +74,7 @@ There are some more asserters which are of limited interest, see the api documentation for -<filename class='headerfile'>Assert.h</filename> and +<filename class='headerfile'>Asserter.h</filename> and <filename class='headerfile'>AssertMo.h</filename> for a complete list. There you find also a detailed description of the above macros and the functions behind them. |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:32:05
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1558/msvc71/mockpp Modified Files: mockpp.vcproj Log Message: avoid name collision on win32 Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mockpp.vcproj 10 Dec 2005 20:24:17 -0000 1.10 +++ mockpp.vcproj 28 Dec 2005 21:31:53 -0000 1.11 @@ -1,765 +1,765 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="mockpp" - RootNamespace="mockpp" - SccProjectName="" - SccLocalPath=""> - <Platforms> - <Platform - Name="Win32"/> [...1499 lines suppressed...] + RelativePath="..\..\mockpp\constraint\OutBound.h"> + </File> + <File + RelativePath="..\..\mockpp\constraint\StringContains.h"> + </File> + <File + RelativePath="..\..\mockpp\constraint\StringEndsWith.h"> + </File> + <File + RelativePath="..\..\mockpp\constraint\StringStartsWith.h"> + </File> + <File + RelativePath="..\..\mockpp\constraint\TypelessConstraint.h"> + </File> + </Filter> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:32:05
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1558 Modified Files: ChangeLog Log Message: avoid name collision on win32 Index: ChangeLog =================================================================== RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- ChangeLog 28 Dec 2005 19:40:58 -0000 1.86 +++ ChangeLog 28 Dec 2005 21:31:53 -0000 1.87 @@ -17,6 +17,8 @@ - compatibility break: moved all framework related files to mockpp/framework - CxxTest (built-in version) is default test framework now, CppUnit remains an option + - rename Assert.* to Asserter.* due to collisions with Asserter.h on + win platforms 2005-11-19 1.10.0: |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:31:48
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1522/bcb5 Modified Files: Makefile.am mockpp.bpf Log Message: avoid name collision on win32 Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 19 Nov 2005 17:35:27 -0000 1.13 +++ Makefile.am 28 Dec 2005 21:31:40 -0000 1.14 @@ -9,6 +9,8 @@ mockpp.bpg \ mockpp_production.bpr \ mockpp_production.bpf \ + mockpp_cxxtest.bpr \ + mockpp_cxxtest.bpf \ readability.bpf \ readability.bpr \ mock_greeter.bpf \ Index: mockpp.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpf,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- mockpp.bpf 17 Dec 2005 18:38:46 -0000 1.31 +++ mockpp.bpf 28 Dec 2005 21:31:40 -0000 1.32 @@ -1,46 +1,46 @@ -USELIB("h:\tmp\compile\mockpp_cxxtest_34.lib"); -USELIB("h:\tmp\compile\mockpp_production_34.lib"); -//--------------------------------------------------------------------------- -USEUNIT("..\mockpp\util\NotImplementedException.cpp"); -USEUNIT("..\mockpp\util\AssertMo.cpp"); -USEUNIT("..\mockpp\compat\AssertionFailedError.cpp"); -USEUNIT("..\mockpp\compat\Exception.cpp"); -USEUNIT("..\mockpp\compat\Formatter.cpp"); -USEUNIT("..\mockpp\compat\Assert.cpp"); -USEUNIT("..\mockpp\chaining\ChainingMockObjectSupport.cpp"); -USEUNIT("..\mockpp\ExpectationCounter.cpp"); -USEUNIT("..\mockpp\ThrowableList.cpp"); -USEUNIT("..\mockpp\Verifiable.cpp"); -USEUNIT("..\mockpp\VerifiableList.cpp"); -USEUNIT("..\mockpp\visiting\VisitableMockObject.cpp"); -USEUNIT("..\mockpp\visiting\VisitableMockMethod.cpp"); -USEUNIT("..\mockpp\MixedMockObject.cpp"); -USEUNIT("..\mockpp\Throwable.cpp"); -USEUNIT("..\mockpp\TrackingCounter.cpp"); -USEUNIT("..\mockpp\mockpp.cpp"); -USEUNIT("..\mockpp\MockObject.cpp"); -USEUNIT("..\mockpp\framework\VerifyingTestCase.cpp"); -USEUNIT("..\mockpp\framework\VerifyingTestCaller.cpp"); -USEUNIT("..\mockpp\SelfDescribing.cpp"); -USEUNIT("..\mockpp\chaining\ChainableMockObject.cpp"); -USEUNIT("..\mockpp\builder\BuilderNamespace.cpp"); -USEUNIT("..\mockpp\stub\VoidStub.cpp"); -USEUNIT("..\mockpp\chaining\Invocation.cpp"); -USEUNIT("..\mockpp\constraint\IsNothing.cpp"); -USEUNIT("..\mockpp\constraint\IsAnything.cpp"); -USEUNIT("..\mockpp\matcher\TypelessMatcher.cpp"); -USEUNIT("..\mockpp\matcher\InvokeAtMostMatcher.cpp"); -USEUNIT("..\mockpp\matcher\InvokeAtLeastOnceMatcher.cpp"); -USEUNIT("..\mockpp\matcher\UnlimitedMatcher.cpp"); -USEUNIT("..\mockpp\matcher\InvokeCountMatcher.cpp"); -USEUNIT("..\mockpp\matcher\InvokedRecorder.cpp"); -USEUNIT("..\mockpp\matcher\InvokeOnceMatcher.cpp"); -USEUNIT("..\mockpp\matcher\TestFailureMatcher.cpp"); -USEUNIT("..\mockpp\matcher\InvokeAtLeastMatcher.cpp"); -USEUNIT("..\mockpp\builder\IdentityBuilder.cpp"); -USEUNIT("..\mockpp\constraint\TypelessConstraint.cpp"); -USEUNIT("..\mockpp\constraint\ConstraintSet.cpp"); -USEUNIT("..\mockpp\MockTimeServer.cpp"); -//--------------------------------------------------------------------------- -This file is used by the project manager only and should be treated like the project file -DllEntryPoint +USELIB("h:\tmp\compile\mockpp_cxxtest_34.lib"); +USELIB("h:\tmp\compile\mockpp_production_34.lib"); +//--------------------------------------------------------------------------- +USEUNIT("..\mockpp\util\NotImplementedException.cpp"); +USEUNIT("..\mockpp\util\AssertMo.cpp"); +USEUNIT("..\mockpp\compat\AssertionFailedError.cpp"); +USEUNIT("..\mockpp\compat\Exception.cpp"); +USEUNIT("..\mockpp\compat\Formatter.cpp"); +USEUNIT("..\mockpp\compat\Asserter.cpp"); +USEUNIT("..\mockpp\chaining\ChainingMockObjectSupport.cpp"); +USEUNIT("..\mockpp\ExpectationCounter.cpp"); +USEUNIT("..\mockpp\ThrowableList.cpp"); +USEUNIT("..\mockpp\Verifiable.cpp"); +USEUNIT("..\mockpp\VerifiableList.cpp"); +USEUNIT("..\mockpp\visiting\VisitableMockObject.cpp"); +USEUNIT("..\mockpp\visiting\VisitableMockMethod.cpp"); +USEUNIT("..\mockpp\MixedMockObject.cpp"); +USEUNIT("..\mockpp\Throwable.cpp"); +USEUNIT("..\mockpp\TrackingCounter.cpp"); +USEUNIT("..\mockpp\mockpp.cpp"); +USEUNIT("..\mockpp\MockObject.cpp"); +USEUNIT("..\mockpp\framework\VerifyingTestCase.cpp"); +USEUNIT("..\mockpp\framework\VerifyingTestCaller.cpp"); +USEUNIT("..\mockpp\SelfDescribing.cpp"); +USEUNIT("..\mockpp\chaining\ChainableMockObject.cpp"); +USEUNIT("..\mockpp\builder\BuilderNamespace.cpp"); +USEUNIT("..\mockpp\stub\VoidStub.cpp"); +USEUNIT("..\mockpp\chaining\Invocation.cpp"); +USEUNIT("..\mockpp\constraint\IsNothing.cpp"); +USEUNIT("..\mockpp\constraint\IsAnything.cpp"); +USEUNIT("..\mockpp\matcher\TypelessMatcher.cpp"); +USEUNIT("..\mockpp\matcher\InvokeAtMostMatcher.cpp"); +USEUNIT("..\mockpp\matcher\InvokeAtLeastOnceMatcher.cpp"); +USEUNIT("..\mockpp\matcher\UnlimitedMatcher.cpp"); +USEUNIT("..\mockpp\matcher\InvokeCountMatcher.cpp"); +USEUNIT("..\mockpp\matcher\InvokedRecorder.cpp"); +USEUNIT("..\mockpp\matcher\InvokeOnceMatcher.cpp"); +USEUNIT("..\mockpp\matcher\TestFailureMatcher.cpp"); +USEUNIT("..\mockpp\matcher\InvokeAtLeastMatcher.cpp"); +USEUNIT("..\mockpp\builder\IdentityBuilder.cpp"); +USEUNIT("..\mockpp\constraint\TypelessConstraint.cpp"); +USEUNIT("..\mockpp\constraint\ConstraintSet.cpp"); +USEUNIT("..\mockpp\MockTimeServer.cpp"); +//--------------------------------------------------------------------------- +This file is used by the project manager only and should be treated like the project file +DllEntryPoint |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:30:30
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1334/mockpp Modified Files: AbstractExpectation.h Makefile.am Throwable.cpp ThrowableList.cpp TrackingCounter.cpp VerifiableList.cpp Log Message: avoid name collision on win32 Index: TrackingCounter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- TrackingCounter.cpp 26 Nov 2005 18:00:17 -0000 1.11 +++ TrackingCounter.cpp 28 Dec 2005 21:30:16 -0000 1.12 @@ -34,7 +34,7 @@ #include <mockpp/TrackingCounter.h> #include <mockpp/VerifiableList.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/Formatter.h> Index: VerifiableList.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifiableList.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- VerifiableList.cpp 26 Nov 2005 18:00:17 -0000 1.19 +++ VerifiableList.cpp 28 Dec 2005 21:30:16 -0000 1.20 @@ -34,7 +34,7 @@ #include MOCKPP_ALGORITHM_H #include <mockpp/VerifiableList.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> namespace mockpp { Index: ThrowableList.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- ThrowableList.cpp 26 Nov 2005 18:27:30 -0000 1.23 +++ ThrowableList.cpp 28 Dec 2005 21:30:16 -0000 1.24 @@ -29,7 +29,7 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/Formatter.h> #include <mockpp/ThrowableList.h> Index: Throwable.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Throwable.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Throwable.cpp 13 Nov 2005 11:53:18 -0000 1.14 +++ Throwable.cpp 28 Dec 2005 21:30:16 -0000 1.15 @@ -30,7 +30,7 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/Throwable.h> Index: AbstractExpectation.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/AbstractExpectation.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- AbstractExpectation.h 7 May 2005 12:45:10 -0000 1.24 +++ AbstractExpectation.h 28 Dec 2005 21:30:16 -0000 1.25 @@ -34,7 +34,7 @@ #include <mockpp/mockpp.h> // always first #include <mockpp/Expectation.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/Formatter.h> Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- Makefile.am 28 Dec 2005 19:43:08 -0000 1.103 +++ Makefile.am 28 Dec 2005 21:30:16 -0000 1.104 @@ -84,6 +84,7 @@ mockpp_config-bcb5.h: perl -i.bak -pe "s/(.*mockpp_production)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg + perl -i.bak -pe "s/(.*mockpp_cxxtest)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg perl -i.bak -pe "s/\\\\(mockpp)_(\d*)\\\\/\\\\\1_$(LT_CURRENT)\\\\/g" $(top_srcdir)/bcb5/*.bpr perl -i.bak -pe "s/\\\\(mockpp)_(\d*)/\\\\\1_$(LT_CURRENT)/g" $(top_srcdir)/bcb5/*.bat perl -i.bak -pe "s/(.*mockpp)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:30:25
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1334/msvc2005/mockpp Modified Files: mockpp.vcproj Log Message: avoid name collision on win32 Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- mockpp.vcproj 28 Dec 2005 19:43:08 -0000 1.5 +++ mockpp.vcproj 28 Dec 2005 21:30:16 -0000 1.6 @@ -1,1041 +1,1041 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8,00" - Name="mockpp" - ProjectGUID="{4B2B3833-C35A-4F2F-BFAF-B686D3827531}" - RootNamespace="mockpp" - > - <Platforms> - <Platform - Name="Win32" [...2051 lines suppressed...] + > + </File> + <File + RelativePath="..\..\mockpp\visiting\VisitableMockObject.h" + > + </File> + <File + RelativePath="..\..\mockpp\visiting\VisitableMockObject_macro.h" + > + </File> + <File + RelativePath="..\..\mockpp\visiting\VisitableMockObject_template.h" + > + </File> + </Filter> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:30:24
|
Update of /cvsroot/mockpp/mockpp/mockpp/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1334/mockpp/util Modified Files: AssertMo.h Log Message: avoid name collision on win32 Index: AssertMo.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/util/AssertMo.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- AssertMo.h 26 Nov 2005 18:00:17 -0000 1.24 +++ AssertMo.h 28 Dec 2005 21:30:16 -0000 1.25 @@ -32,7 +32,7 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/Formatter.h> |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:29:57
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1020/mockpp/matcher Modified Files: InvokedRecorder.h Log Message: avoid name collision on win32 Index: InvokedRecorder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/InvokedRecorder.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- InvokedRecorder.h 27 Feb 2005 11:48:16 -0000 1.26 +++ InvokedRecorder.h 28 Dec 2005 21:29:19 -0000 1.27 @@ -39,7 +39,7 @@ #include <mockpp/matcher/TypelessMatcher.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/Formatter.h> |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1020/mockpp/tests Modified Files: AbstractInvocationDispatcher_test.cpp AnyArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp Assert_test.cpp ChainingMockBuilder_test.cpp ConstraintList_test.cpp ConstraintSet_test.cpp CustomStub_test.cpp DefaultResultStub_test.cpp Exception_test.cpp ExpectationBoundary_test.cpp ExpectationConglomeration_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp Formatter_test.cpp Invocation_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp MatchBuilder_test.cpp NoArgumentsMatcher_test.cpp NoException_test.cpp Or_test.cpp StringContains_test.cpp StringEndsWith_test.cpp StringStartsWith_test.cpp TestFailureMatcher_test.cpp TestFailureStub_test.cpp ThrowStub_test.cpp ThrowableList_test.cpp Throwable_test.cpp TrackingCounter_test.cpp VerifyingTestCaller_test.cpp VerifyingTestCase_test.cpp VisitableMockMethod_test.cpp VoidStub_test.cpp mockpp_test.cpp Log Message: avoid name collision on win32 Index: Or_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Or_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Or_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 +++ Or_test.cpp 28 Dec 2005 21:29:21 -0000 1.15 @@ -36,7 +36,7 @@ #include <mockpp/constraint/IsAnything.h> #include <mockpp/constraint/IsNothing.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class Or_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: TestFailureMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureMatcher_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TestFailureMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 +++ TestFailureMatcher_test.cpp 28 Dec 2005 21:29:21 -0000 1.13 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/matcher/TestFailureMatcher.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class TestFailureMatcher_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: TrackingCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TrackingCounter_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TrackingCounter_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 +++ TrackingCounter_test.cpp 28 Dec 2005 21:29:21 -0000 1.13 @@ -33,7 +33,7 @@ #include "SelectFramework.h" #include <mockpp/TrackingCounter.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/util/AssertMo.h> Index: Invocation_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Invocation_test.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Invocation_test.cpp 28 Dec 2005 09:23:31 -0000 1.23 +++ Invocation_test.cpp 28 Dec 2005 21:29:21 -0000 1.24 @@ -35,7 +35,7 @@ #include <mockpp/chaining/Invocation.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class Invocation_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ThrowableList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowableList_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ThrowableList_test.cpp 28 Dec 2005 09:23:31 -0000 1.19 +++ ThrowableList_test.cpp 28 Dec 2005 21:29:21 -0000 1.20 @@ -34,7 +34,7 @@ #include <mockpp/ThrowableList.h> #include <mockpp/Throwable.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> Index: IsAnything_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsAnything_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- IsAnything_test.cpp 28 Dec 2005 09:23:31 -0000 1.15 +++ IsAnything_test.cpp 28 Dec 2005 21:29:21 -0000 1.16 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsAnything.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsAnything_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: DefaultResultStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/DefaultResultStub_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- DefaultResultStub_test.cpp 28 Dec 2005 09:23:30 -0000 1.13 +++ DefaultResultStub_test.cpp 28 Dec 2005 21:29:21 -0000 1.14 @@ -33,7 +33,7 @@ #include <mockpp/stub/DefaultResultStub.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class DefaultResultStub_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ExpectationSegment_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSegment_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationSegment_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 +++ ExpectationSegment_test.cpp 28 Dec 2005 21:29:21 -0000 1.18 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationSegment.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationSegment_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: IsInstanceOf_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsInstanceOf_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- IsInstanceOf_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 +++ IsInstanceOf_test.cpp 28 Dec 2005 21:29:21 -0000 1.19 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsInstanceOf.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #ifndef MOCKPP_NO_RTTI Index: ExpectationList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationList_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationList_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 +++ ExpectationList_test.cpp 28 Dec 2005 21:29:21 -0000 1.21 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationList.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationList_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: IsCloseTo_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsCloseTo_test.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- IsCloseTo_test.cpp 28 Dec 2005 09:23:31 -0000 1.12 +++ IsCloseTo_test.cpp 28 Dec 2005 21:29:21 -0000 1.13 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsCloseTo.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsCloseTo_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: IsLessThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessThan_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- IsLessThan_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 +++ IsLessThan_test.cpp 28 Dec 2005 21:29:21 -0000 1.11 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsLessThan.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsLessThan_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ThrowStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ThrowStub_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ThrowStub_test.cpp 28 Dec 2005 09:23:31 -0000 1.16 +++ ThrowStub_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -33,7 +33,7 @@ #include <mockpp/stub/CustomStub.h> #include <mockpp/Throwable.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/stub/ThrowStub.h> Index: ExpectationCounterRange_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounterRange_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationCounterRange_test.cpp 28 Dec 2005 09:23:31 -0000 1.16 +++ ExpectationCounterRange_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -33,7 +33,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationCounter.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationCounterRange_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ExpectationMap_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationMap_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ExpectationMap_test.cpp 28 Dec 2005 09:23:31 -0000 1.20 +++ ExpectationMap_test.cpp 28 Dec 2005 21:29:21 -0000 1.21 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationMap.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationMap_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VerifyingTestCaller_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCaller_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- VerifyingTestCaller_test.cpp 28 Dec 2005 19:43:08 -0000 1.16 +++ VerifyingTestCaller_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -39,7 +39,7 @@ # include <memory> #endif -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #if defined (MOCKPP_USE_CXXTEST) Index: IsNothing_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsNothing_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsNothing_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 +++ IsNothing_test.cpp 28 Dec 2005 21:29:21 -0000 1.14 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsNothing.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsNothing_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: CustomStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CustomStub_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- CustomStub_test.cpp 28 Dec 2005 09:23:30 -0000 1.14 +++ CustomStub_test.cpp 28 Dec 2005 21:29:20 -0000 1.15 @@ -33,7 +33,7 @@ #include <mockpp/stub/CustomStub.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class CustomStub_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: Exception_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Exception_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Exception_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 +++ Exception_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/compat/Exception.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class Exception_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: VisitableMockMethod_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockMethod_test.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- VisitableMockMethod_test.cpp 28 Dec 2005 09:23:31 -0000 1.21 +++ VisitableMockMethod_test.cpp 28 Dec 2005 21:29:21 -0000 1.22 @@ -48,7 +48,7 @@ #include <mockpp/constraint/OutBound.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/Throwable.h> Index: Assert_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Assert_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Assert_test.cpp 28 Dec 2005 09:23:30 -0000 1.22 +++ Assert_test.cpp 28 Dec 2005 21:29:20 -0000 1.23 @@ -31,7 +31,7 @@ #include "SelectFramework.h" -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class Assert_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: IsLessOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsLessOrEqual_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- IsLessOrEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 +++ IsLessOrEqual_test.cpp 28 Dec 2005 21:29:21 -0000 1.11 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsLessOrEqual.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsLessOrEqual_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ExpectationValue_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationValue_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationValue_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 +++ ExpectationValue_test.cpp 28 Dec 2005 21:29:21 -0000 1.18 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationValue.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationValue_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: Formatter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Formatter_test.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- Formatter_test.cpp 28 Dec 2005 19:43:08 -0000 1.34 +++ Formatter_test.cpp 28 Dec 2005 21:29:21 -0000 1.35 @@ -33,7 +33,7 @@ #include "SelectFramework.h" #include <mockpp/compat/Formatter.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/AssertionFailedError.h> Index: VerifyingTestCase_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VerifyingTestCase_test.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- VerifyingTestCase_test.cpp 28 Dec 2005 09:23:31 -0000 1.22 +++ VerifyingTestCase_test.cpp 28 Dec 2005 21:29:21 -0000 1.23 @@ -45,7 +45,7 @@ #include <mockpp/ExpectationValue.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestResult.h> Index: IsGreaterThan_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterThan_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- IsGreaterThan_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 +++ IsGreaterThan_test.cpp 28 Dec 2005 21:29:21 -0000 1.11 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsGreaterThan.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsGreaterThan_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: NoException_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- NoException_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 +++ NoException_test.cpp 28 Dec 2005 21:29:21 -0000 1.8 @@ -46,7 +46,7 @@ #include <mockpp/util/AssertMo.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/Exception.h> #include "SelectFramework.h" Index: StringContains_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringContains_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- StringContains_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 +++ StringContains_test.cpp 28 Dec 2005 21:29:21 -0000 1.15 @@ -33,7 +33,7 @@ #include <mockpp/constraint/StringContains.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class StringContains_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ChainingMockBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainingMockBuilder_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- ChainingMockBuilder_test.cpp 28 Dec 2005 09:23:30 -0000 1.24 +++ ChainingMockBuilder_test.cpp 28 Dec 2005 21:29:20 -0000 1.25 @@ -42,7 +42,7 @@ #include <mockpp/stub/ReturnStub.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include "classes_ABCDE.h" Index: IsNot_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsNot_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- IsNot_test.cpp 28 Dec 2005 09:23:31 -0000 1.16 +++ IsNot_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -34,7 +34,7 @@ #include <mockpp/constraint/IsNot.h> #include <mockpp/constraint/IsAnything.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsNot_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: MatchBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/MatchBuilder_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- MatchBuilder_test.cpp 28 Dec 2005 09:23:31 -0000 1.25 +++ MatchBuilder_test.cpp 28 Dec 2005 21:29:21 -0000 1.26 @@ -36,7 +36,7 @@ #include <mockpp/builder/MatchBuilder.h> #include <mockpp/builder/BuilderNamespace.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/stub/StubHolder.h> Index: VoidStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VoidStub_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- VoidStub_test.cpp 28 Dec 2005 09:23:31 -0000 1.14 +++ VoidStub_test.cpp 28 Dec 2005 21:29:21 -0000 1.15 @@ -33,7 +33,7 @@ #include <mockpp/stub/VoidStub.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class VoidStub_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: IsEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsEqual_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- IsEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.11 +++ IsEqual_test.cpp 28 Dec 2005 21:29:21 -0000 1.12 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsEqual.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsEqual_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ConstraintSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ConstraintSet_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ConstraintSet_test.cpp 28 Dec 2005 09:23:30 -0000 1.18 +++ ConstraintSet_test.cpp 28 Dec 2005 21:29:20 -0000 1.19 @@ -35,7 +35,7 @@ #include <mockpp/constraint/ConstraintSet.h> #include <mockpp/constraint/IsEqual.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ConstraintSet_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ExpectationBoundary_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationBoundary_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationBoundary_test.cpp 28 Dec 2005 09:23:30 -0000 1.16 +++ ExpectationBoundary_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -36,7 +36,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationBoundary.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationBoundary_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ConstraintList_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ConstraintList_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ConstraintList_test.cpp 28 Dec 2005 09:23:30 -0000 1.6 +++ ConstraintList_test.cpp 28 Dec 2005 21:29:20 -0000 1.7 @@ -31,7 +31,7 @@ #include "SelectFramework.h" -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/constraint/ConstraintList.h> #include <mockpp/constraint/IsLessOrEqual.h> Index: StringStartsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringStartsWith_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- StringStartsWith_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 +++ StringStartsWith_test.cpp 28 Dec 2005 21:29:21 -0000 1.8 @@ -33,7 +33,7 @@ #include <mockpp/constraint/StringStartsWith.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class StringStartsWith_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ExpectationConglomeration_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationConglomeration_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ExpectationConglomeration_test.cpp 28 Dec 2005 09:23:31 -0000 1.16 +++ ExpectationConglomeration_test.cpp 28 Dec 2005 21:29:21 -0000 1.17 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationConglomeration.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationConglomeration_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: AnyArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AnyArgumentsMatcher_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- AnyArgumentsMatcher_test.cpp 28 Dec 2005 09:23:30 -0000 1.10 +++ AnyArgumentsMatcher_test.cpp 28 Dec 2005 21:29:20 -0000 1.11 @@ -33,7 +33,7 @@ #include <mockpp/matcher/AnyArgumentsMatcher.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class AnyArgumentsMatcher_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ArgumentsMatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ArgumentsMatcher_test.cpp 28 Dec 2005 09:23:30 -0000 1.15 +++ ArgumentsMatcher_test.cpp 28 Dec 2005 21:29:20 -0000 1.16 @@ -33,7 +33,7 @@ #include <mockpp/matcher/ArgumentsMatcher.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/chaining/Invocation.h> Index: TestFailureStub_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/TestFailureStub_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TestFailureStub_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 +++ TestFailureStub_test.cpp 28 Dec 2005 21:29:21 -0000 1.11 @@ -31,7 +31,7 @@ #include "SelectFramework.h" -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/stub/TestFailureStub.h> Index: IsSame_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsSame_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- IsSame_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 +++ IsSame_test.cpp 28 Dec 2005 21:29:21 -0000 1.14 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsSame.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsSame_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: StringEndsWith_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StringEndsWith_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- StringEndsWith_test.cpp 28 Dec 2005 09:23:31 -0000 1.7 +++ StringEndsWith_test.cpp 28 Dec 2005 21:29:21 -0000 1.8 @@ -33,7 +33,7 @@ #include <mockpp/constraint/StringEndsWith.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class StringEndsWith_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: ExpectationSet_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationSet_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ExpectationSet_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 +++ ExpectationSet_test.cpp 28 Dec 2005 21:29:21 -0000 1.19 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationSet.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationSet_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: IsGreaterOrEqual_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/IsGreaterOrEqual_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- IsGreaterOrEqual_test.cpp 28 Dec 2005 09:23:31 -0000 1.10 +++ IsGreaterOrEqual_test.cpp 28 Dec 2005 21:29:21 -0000 1.11 @@ -33,7 +33,7 @@ #include <mockpp/constraint/IsGreaterOrEqual.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class IsGreaterOrEqual_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: mockpp_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mockpp_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- mockpp_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 +++ mockpp_test.cpp 28 Dec 2005 21:29:21 -0000 1.18 @@ -31,7 +31,7 @@ #include "SelectFramework.h" -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> Index: Throwable_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Throwable_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- Throwable_test.cpp 28 Dec 2005 09:23:31 -0000 1.18 +++ Throwable_test.cpp 28 Dec 2005 21:29:21 -0000 1.19 @@ -32,7 +32,7 @@ #include "SelectFramework.h" #include <mockpp/Throwable.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/util/AssertMo.h> Index: NoArgumentsMatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoArgumentsMatcher_test.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- NoArgumentsMatcher_test.cpp 28 Dec 2005 09:23:31 -0000 1.13 +++ NoArgumentsMatcher_test.cpp 28 Dec 2005 21:29:21 -0000 1.14 @@ -35,7 +35,7 @@ #include <mockpp/chaining/Invocation.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class NoArgumentsMatcher_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK Index: AbstractInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractInvocationDispatcher_test.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- AbstractInvocationDispatcher_test.cpp 28 Dec 2005 09:23:30 -0000 1.26 +++ AbstractInvocationDispatcher_test.cpp 28 Dec 2005 21:29:19 -0000 1.27 @@ -35,7 +35,7 @@ #include <mockpp/chaining/AbstractInvocationDispatcher.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/Throwable.h> Index: ExpectationCounter_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ExpectationCounter_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ExpectationCounter_test.cpp 28 Dec 2005 09:23:31 -0000 1.17 +++ ExpectationCounter_test.cpp 28 Dec 2005 21:29:21 -0000 1.18 @@ -33,7 +33,7 @@ #include "SelectFramework.h" #include <mockpp/ExpectationCounter.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> class ExpectationCounter_test MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:29:33
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1020/mockpp/stub Modified Files: ReturnStub.h StubSequence.h TypelessStubSequence.h Log Message: avoid name collision on win32 Index: TypelessStubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- TypelessStubSequence.h 26 Nov 2005 20:16:55 -0000 1.9 +++ TypelessStubSequence.h 28 Dec 2005 21:29:19 -0000 1.10 @@ -35,7 +35,7 @@ #include MOCKPP_VECTOR_H #include <mockpp/stub/TypelessStub.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> namespace mockpp { Index: ReturnStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ReturnStub.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ReturnStub.h 6 Jan 2005 13:09:23 -0000 1.19 +++ ReturnStub.h 28 Dec 2005 21:29:19 -0000 1.20 @@ -37,7 +37,7 @@ #include <mockpp/mockpp.h> // always first #include <mockpp/compat/Formatter.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/stub/TypelessStub.h> Index: StubSequence.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- StubSequence.h 26 Nov 2005 20:16:55 -0000 1.27 +++ StubSequence.h 28 Dec 2005 21:29:19 -0000 1.28 @@ -39,7 +39,7 @@ #include MOCKPP_VECTOR_H #include <mockpp/stub/Stub.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> namespace mockpp { |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 21:28:58
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv950/mockpp/compat Modified Files: Formatter.cpp Makefile.am Log Message: avoid name collision on win32 Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Makefile.am 19 Sep 2005 18:34:35 -0000 1.11 +++ Makefile.am 28 Dec 2005 21:28:47 -0000 1.12 @@ -5,13 +5,13 @@ libcompat_la_SOURCES = \ Exception.cpp \ - Assert.cpp \ + Asserter.cpp \ Formatter.cpp \ AssertionFailedError.cpp libcompatincludedir = $(includedir)/mockpp/compat -libcompatinclude_HEADERS = Exception.h Assert.h Formatter.h \ +libcompatinclude_HEADERS = Exception.h Asserter.h Formatter.h \ AssertionFailedError.h CLEANFILES = *.~* *.~~* *~ *.old Index: Formatter.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Formatter.cpp 28 Dec 2005 19:43:08 -0000 1.46 +++ Formatter.cpp 28 Dec 2005 21:28:47 -0000 1.47 @@ -34,7 +34,7 @@ #include <cctype> #include <mockpp/compat/Formatter.h> -#include <mockpp/compat/Assert.h> +#include <mockpp/compat/Asserter.h> #include <mockpp/compat/AssertionFailedError.h> |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:20
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/mockpp Modified Files: Makefile.am mockpp.cpp mockpp.h Log Message: fixes bcb5, msvc Index: mockpp.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- mockpp.h 23 Dec 2005 22:03:30 -0000 1.68 +++ mockpp.h 28 Dec 2005 19:43:08 -0000 1.69 @@ -84,7 +84,7 @@ # ifdef _MSC_VER // Compilation Warning remover -// needed to prevent MSVC6 complain about itself :-/ +# pragma warning (disable:4800) // conversion int - bool # pragma warning (disable:4786) // identifier was truncated to 'number' characters in the debug information # pragma warning (disable:4251) // class 'type' needs to have dll-interface to be used by clients of class 'type2' # pragma warning (disable:4180) // qualifier applied to function type has no meaning @@ -153,7 +153,6 @@ #ifdef MOCKPP_USE_MINI_STL -#include <ministl/string> #define MOCKPP_STRING_H <ministl/string> #define MOCKPP_VECTOR_H <ministl/vector> #define MOCKPP_MAP_H <ministl/map> @@ -167,7 +166,6 @@ #else -#include <string> #define MOCKPP_STRING_H <string> #define MOCKPP_VECTOR_H <vector> #define MOCKPP_MAP_H <map> @@ -384,6 +382,8 @@ ////////////////////////////////////////////////// // +#include MOCKPP_STRING_H + //! Namespace for project "Mock Objects for C++" namespace mockpp { Index: mockpp.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- mockpp.cpp 23 Dec 2005 22:03:30 -0000 1.22 +++ mockpp.cpp 28 Dec 2005 19:43:08 -0000 1.23 @@ -124,6 +124,7 @@ extern AssertionFailedForwarder_t forwardAssertionFailed; AssertionFailedForwarder_t +MOCKPP_EXPORT setAssertionFailedForwarder(AssertionFailedForwarder_t fwd) { AssertionFailedForwarder_t temp = forwardAssertionFailed; Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- Makefile.am 28 Dec 2005 09:23:30 -0000 1.102 +++ Makefile.am 28 Dec 2005 19:43:08 -0000 1.103 @@ -116,6 +116,8 @@ echo "// derived from automatically generated config.h. See Makefile.am." >>$@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ echo "" >>$@ + echo "/* Define to use sprintf_s instead of sprintf. */" >>$@ + echo "#define HAVE_SPRINTF_S" $(SHELL) $(srcdir)/config/gen-config-common.sh $@ $(VERSION) $(PACKAGE) -test $@ -ef $(srcdir) || cp $@ $(srcdir) |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:20
|
Update of /cvsroot/mockpp/mockpp/mockpp/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/mockpp/config Modified Files: gen-config-common.sh Log Message: fixes bcb5, msvc Index: gen-config-common.sh =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/config/gen-config-common.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gen-config-common.sh 28 Dec 2005 09:23:30 -0000 1.2 +++ gen-config-common.sh 28 Dec 2005 19:43:08 -0000 1.3 @@ -7,16 +7,16 @@ #undef DEBUG /* Version number of package */ -#define MOCKPP_VERSION $2 +#define MOCKPP_VERSION "$2" /* Name of package */ -#define MOCKPP_PACKAGE $3 +#define MOCKPP_PACKAGE "$3" /* Define if you have CppUnit installed. */ #undef MOCKPP_USE_CPPUNIT /* Define to 1 if you have the <cppunit/Message.h> header file. */ -#undef HAVE_CPPUNIT_MESSAGE_H 1 +#undef HAVE_CPPUNIT_MESSAGE_H /* Define if you have CxxTest installed. */ #define MOCKPP_USE_CXXTEST |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:18
|
Update of /cvsroot/mockpp/mockpp/bcb5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/bcb5 Modified Files: basicmock.bpr chainmock.bpr chainmock2.bpr cppunit.bpf cppunit.bpr jmock_test.bpr mock_greeter.bpr mockpp.bpr mockpp_cxxtest.bpr mockpp_production.bpr poormock-se.bpr poormock.bpr readability.bpr verifying.bpf verifying.bpr visitmock.bpr visitmock2.bpr Log Message: fixes bcb5, msvc Index: poormock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock.bpr,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- poormock.bpr 17 Dec 2005 18:38:46 -0000 1.24 +++ poormock.bpr 28 Dec 2005 19:43:08 -0000 1.25 @@ -26,7 +26,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="poormock.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\3party"/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item1=..\mockpp\examples\tutorial;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item2=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item3=..\mockpp\examples\tutorial;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item4=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item5=..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item6=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item7=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item8=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item9=\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item10=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item12=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item13=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item14=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item15=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item16=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item17=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item18=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item19=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item20=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item21=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item22=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item23=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include -Item24=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item26=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item27=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item28=..\mockpp_34\tests;..\mockpp;$(BCB)\include -Item29=..\mockpp_34\tests;..\mockpp;$(BCB)/include +Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\3party +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item2=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item3=..\mockpp\examples\tutorial;.\..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item4=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item5=..\mockpp\examples\tutorial;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item6=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item7=..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item8=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item9=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item10=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item11=\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item12=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item13=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item14=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item15=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item16=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item17=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item18=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item19=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item20=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item21=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item22=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item23=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item24=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item25=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include +Item26=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item27=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item28=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item29=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl [HistoryLists\hlLibraryPath] Count=19 @@ -183,11 +183,5 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: verifying.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/verifying.bpr,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- verifying.bpr 17 Dec 2005 18:38:46 -0000 1.22 +++ verifying.bpr 28 Dec 2005 19:43:08 -0000 1.23 @@ -8,7 +8,7 @@ <RESFILES value=""/> <DEFFILE value=""/> <RESDEPEN value="$(RESFILES)"/> - <LIBFILES value="h:\tmp\compile\mockpp_34.lib h:\tmp\compile\cppunit_1_10_bcb5.lib"/> + <LIBFILES value="h:\tmp\compile\mockpp_34.lib"/> <LIBRARIES value=""/> <SPARELIBS value=""/> <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi @@ -25,7 +25,7 @@ <USERDEFINES value="__DLL___;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="verifying.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;"g:\data\src\cppunit-1.10.2\include\""/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..\3party;..;$(BCB)\include;"g:\data\src\cppunit-1.10.2\include\""/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -72,36 +72,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;g:\data\src\cppunit-1.10.2\include -Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item3=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item4=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item5=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item6=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item7=..\mockpp_34\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item8=..\mockpp_34\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include -Item9=..\mockpp_34\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item10=..\mockpp_34\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item11=..\..;$(BCB)\include;..\..\..\cppunit.ups\include -Item12=..\mockpp_34\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include -Item13=..;$(BCB)\include;..\..\..\..\cppunit.ups\include -Item14=..\mockpp_34\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include -Item15=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item16=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item17=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item18=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item19=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item20=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item21=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item22=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item23=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item24=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item25=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item26=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item27=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item28=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item29=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item0=..\3party;..;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\ +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\ +Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;g:\data\src\cppunit-1.10.2\include +Item3=..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item4=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item5=..\mockpp\examples\tutorial;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item6=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item7=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item8=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item9=..\mockpp_34\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item10=..\mockpp_34\examples\tutorial;..\..\..\..\src;$(BCB)\include;..\..\..\cppunit.ups\include +Item11=..\mockpp_34\examples\tutorial;..\..\..;$(BCB)\include;..\..\..\cppunit.ups\include +Item12=..\mockpp_34\examples\tutorial;..\..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item13=..\..;$(BCB)\include;..\..\..\cppunit.ups\include +Item14=..\mockpp_34\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item15=..;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item16=..\mockpp_34\examples\tutorial;..\examples\tutorial;..\examples;..\..\..\mockpp;$(BCB)\include;..\..\..\..\cppunit.ups\include +Item17=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item18=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item19=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item20=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item21=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item22=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item23=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item24=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item25=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item26=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item27=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item28=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item29=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include [HistoryLists\hlLibraryPath] Count=20 @@ -184,11 +184,5 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: mockpp_production.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp_production.bpr,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- mockpp_production.bpr 17 Dec 2005 18:38:46 -0000 1.17 +++ mockpp_production.bpr 28 Dec 2005 19:43:08 -0000 1.18 @@ -25,7 +25,7 @@ <USERDEFINES value="__DLL___;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mockpp_production.bpf"/> - <INCLUDEPATH value="..\mockpp\production;..;$(BCB)\include"/> + <INCLUDEPATH value="..\mockpp\production;..;$(BCB)\include;..\3party"/> <LIBPATH value="..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp-1.8.0;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> @@ -74,36 +74,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\production;..\..\mockpp;$(BCB)\include +Item0=..\mockpp\production;..;$(BCB)\include;..\3party Item1=..\mockpp\production;..;$(BCB)\include -Item2=..\mockpp\production;..;..\..\mockpp;$(BCB)\include -Item3=..\mockpp\production;.\..;$(BCB)\include -Item4=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include -Item5=..\..\mockpp-1.8.0;$(BCB)\include -Item6=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item7=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item8=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item9=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item10=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item11=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item12=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item13=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item14=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include -Item15=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item16=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item17=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include -Item18=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item19=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item20=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item21=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include -Item22=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include -Item23=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include -Item24=..;$(BCB)\include -Item25=..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;..\..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item26=..;$(BCB)\include;$(BCB)\include\vcl -Item27=..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item28=..\..\mockpp;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item29=..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item2=..\mockpp\production;..\..\mockpp;$(BCB)\include +Item3=..\mockpp\production;..;..\..\mockpp;$(BCB)\include +Item4=..\mockpp\production;.\..;$(BCB)\include +Item5=..\mockpp\production;..\..\mockpp-1.8.0;$(BCB)\include +Item6=..\..\mockpp-1.8.0;$(BCB)\include +Item7=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include +Item8=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item9=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item10=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item11=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item12=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item13=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item14=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item15=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include +Item16=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item17=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item18=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include +Item19=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item20=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item21=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item22=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;X:\Documents\src\cppunit-1.8.0\include +Item23=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include +Item24=mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include +Item25=..;$(BCB)\include +Item26=..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\compat;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\util;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\ulxmlrpcpp;..\..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item27=..;$(BCB)\include;$(BCB)\include\vcl +Item28=..\ulxmlrpcpp;h:\Programme\Borland\CBuilder5\Projects;\\SONNE\HOMES\src\ulxr\mockpp_34\mockpp;..;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item29=..\..\mockpp;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ [HistoryLists\hlLibraryPath] Count=18 Index: visitmock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock.bpr,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- visitmock.bpr 17 Dec 2005 18:38:46 -0000 1.23 +++ visitmock.bpr 28 Dec 2005 19:43:08 -0000 1.24 @@ -26,7 +26,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="visitmock.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;"X:\Documents\src\cppunit-1.10.2\include\""/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\3party"/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item1=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item2=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item3=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item4=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item5=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item6=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item7=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item8=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item10=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item12=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item13=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item14=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item15=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item16=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item17=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item18=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include -Item19=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item20=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item21=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item22=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item23=..\mockpp_34\tests;..\mockpp;$(BCB)\include -Item24=..\mockpp_34\tests;..\mockpp;$(BCB)/include -Item25=..\mockpp_34\tests;..\mockpp -Item26=..\mockpp -Item27=..\mockpp_34\tests;..\mockpp_34\mockpp -Item28=..\mockpp_34\mockpp -Item29=..\mockpp_34\tests;..\mockpp_34\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\3party +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item2=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item3=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item7=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item8=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item10=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item12=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item13=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item14=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item15=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item16=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item17=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item19=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item20=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include +Item21=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item22=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item23=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item24=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include +Item26=..\mockpp_34\tests;..\mockpp;$(BCB)/include +Item27=..\mockpp_34\tests;..\mockpp +Item28=..\mockpp +Item29=..\mockpp_34\tests;..\mockpp_34\mockpp [HistoryLists\hlLibraryPath] Count=19 @@ -183,11 +183,5 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: chainmock.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/chainmock.bpr,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- chainmock.bpr 17 Dec 2005 18:38:45 -0000 1.24 +++ chainmock.bpr 28 Dec 2005 19:43:08 -0000 1.25 @@ -26,7 +26,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="chainmock.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include;..\3party"/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;h:\home\arnold\cppunit-1.10.2\include\ -Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\ -Item2=..\.;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item3=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item5=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item7=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item8=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item10=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item12=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item13=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item14=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item15=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item16=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item17=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item19=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item20=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include -Item21=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item22=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item23=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item24=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include -Item26=..\mockpp_34\tests;..\mockpp;$(BCB)/include -Item27=..\mockpp_34\tests;..\mockpp -Item28=..\mockpp -Item29=..\mockpp_34\tests;..\mockpp_34\mockpp +Item0=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include;..\3party +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include +Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\;h:\home\arnold\cppunit-1.10.2\include\ +Item3=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\cppunit-1.10.2\include\ +Item4=..\.;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item6=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item7=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item8=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item9=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item10=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item12=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item13=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item14=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item15=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item16=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item17=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item18=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item19=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item20=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item21=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item22=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include +Item23=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item24=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item25=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item26=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item27=..\mockpp_34\tests;..\mockpp;$(BCB)\include +Item28=..\mockpp_34\tests;..\mockpp;$(BCB)/include +Item29=..\mockpp_34\tests;..\mockpp [HistoryLists\hlLibraryPath] Count=19 @@ -183,11 +183,5 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: poormock-se.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/poormock-se.bpr,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- poormock-se.bpr 17 Dec 2005 18:38:46 -0000 1.18 +++ poormock-se.bpr 28 Dec 2005 19:43:08 -0000 1.19 @@ -26,7 +26,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="poormock-se.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..\3party;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item1=..\mockpp\examples\tutorial;..\mockpp\..;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item2=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item3=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item5=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item7=\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item8=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item10=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item11=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item12=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item13=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item14=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item15=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item16=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item17=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item19=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item20=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item21=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include -Item22=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item23=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item24=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item26=..\mockpp_34\tests;..\mockpp;$(BCB)\include -Item27=..\mockpp_34\tests;..\mockpp;$(BCB)/include -Item28=..\mockpp_34\tests;..\mockpp -Item29=..\mockpp +Item0=..\3party;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item2=..\mockpp\examples\tutorial;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item3=..\mockpp\examples\tutorial;..\mockpp\..;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item4=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item5=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item6=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item7=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item8=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item9=\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item10=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item12=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item13=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item14=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item15=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item16=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item17=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item18=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item19=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item20=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item21=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item22=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item23=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include +Item24=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item26=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item27=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item28=..\mockpp_34\tests;..\mockpp;$(BCB)\include +Item29=..\mockpp_34\tests;..\mockpp;$(BCB)/include [HistoryLists\hlLibraryPath] Count=19 @@ -183,11 +183,5 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: visitmock2.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/visitmock2.bpr,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- visitmock2.bpr 17 Dec 2005 18:38:46 -0000 1.4 +++ visitmock2.bpr 28 Dec 2005 19:43:08 -0000 1.5 @@ -26,7 +26,7 @@ <USERDEFINES value="__DLL___"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="visitmock2.bpf"/> - <INCLUDEPATH value="..\mockpp\examples\tutorial;..;$(BCB)\include;"X:\Documents\src\cppunit-1.10.2\include\""/> + <INCLUDEPATH value="..\mockpp\examples\tutorial;..\3party;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include"/> <LIBPATH value="..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w-par"/> </MACROS> @@ -73,36 +73,36 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include -Item1=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item2=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include -Item3=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include -Item4=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item5=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include -Item6=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include -Item7=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include -Item8=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include -Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item10=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item11=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include -Item12=..;$(BCB)\include;X:\src\cppunit-1.8.0\include -Item13=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item14=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item15=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include -Item16=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item17=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ -Item18=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include -Item19=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item20=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item21=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat -Item22=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl -Item23=..\mockpp_34\tests;..\mockpp;$(BCB)\include -Item24=..\mockpp_34\tests;..\mockpp;$(BCB)/include -Item25=..\mockpp_34\tests;..\mockpp -Item26=..\mockpp -Item27=..\mockpp_34\tests;..\mockpp_34\mockpp -Item28=..\mockpp_34\mockpp -Item29=..\mockpp_34\tests;..\mockpp_34\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item0=..\3party;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item1=..\mockpp\examples\tutorial;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ +Item2=..\.;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include +Item3=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include +Item4=..\mockpp\examples\tutorial;..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include +Item5=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..;$(BCB)\include;..\..\..\cppunit.ups\include +Item6=..\mockpp_34\examples\tutorial;..\mockpp_34\examples;..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item7=..\mockpp_34\examples;..\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\cppunit\include;..\..\..\cppunit-1.8.0\include +Item8=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include;X:\src\cppunit-1.8.0\include +Item9=..\mockpp_34\tests;..;$(BCB)\include;..\..\cppunit\include +Item10=..\mockpp_34\tests;..;$(BCB)\include;B:\cvs\ups\src\3party\cppunit\include +Item11=..\mockpp_34\tests;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item12=..;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item13=..\mockpp_34\tests;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include +Item14=..;$(BCB)\include;X:\src\cppunit-1.8.0\include +Item15=\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp_34\tests;..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item16=..;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item17=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include +Item18=..\..\mockpp;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item19=.. ;..\mockpp_34\tests;..\mockpp;..\expat;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include\ +Item20=.. ;..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;h:\wx2\include +Item21=..\mockpp_34\tests;..\expat;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item22=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item23=..\mockpp;$(BCB)\include;$(BCB)\include\vcl;expat +Item24=..\mockpp_34\tests;..\mockpp;$(BCB)\include;$(BCB)\include\vcl +Item25=..\mockpp_34\tests;..\mockpp;$(BCB)\include +Item26=..\mockpp_34\tests;..\mockpp;$(BCB)/include +Item27=..\mockpp_34\tests;..\mockpp +Item28=..\mockpp +Item29=..\mockpp_34\tests;..\mockpp_34\mockpp [HistoryLists\hlLibraryPath] Count=19 @@ -183,11 +183,5 @@ [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 - -[Language] -ActiveLang= -ProjectLang= -RootDir= </IDEOPTIONS> </PROJECT> \ No newline at end of file Index: cppunit.bpf =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/cppunit.bpf,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- cppunit.bpf 15 Dec 2005 20:01:23 -0000 1.20 +++ cppunit.bpf 28 Dec 2005 19:43:08 -0000 1.21 @@ -1,5 +1,4 @@ USELIB("h:\tmp\compile\mockpp_34.lib"); -USELIB("h:\tmp\compile\cppunit_1_10_bcb5.lib"); USEUNIT("..\mockpp\examples\tutorial\cppunit.cpp"); //--------------------------------------------------------------------------- This file is used by the project manager only and should be treated like the project file Index: mockpp.bpr =================================================================== RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpr,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- mockpp.bpr 17 Dec 2005 18:38:46 -0000 1.53 +++ mockpp.bpr 28 Dec 2005 19:43:08 -0000 1.54 @@ -64,7 +64,7 @@ <USERDEFINES value="__DLL___;_DEBUG"/> <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/> <MAINSOURCE value="mockpp.bpf"/> - <INCLUDEPATH value="..\mockpp\visisting;..\mockpp\visiting;..\mockpp\framework;..\mockpp\visting;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/> + <INCLUDEPATH value="$(BCB)\include;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\framework;..\mockpp\visiting;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;..\3party;..\3party\cxxtest"/> <LIBPATH value="..\mockpp\visisting;..\mockpp\visiting;..\mockpp\framework;..\mockpp\visting;mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib"/> <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/> @@ -113,59 +113,60 @@ [HistoryLists\hlIncludePath] Count=30 -Item0=..\mockpp\framework;..\mockpp\visting;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include -Item1=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..\..\mockpp;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include -Item2=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include -Item3=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include -Item4=..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;h:\home\arnold\cppunit-1.10.2\include\ -Item5=..\mockpp\matcher;..;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item6=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item7=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item8=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\ -Item9=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include\ -Item10=$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include -Item11=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include -Item12=..;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include -Item13=..\mockpp;..\..\mockpp-1.8.0;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item14=..;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item15=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include -Item16=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item17=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item18=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item19=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item20=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include -Item21=..\mockpp\matcher;.... [truncated message content] |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:18
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/msvc2005/mockpp/examples/tutorial Modified Files: basicmock.vcproj chainmock.vcproj cppunit.vcproj poormock.vcproj poormock_se.vcproj visitmock.vcproj Log Message: fixes bcb5, msvc Index: basicmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/basicmock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- basicmock.vcproj 8 Dec 2005 18:15:33 -0000 1.2 +++ basicmock.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../.." + AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib" + AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/basicmock.exe" LinkIncremental="2" SuppressStartupBanner="true" Index: poormock_se.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/poormock_se.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock_se.vcproj 8 Dec 2005 18:15:33 -0000 1.2 +++ poormock_se.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../.." + AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib" + AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock_se.exe" LinkIncremental="2" SuppressStartupBanner="true" Index: poormock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/poormock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock.vcproj 8 Dec 2005 18:15:33 -0000 1.2 +++ poormock.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../.." + AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib" + AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock.exe" LinkIncremental="2" SuppressStartupBanner="true" Index: visitmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/visitmock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- visitmock.vcproj 8 Dec 2005 18:15:33 -0000 1.2 +++ visitmock.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../.." + AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib" + AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock.exe" LinkIncremental="2" SuppressStartupBanner="true" Index: chainmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/chainmock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- chainmock.vcproj 8 Dec 2005 18:15:33 -0000 1.2 +++ chainmock.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../../.." + AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib" + AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock.exe" LinkIncremental="2" SuppressStartupBanner="true" Index: cppunit.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/cppunit.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cppunit.vcproj 8 Dec 2005 18:15:33 -0000 1.2 +++ cppunit.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""G:\data\src\cppunit-1.10.2\include";../../../..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="..\..\..\..;..\..\..\../3party;..\..\..\..\3party\cxxtest;"G:\data\src\cppunit-1.10.2\include";"$(CPPUNIT_ROOT)/include"" PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,7 +70,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib cppunitd_dll.lib" + AdditionalDependencies="mockpp.lib" OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/cppunit.exe" LinkIncremental="2" SuppressStartupBanner="true" |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:17
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/msvc2005/mockpp Modified Files: mockpp.vcproj mockpp_cxxtest.vcproj mockpp_production.vcproj Log Message: fixes bcb5, msvc Index: mockpp_cxxtest.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp_cxxtest.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mockpp_cxxtest.vcproj 14 Dec 2005 17:23:24 -0000 1.2 +++ mockpp_cxxtest.vcproj 28 Dec 2005 19:43:08 -0000 1.3 @@ -4,6 +4,7 @@ Version="8,00" Name="mockpp_cxxtest" ProjectGUID="{C46232E9-BB75-49BB-ADE6-306433257444}" + RootNamespace="mockpp_cxxtest" Keyword="MFCDLLProj" > <Platforms> @@ -43,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../3party/cxxtest" + AdditionalIncludeDirectories="../..;../../3party/cxxtest;../../3party" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -68,6 +69,7 @@ /> <Tool Name="VCLibrarianTool" + OutputFile="..\lib\$(ProjectName).lib" /> <Tool Name="VCALinkTool" Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mockpp.vcproj 14 Dec 2005 17:23:24 -0000 1.4 +++ mockpp.vcproj 28 Dec 2005 19:43:08 -0000 1.5 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\3party\cxxtest;"G:\data\src\cppunit-1.10.2\include";..\..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="..\..;..\..\3party\cxxtest;..\..\3party;"$(CPPUNIT_ROOT)/include";"G:\data\src\cppunit-1.10.2\include"" PreprocessorDefinitions="WIN32,_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -69,7 +69,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="../lib/mockppd.lib" + OutputFile="..\lib\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool Index: mockpp_production.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp_production.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mockpp_production.vcproj 8 Dec 2005 18:15:28 -0000 1.2 +++ mockpp_production.vcproj 28 Dec 2005 19:43:08 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../.." + AdditionalIncludeDirectories="../..;../../3party" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -68,6 +68,7 @@ /> <Tool Name="VCLibrarianTool" + OutputFile="..\lib\$(ProjectName).lib" /> <Tool Name="VCALinkTool" |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:17
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/msvc2005/mockpp/tests Modified Files: mock_test.vcproj mock_test_win32.vcproj Log Message: fixes bcb5, msvc Index: mock_test_win32.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests/mock_test_win32.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mock_test_win32.vcproj 14 Dec 2005 17:23:25 -0000 1.1 +++ mock_test_win32.vcproj 28 Dec 2005 19:43:09 -0000 1.2 @@ -135,8 +135,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..;..\..\..\3party\cxxtest;"G:\data\src\cppunit-1.10.2\include";..\..;"$(CPPUNIT_ROOT)/include"" - PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL" + AdditionalIncludeDirectories="..\..\..;..\..\..\3party\cxxtest;..\..\..\3party;"G:\data\src\cppunit-1.10.2\include";"$(CPPUNIT_ROOT)/include"" + PreprocessorDefinitions="WIN32" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" @@ -162,7 +162,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib mockpp_cxxtest.lib" + AdditionalDependencies="mockpp.lib mockpp_cxxtest.lib" OutputFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test_win32.exe" LinkIncremental="2" SuppressStartupBanner="true" Index: mock_test.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests/mock_test.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mock_test.vcproj 14 Dec 2005 17:23:25 -0000 1.3 +++ mock_test.vcproj 28 Dec 2005 19:43:09 -0000 1.4 @@ -135,7 +135,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..;..\..\..\3party\cxxtest;"G:\data\src\cppunit-1.10.2\include";..\..;"$(CPPUNIT_ROOT)/include"" + AdditionalIncludeDirectories="..\..\..;..\..\..\3party;..\..\..\3party\cxxtest;"G:\data\src\cppunit-1.10.2\include";..\..;"$(CPPUNIT_ROOT)/include"" PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -162,7 +162,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib mockpp_cxxtest.lib" + AdditionalDependencies="mockpp.lib mockpp_cxxtest.lib" OutputFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test.exe" LinkIncremental="2" SuppressStartupBanner="true" |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:17
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/mockpp/examples/tutorial Modified Files: cppunit.cpp Log Message: fixes bcb5, msvc Index: cppunit.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/cppunit.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- cppunit.cpp 10 Dec 2005 20:07:21 -0000 1.13 +++ cppunit.cpp 28 Dec 2005 19:43:08 -0000 1.14 @@ -17,10 +17,14 @@ #include <mockpp/chaining/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> +#if defined(MOCKPP_USE_CPPUNIT) + #include <cppunit/extensions/TestFactoryRegistry.h> #include <cppunit/ui/text/TestRunner.h> #include <cppunit/extensions/HelperMacros.h> +#endif + #include "Calculator.h" using mockpp::eq; @@ -71,11 +75,17 @@ /** A helper class for the unit tests * @internal */ -class Calculator_test : public CppUnit::TestFixture +class Calculator_test +#if defined(MOCKPP_USE_CPPUNIT) + : public CppUnit::TestFixture +#endif + { public: - CPPUNIT_TEST_SUITE( Calculator_test ); +#if defined(MOCKPP_USE_CPPUNIT) + + CPPUNIT_TEST_SUITE( Calculator_test ); CPPUNIT_TEST(test_add); CPPUNIT_TEST(test_sub); CPPUNIT_TEST(test_add_v); @@ -84,6 +94,8 @@ CPPUNIT_TEST(test_network_read_c); CPPUNIT_TEST_SUITE_END(); +#endif + public: void test_add(); @@ -94,9 +106,12 @@ void test_network_read_c(); }; +#if defined(MOCKPP_USE_CPPUNIT) + // Automatically register tests CPPUNIT_TEST_SUITE_REGISTRATION(Calculator_test); +#endif // Test add(int) method void Calculator_test::test_add() @@ -267,10 +282,14 @@ if (argc != 1) global_error = argc; // disturb tests +#if defined(MOCKPP_USE_CPPUNIT) // create tests and run them CppUnit::TextUi::TestRunner runner; CppUnit::TestFactory ®istry = CppUnit::TestFactoryRegistry::getRegistry(); runner.addTest(registry.makeTest()); return runner.run() ? 0 : 1; +#else + return 0; +#endif } |
|
From: Ewald A. <ewa...@us...> - 2005-12-28 19:43:17
|
Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15261/msvc2005/mockpp/examples Modified Files: examples.vcproj Log Message: fixes bcb5, msvc Index: examples.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/examples.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- examples.vcproj 8 Dec 2005 18:15:31 -0000 1.2 +++ examples.vcproj 28 Dec 2005 19:43:09 -0000 1.3 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include" + AdditionalIncludeDirectories="..\..\..;..\..\..\3party;..\..\..\3party\cxxtest;$(CPPUNIT_ROOT)/include" PreprocessorDefinitions="WIN32,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -70,11 +70,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="mockppd.lib cppunitd_dll.lib" + AdditionalDependencies="mockpp.lib mockpp_cxxtest.lib" OutputFile="$(TEMP)\compile\mockpp\examples\Debug/examples.exe" LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" + AdditionalLibraryDirectories="..\..\lib;"$(CPPUNIT_ROOT)/lib"" GenerateDebugInformation="true" ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\Debug/examples.pdb" SubSystem="1" |
