mockpp-commits Mailing List for Mock Objects for C++ (Page 44)
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-03-25 18:43:45
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12755/mockpp/constraint Modified Files: ConstraintHolder.h Log Message: typo Index: ConstraintHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintHolder.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ConstraintHolder.h 29 Jan 2005 13:56:23 -0000 1.7 +++ ConstraintHolder.h 25 Mar 2005 18:43:33 -0000 1.8 @@ -84,7 +84,7 @@ * @return the costraint object */ #if defined(__BORLANDC__) && (__BORLANDC__ >= 560) - operator typename AutoPointer<Constraint<T> > () const // we we actually lie a bit + operator typename AutoPointer<Constraint<T> > () const // we actually lie a bit #else operator typename Constraint<T>::AP () const #endif @@ -94,7 +94,7 @@ private: - mutable typename Constraint<T>::AP constraint; // we we actually lie a bit + mutable typename Constraint<T>::AP constraint; // we actually lie a bit }; |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 18:43:13
|
Update of /cvsroot/mockpp/mockpp/mockpp/matcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12544/mockpp/matcher Modified Files: MatcherHolder.h Log Message: typo Index: MatcherHolder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/matcher/MatcherHolder.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- MatcherHolder.h 29 Jan 2005 13:56:24 -0000 1.8 +++ MatcherHolder.h 25 Mar 2005 18:43:04 -0000 1.9 @@ -88,7 +88,7 @@ * @return the matcher object */ #if defined(__BORLANDC__) && (__BORLANDC__ >= 560) - operator typename AutoPointer<InvocationMatcher<I> > () const // we we actually lie a bit + operator typename AutoPointer<InvocationMatcher<I> > () const // we actually lie a bit #else operator typename InvocationMatcher<I>::AP () const #endif @@ -98,7 +98,7 @@ private: - mutable typename InvocationMatcher<I>::AP matcher; // we we actually lie a bit + mutable typename InvocationMatcher<I>::AP matcher; // we actually lie a bit }; |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 17:21:14
|
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2704/mockpp/chaining Modified Files: mockpp_pti.h Log Message: correctly disable pti support Index: mockpp_pti.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/mockpp_pti.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mockpp_pti.h 25 Mar 2005 16:30:29 -0000 1.3 +++ mockpp_pti.h 25 Mar 2005 17:20:33 -0000 1.4 @@ -65,8 +65,9 @@ #else -#define MOCKPP_PTI_IMPLEMENT(I) /* empty by default */ -#define MOCKPP_PTI_DECLARE(I) /* empty by default */ +#define MOCKPP_PTI_IMPLEMENT(I) /* empty by default */ +#define MOCKPP_PTI_DECLARE(I) /* empty by default */ +#define MOCKPP_PTI_IMPLEMENT_BASICS /* empty by default */ #endif |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2704/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp ChainableMockObject_1_void_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_void_test.cpp CoreMock_test.cpp FIFOInvocationDispatcher_test.cpp InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp StubBuilder_test.cpp mock_test.cpp Log Message: correctly disable pti support Index: LIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/LIFOInvocationDispatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- LIFOInvocationDispatcher_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 +++ LIFOInvocationDispatcher_test.cpp 25 Mar 2005 17:20:35 -0000 1.16 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ChainableMockObject_5_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.8 +++ ChainableMockObject_5_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.9 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include "classes_ABCDE.h" Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_2_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 +++ ChainableMockObject_2_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_4_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.6 +++ ChainableMockObject_4_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- AbstractDynamicChainingMock_test.cpp 25 Mar 2005 16:53:30 -0000 1.25 +++ AbstractDynamicChainingMock_test.cpp 25 Mar 2005 17:20:35 -0000 1.26 @@ -40,10 +40,7 @@ #include <mockpp/chaining/LIFOInvocationDispatcher.h> #include <mockpp/chaining/FIFOInvocationDispatcher.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> Index: FIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/FIFOInvocationDispatcher_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- FIFOInvocationDispatcher_test.cpp 25 Mar 2005 16:53:31 -0000 1.16 +++ FIFOInvocationDispatcher_test.cpp 25 Mar 2005 17:20:35 -0000 1.17 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -42,10 +38,7 @@ #include <mockpp/chaining/FIFOInvocationDispatcher.h> #include <mockpp/chaining/Invokable.h> #include <mockpp/chaining/Invocation.h> - -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/VoidStub.h> Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- InvocationMocker_test.cpp 25 Mar 2005 16:53:31 -0000 1.28 +++ InvocationMocker_test.cpp 25 Mar 2005 17:20:35 -0000 1.29 @@ -37,10 +37,7 @@ #include <mockpp/chaining/InvocationMocker.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <mockpp/constraint/IsEqual.h> Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_1_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 +++ ChainableMockObject_1_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChainableMockObject_3_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 +++ ChainableMockObject_3_void_test.cpp 25 Mar 2005 17:20:35 -0000 1.7 @@ -37,10 +37,7 @@ #else -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> Index: StubBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubBuilder_test.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- StubBuilder_test.cpp 25 Mar 2005 16:53:36 -0000 1.11 +++ StubBuilder_test.cpp 25 Mar 2005 17:20:35 -0000 1.12 @@ -29,10 +29,6 @@ #define MOCKPP_ENABLE_DEFAULT_FORMATTER -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -45,10 +41,7 @@ #include <mockpp/builder/StubBuilder.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/StubHolder.h> #include <mockpp/stub/ThrowStub.h> Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- CoreMock_test.cpp 25 Mar 2005 16:53:31 -0000 1.18 +++ CoreMock_test.cpp 25 Mar 2005 17:20:35 -0000 1.19 @@ -40,10 +40,7 @@ #include <mockpp/chaining/LIFOInvocationDispatcher.h> #include <mockpp/chaining/FIFOInvocationDispatcher.h> -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/stub/ReturnStub.h> #include <cppunit/extensions/HelperMacros.h> Index: mock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/mock_test.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- mock_test.cpp 26 Jan 2005 21:59:13 -0000 1.20 +++ mock_test.cpp 25 Mar 2005 17:20:36 -0000 1.21 @@ -95,7 +95,14 @@ runner.addTest(registry.makeTest()); std::cout << "starting tests..\n"; - std::cout << " size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; + +#ifdef MOCKPP_PTI_WEAKNESS + std::cout << " - support pti-weakness enabled\n"; +#else + std::cout << " - support pti-weakness disabled\n"; +#endif + + std::cout << " - size of <char> is " << sizeof(MOCKPP_CHAR('x')) << std::endl; std::cout << "\n"; std::cout << "Options\n"; std::cout << " --show-name show method names before calling\n"; |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 17:20:44
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2704/mockpp/examples/tutorial Modified Files: chainmock.cpp Log Message: correctly disable pti support Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- chainmock.cpp 25 Mar 2005 16:53:29 -0000 1.8 +++ chainmock.cpp 25 Mar 2005 17:20:34 -0000 1.9 @@ -15,10 +15,7 @@ #include "interface.h" #include "consumer.h" -#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> -#endif - #include <mockpp/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 16:54:09
|
Update of /cvsroot/mockpp/mockpp/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22145/mockpp/examples/tutorial Modified Files: chainmock.cpp Log Message: work on support for weak compilers Index: chainmock.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/examples/tutorial/chainmock.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- chainmock.cpp 22 Mar 2005 22:03:24 -0000 1.7 +++ chainmock.cpp 25 Mar 2005 16:53:29 -0000 1.8 @@ -15,6 +15,10 @@ #include "interface.h" #include "consumer.h" +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <mockpp/chaining/ChainingMockObjectSupport.h> @@ -23,6 +27,10 @@ using namespace mockpp; +MOCKPP_PTI_DECLARE(mockpp::Invocation0); +MOCKPP_PTI_DECLARE(mockpp::Invocation1<std::string>); +MOCKPP_PTI_DECLARE(mockpp::Invocation1<unsigned>); + class ChainMock : public Interface , public mockpp::ChainableMockObject @@ -126,3 +134,9 @@ return 0; } + +MOCKPP_PTI_IMPLEMENT(mockpp::Invocation0); +MOCKPP_PTI_IMPLEMENT(mockpp::Invocation1<std::string>); +MOCKPP_PTI_IMPLEMENT(mockpp::Invocation1<unsigned>); + + |
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22145/mockpp/tests Modified Files: AbstractDynamicChainingMock_test.cpp CoreMock_test.cpp FIFOInvocationDispatcher_test.cpp InvocationMocker_test.cpp StubBuilder_test.cpp Log Message: work on support for weak compilers Index: CoreMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/CoreMock_test.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- CoreMock_test.cpp 27 Feb 2005 11:48:16 -0000 1.17 +++ CoreMock_test.cpp 25 Mar 2005 16:53:31 -0000 1.18 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -43,7 +39,10 @@ #include <mockpp/chaining/InvocationMocker.h> #include <mockpp/chaining/LIFOInvocationDispatcher.h> #include <mockpp/chaining/FIFOInvocationDispatcher.h> + +#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> +#endif #include <mockpp/stub/ReturnStub.h> Index: AbstractDynamicChainingMock_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/AbstractDynamicChainingMock_test.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- AbstractDynamicChainingMock_test.cpp 25 Mar 2005 10:12:56 -0000 1.24 +++ AbstractDynamicChainingMock_test.cpp 25 Mar 2005 16:53:30 -0000 1.25 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -43,7 +39,10 @@ #include <mockpp/chaining/InvocationMocker.h> #include <mockpp/chaining/LIFOInvocationDispatcher.h> #include <mockpp/chaining/FIFOInvocationDispatcher.h> + +#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> +#endif #include <mockpp/stub/ReturnStub.h> Index: InvocationMocker_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/InvocationMocker_test.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- InvocationMocker_test.cpp 27 Feb 2005 11:48:16 -0000 1.27 +++ InvocationMocker_test.cpp 25 Mar 2005 16:53:31 -0000 1.28 @@ -27,10 +27,6 @@ * ***************************************************************************/ -#ifdef MOCKPP_PTI_WEAKNESS_TEST -#define MOCKPP_PTI_WEAKNESS // before mockpp headers! -#endif - #include <mockpp/mockpp.h> // always first #ifndef HAVE_CPPUNIT @@ -40,7 +36,10 @@ #else #include <mockpp/chaining/InvocationMocker.h> + +#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> +#endif #include <mockpp/stub/ReturnStub.h> Index: StubBuilder_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/StubBuilder_test.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- StubBuilder_test.cpp 12 Jan 2005 20:24:30 -0000 1.10 +++ StubBuilder_test.cpp 25 Mar 2005 16:53:36 -0000 1.11 @@ -45,7 +45,9 @@ #include <mockpp/builder/StubBuilder.h> +#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> +#endif #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/StubHolder.h> Index: FIFOInvocationDispatcher_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/FIFOInvocationDispatcher_test.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- FIFOInvocationDispatcher_test.cpp 27 Feb 2005 11:48:16 -0000 1.15 +++ FIFOInvocationDispatcher_test.cpp 25 Mar 2005 16:53:31 -0000 1.16 @@ -42,7 +42,10 @@ #include <mockpp/chaining/FIFOInvocationDispatcher.h> #include <mockpp/chaining/Invokable.h> #include <mockpp/chaining/Invocation.h> + +#ifdef MOCKPP_PTI_WEAKNESS #include <mockpp/chaining/mockpp_pti.h> +#endif #include <mockpp/stub/ReturnStub.h> #include <mockpp/stub/VoidStub.h> |
Update of /cvsroot/mockpp/mockpp/mockpp/chaining In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/mockpp/chaining Modified Files: AbstractDynamicChainingMock.h CoreMock.h FIFOInvocationDispatcher.h InvocationMocker.h LIFOInvocationDispatcher.h mockpp_pti.h Log Message: work on support for weak compilers Index: InvocationMocker.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- InvocationMocker.h 22 Mar 2005 22:03:23 -0000 1.27 +++ InvocationMocker.h 25 Mar 2005 16:30:29 -0000 1.28 @@ -385,7 +385,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation for helper objects to mock void invocations. @@ -433,17 +433,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness + /** Declare specialized methods for mockpp::InvocationMocker. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) \ +template<> \ mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>(); \ \ +template<> \ mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>(\ mockpp::AutoPointer<mockpp::InvocationMockerBase<void, I>::DescriberBase> in_describer ); \ \ +template<> \ void mockpp::InvocationMocker<void, I>::invoke( const I &invocation ); @@ -451,19 +455,22 @@ * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) \ +template<> \ mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>() \ : InvocationMockerBase<void, I>( new mockpp::InvocationMockerBase<void, I>::DefaultDescriber(), \ new mockpp::TypelessStubAdapter<void, I>(new mockpp::VoidStub)) \ { \ } \ \ +template<> \ mockpp::InvocationMocker<void, I>::InvocationMocker<void, I>(\ mockpp::AutoPointer<mockpp::InvocationMockerBase<void, I>::DescriberBase> in_describer ) \ : InvocationMockerBase<void, I>( in_describer, \ - new mockpp::TypelessStubAdapter<void, I>(new mockpp::VoidStub)) \ + new mockpp::TypelessStubAdapter<void, I>(new mockpp::VoidStub)) \ { \ } \ \ +template<> \ void mockpp::InvocationMocker<void, I>::invoke( const I &invocation ) \ { \ for ( Iterator it = this->matchers.begin(); it != this->matchers.end(); ++it ) \ Index: LIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/LIFOInvocationDispatcher.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- LIFOInvocationDispatcher.h 11 Mar 2005 00:24:55 -0000 1.10 +++ LIFOInvocationDispatcher.h 25 Mar 2005 16:30:29 -0000 1.11 @@ -73,7 +73,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation to dispatch void invokables Last-In-First-Out @@ -107,19 +107,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::LIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ +template<> \ void mockpp::LIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ); /** Implement specialized methods for mockpp::LIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ +template<> \ void mockpp::LIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ) \ { \ Iterator it = this->invokables.rbegin(); \ Index: CoreMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/CoreMock.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- CoreMock.h 23 Jan 2005 21:18:57 -0000 1.11 +++ CoreMock.h 25 Mar 2005 16:30:29 -0000 1.12 @@ -84,7 +84,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation of a helper chaining mock for void methods. @@ -126,18 +126,20 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::CoreMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_DECL(I) \ +template<> \ void mockpp::CoreMock<void, I>::invoke( const I &invocation ); /** Implement specialized methods for mockpp::CoreMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_COREMOCK_PTI_IMPL(I) \ +template<> \ void mockpp::CoreMock<void, I>::invoke( const I &invocation ) \ { \ mockInvocation( invocation ); \ Index: mockpp_pti.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/mockpp_pti.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mockpp_pti.h 15 Jan 2005 12:22:26 -0000 1.2 +++ mockpp_pti.h 25 Mar 2005 16:30:29 -0000 1.3 @@ -31,7 +31,7 @@ #define MOCKPP_PTI_H -#ifdef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifdef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness #include <mockpp/mockpp.h> @@ -39,13 +39,15 @@ #include <mockpp/chaining/FIFOInvocationDispatcher.h> #include <mockpp/chaining/CoreMock.h> #include <mockpp/chaining/InvocationMocker.h> -#include <mockpp/chaining/AbstractDynamicChainingMock.h> -#include <mockpp/stub/ThrowStub.h> -#include <mockpp/stub/TypelessStub.h> +#include <mockpp/chaining/AbstractDynamicChainingMock.h> +#include <mockpp/stub/ThrowStub.h> +#include <mockpp/stub/TypelessStub.h> + +#define MOCKPP_PTI_IMPLEMENT_BASICS \ + MOCKPP_THROWSTUB_PTI_IMPL #define MOCKPP_PTI_IMPLEMENT(I) \ - MOCKPP_THROWSTUB_PTI_IMPL(I) \ - MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ + MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ MOCKPP_INVOCATIONMOCKER_PTI_IMPL(I) \ @@ -53,8 +55,8 @@ MOCKPP_COREMOCK_PTI_IMPL(I) #define MOCKPP_PTI_DECLARE(I) \ - MOCKPP_THROWSTUB_PTI_DECL(I) \ - MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ + MOCKPP_THROWSTUB_PTI_DECL \ + MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ MOCKPP_LIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ MOCKPP_INVOCATIONMOCKER_PTI_DECL(I) \ Index: FIFOInvocationDispatcher.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/FIFOInvocationDispatcher.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- FIFOInvocationDispatcher.h 11 Mar 2005 00:24:55 -0000 1.10 +++ FIFOInvocationDispatcher.h 25 Mar 2005 16:30:29 -0000 1.11 @@ -73,7 +73,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation to dispatch void invokables First-In-First-Out @@ -107,19 +107,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::FIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_DECL(I) \ +template<> \ void mockpp::FIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ); /** Implement specialized methods for mockpp::FIFOInvocationDispatcher. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_FIFOINVOCATIONDISPATCHER_PTI_IMPL(I) \ +template<> \ void mockpp::FIFOInvocationDispatcher<void, I>::dispatch( const I &invocation ) \ { \ Iterator it = this->invokables.begin(); \ Index: AbstractDynamicChainingMock.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- AbstractDynamicChainingMock.h 11 Mar 2005 00:24:55 -0000 1.22 +++ AbstractDynamicChainingMock.h 25 Mar 2005 16:30:28 -0000 1.23 @@ -256,7 +256,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation of a chaining mock for void methods. @@ -315,19 +315,21 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::AbstractDynamicChainingMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_DECL(I) \ +template<> \ void mockpp::AbstractDynamicChainingMock<void, I>::mockInvocation( const I &invocation ); /** Implement specialized methods for mockpp::AbstractDynamicChainingMock. * Neccessary for compiler with weak template capabilities. */ #define MOCKPP_ABSTRACTDYNAMICCHAININGMOCK_PTI_IMPL(I) \ +template<> \ void mockpp::AbstractDynamicChainingMock<void, I>::mockInvocation( const I &invocation ) \ { \ if ( this->failure.get() != 0 ) \ |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 16:31:09
|
Update of /cvsroot/mockpp/mockpp/mockpp/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/mockpp/builder Modified Files: StubBuilder.h Log Message: work on support for weak compilers Index: StubBuilder.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/StubBuilder.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- StubBuilder.h 30 Jan 2005 12:09:17 -0000 1.23 +++ StubBuilder.h 25 Mar 2005 16:30:28 -0000 1.24 @@ -56,14 +56,14 @@ { public: -#ifdef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifdef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Indicates that the method is \c void. * @return the builder object */ IdentityBuilder& isVoid() { - // setStub( new VoidStub()); + setStub( new VoidStub()); return *this; } @@ -87,7 +87,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation for builder class for void stub related purposes. |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 16:31:07
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523 Modified Files: configure.in Log Message: work on support for weak compilers Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- configure.in 25 Mar 2005 10:27:29 -0000 1.67 +++ configure.in 25 Mar 2005 16:30:26 -0000 1.68 @@ -351,6 +351,9 @@ AH_TEMPLATE([DEBUG], [Define to turn debugging globally on.]) +AH_TEMPLATE([MOCKPP_PTI_WEAKNESS], +[Turn on support for weak template capabilities.]) + # ---------------------------------------------------------------------------- AC_OUTPUT(\ |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 16:30:58
|
Update of /cvsroot/mockpp/mockpp/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/mockpp/tests Modified Files: ChainableMockObject_1_void_test.cpp ChainableMockObject_2_void_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_void_test.cpp ChainableMockObject_5_void_test.cpp Makefile.am Log Message: work on support for weak compilers Index: ChainableMockObject_5_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_5_void_test.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ChainableMockObject_5_void_test.cpp 24 Mar 2005 21:43:07 -0000 1.7 +++ ChainableMockObject_5_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.8 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include "classes_ABCDE.h" @@ -70,6 +74,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_5_void_test); +typedef mockpp::Invocation5<unsigned, unsigned, unsigned, unsigned, unsigned> mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_5_void_Interface { public: @@ -363,4 +372,7 @@ } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation5_unsigned_unsigned_unsigned_unsigned_unsigned) + + #endif // HAVE_CPPUNIT Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- Makefile.am 25 Mar 2005 10:13:18 -0000 1.68 +++ Makefile.am 25 Mar 2005 16:30:31 -0000 1.69 @@ -1,4 +1,4 @@ -INCLUDES = -I. -I$(top_srcdir) $(all_includes) $(EA_EXTRA_INC) +INCLUDES = -I. -I$(top_srcdir) -I$(top_builddir) $(all_includes) $(EA_EXTRA_INC) CLEANFILES = *.~* *.~~* *~ @@ -17,7 +17,7 @@ TESTS = $(SINGLE_TESTS) raw-gen: - cpp -DHAVE_CPPUNIT $(srcdir)/ChainableMockObject_5_test.cpp $(INCLUDES) >x.cpp + cpp -DHAVE_CPPUNIT -DHAVE_CONFIG_H $(srcdir)/InvocationMocker_test.cpp $(INCLUDES) >x.cpp sed -e s,^#,//,g x.cpp >xx.cpp raw-comp: raw-gen @@ -100,8 +100,6 @@ done; echo "Store all the suppression block to $(srcdir)/$(VG_SUPPRESS)" -applnkAnwendungdir = $(kde_appsdir)/Anwendung - #compilecheck_LDADD = $(top_builddir)/mockpp/libmockpp.la $(EA_EXTRA_LIB) \ # $(LIBCPPUNIT) Index: ChainableMockObject_2_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_2_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_2_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_2_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -64,6 +68,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_2_void_test); +typedef mockpp::Invocation2<unsigned, unsigned> mockpp_Invocation2_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation2_unsigned_unsigned) + + class MyChainableMockObject_2_void : public mockpp::ChainableMockObject { public: @@ -104,41 +113,43 @@ chain.stubs(mockpp::once()) .with(mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(21)); - + try { - mcm.chainable(12, 23); + mcm.chainable(12, 23); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 12); } - + try { - mcm.chainable(32, 21); + mcm.chainable(32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 21); } - + try { - mcm.chainable(1, 2); + mcm.chainable(1, 2); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation2_unsigned_unsigned) + #endif // HAVE_CPPUNIT Index: ChainableMockObject_1_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_1_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_1_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_1_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -64,6 +68,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_1_void_test); +MOCKPP_PTI_DECLARE(mockpp::Invocation1<unsigned>) + + class MyChainableMockObject_1_void : public mockpp::ChainableMockObject { public: @@ -102,41 +109,44 @@ .will(mockpp::throwException<void, int>( 21 )); chain.stubs(mockpp::once()) - .with(mockpp::eq( (unsigned int) 21)) + .with(mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(12)); - + try { - mcm.chainable(12); + mcm.chainable(12); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 21); } - + try { - mcm.chainable(21); + mcm.chainable(21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 12); } - + try { - mcm.chainable(9); + mcm.chainable(9); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp::Invocation1<unsigned>) + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_4_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_4_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_4_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_4_void_test.cpp 25 Mar 2005 16:30:31 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -64,6 +68,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_4_void_test); +typedef mockpp::Invocation4<unsigned, unsigned, unsigned, unsigned> mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) + + class MyChainableMockObject_4_void : public mockpp::ChainableMockObject { public: @@ -108,41 +117,44 @@ .with(mockpp::eq( (unsigned int) 54), mockpp::eq( (unsigned int) 43), mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(4321)); - + try { - mcm.chainable(12, 23, 34, 45); + mcm.chainable(12, 23, 34, 45); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 1234); } - + try { - mcm.chainable(54, 43, 32, 21); + mcm.chainable(54, 43, 32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 4321); } - + try { - mcm.chainable(1, 2, 3, 4); + mcm.chainable(1, 2, 3, 4); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation4_unsigned_unsigned_unsigned_unsigned) + + #endif // HAVE_CPPUNIT Index: ChainableMockObject_3_void_test.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ChainableMockObject_3_void_test.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ChainableMockObject_3_void_test.cpp 30 Dec 2004 20:54:05 -0000 1.5 +++ ChainableMockObject_3_void_test.cpp 25 Mar 2005 16:30:30 -0000 1.6 @@ -37,6 +37,10 @@ #else +#ifdef MOCKPP_PTI_WEAKNESS +#include <mockpp/chaining/mockpp_pti.h> +#endif + #include <mockpp/ChainableMockObject.h> #include <cppunit/extensions/HelperMacros.h> @@ -63,6 +67,10 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ChainableMockObject_3_void_test); +typedef mockpp::Invocation3<unsigned, unsigned, unsigned> mockpp_Invocation3_unsigned_unsigned_unsigned; + +MOCKPP_PTI_DECLARE(mockpp_Invocation3_unsigned_unsigned_unsigned) + class MyChainableMockObject_3_void : public mockpp::ChainableMockObject { @@ -106,41 +114,44 @@ chain.stubs(mockpp::once()) .with(mockpp::eq( (unsigned int) 43), mockpp::eq( (unsigned int) 32), - mockpp::eq( (unsigned int) 21)) + mockpp::eq( (unsigned int) 21)) .will(mockpp::throwException<void, int>(321)); - + try { - mcm.chainable(12, 23, 34); + mcm.chainable(12, 23, 34); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 123); } - + try { - mcm.chainable(43, 32, 21); + mcm.chainable(43, 32, 21); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(int i) { CPPUNIT_ASSERT(i == 321); } - + try { - mcm.chainable(1, 2, 3); + mcm.chainable(1, 2, 3); CPPUNIT_ASSERT_MESSAGE("should have thrown", false); } catch(mockpp::AssertionFailedError &ex) { CPPUNIT_ASSERT(ex.getMessage().find(MOCKPP_PCHAR("unexpected invocation")) != mockpp::String::npos); } - - mcm.verify(); + + mcm.verify(); } +MOCKPP_PTI_IMPLEMENT(mockpp_Invocation3_unsigned_unsigned_unsigned) + + #endif // HAVE_CPPUNIT |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 16:30:56
|
Update of /cvsroot/mockpp/mockpp/mockpp/stub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11523/mockpp/stub Modified Files: ThrowStub.h TypelessStub.h Log Message: work on support for weak compilers Index: TypelessStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStub.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- TypelessStub.h 24 Mar 2005 20:51:30 -0000 1.13 +++ TypelessStub.h 25 Mar 2005 16:30:30 -0000 1.14 @@ -145,7 +145,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** Partial specialisation for base of adapters for the "translation" to @@ -176,12 +176,13 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness /** Declare specialized methods for mockpp::InvocationMocker. * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \ +template<> \ void mockpp::TypelessStubAdapter<void, I>::invoke( const I &); @@ -189,6 +190,7 @@ * Neccessary for compilers with weak template capabilities. */ #define MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \ +template<> \ void mockpp::TypelessStubAdapter<void, I>::invoke( const I &invocation) \ { \ this->stubber->typelessInvoke(); \ Index: ThrowStub.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- ThrowStub.h 11 Mar 2005 00:24:57 -0000 1.27 +++ ThrowStub.h 25 Mar 2005 16:30:29 -0000 1.28 @@ -117,7 +117,7 @@ }; -#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instatiation Weakness +#ifndef MOCKPP_PTI_WEAKNESS // Partial Template Instantiation Weakness /** A stub throwing exceptions. @@ -152,20 +152,23 @@ }; -#else // MOCKPP_PTI_WEAKNESS Partial Template Instatiation Weakness +#else // MOCKPP_PTI_WEAKNESS Partial Template Instantiation Weakness + /** Declare specialized methods for mockpp::InvocationMocker. * Neccessary for compiler with weak template capabilities. */ -#define MOCKPP_THROWSTUB_PTI_DECL(I) \ -void mockpp::ThrowStub<void, I>::invoke( const I &); +#define MOCKPP_THROWSTUB_PTI_DECL \ +template<> \ +void mockpp::ThrowStub<void>::typelessInvoke(); /** Implement specialized methods for mockpp::InvocationMocker. * Neccessary for compiler with weak template capabilities. */ -#define MOCKPP_THROWSTUB_PTI_IMPL(I) \ -virtual void mockpp::ThrowStub<void, I>::typelessInvoke() \ +#define MOCKPP_THROWSTUB_PTI_IMPL \ +template<> \ +void mockpp::ThrowStub<void>::typelessInvoke() \ { \ this->throwable.get()->throw_me(); \ } |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:27:38
|
Update of /cvsroot/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30249 Modified Files: configure.in Log Message: removed unmaintained (and somehow redundant) directory Index: configure.in =================================================================== RCS file: /cvsroot/mockpp/mockpp/configure.in,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- configure.in 22 Mar 2005 20:49:06 -0000 1.66 +++ configure.in 25 Mar 2005 10:27:29 -0000 1.67 @@ -357,6 +357,7 @@ Makefile \ \ bcb5/Makefile \ + \ bcbX/Makefile \ bcbX/cppunit-lib/Makefile \ \ @@ -370,10 +371,6 @@ msvc6/mockpp/tests/Makefile \ \ msvc7/Makefile \ - msvc7/lib/Makefile \ - msvc7/mockpp/Makefile \ - msvc7/examples/Makefile \ - msvc7/tests/Makefile \ \ msvc71/Makefile \ msvc71/lib/Makefile \ |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:27:08
|
Update of /cvsroot/mockpp/mockpp/msvc7/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29909/msvc7/tests Removed Files: .cvsignore Makefile.am tests.vcproj Log Message: removed unmaintained (and somehow redundant) directory --- .cvsignore DELETED --- --- Makefile.am DELETED --- --- tests.vcproj DELETED --- |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:27:08
|
Update of /cvsroot/mockpp/mockpp/msvc7/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29909/msvc7/examples Removed Files: .cvsignore examples.vcproj Makefile.am Log Message: removed unmaintained (and somehow redundant) directory --- .cvsignore DELETED --- --- examples.vcproj DELETED --- --- Makefile.am DELETED --- |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:27:07
|
Update of /cvsroot/mockpp/mockpp/msvc7/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29909/msvc7/lib Removed Files: .cvsignore Makefile.am Log Message: removed unmaintained (and somehow redundant) directory --- .cvsignore DELETED --- --- Makefile.am DELETED --- |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:27:07
|
Update of /cvsroot/mockpp/mockpp/msvc7/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29909/msvc7/mockpp Removed Files: .cvsignore Makefile.am mockpp.vcproj Log Message: removed unmaintained (and somehow redundant) directory --- .cvsignore DELETED --- --- Makefile.am DELETED --- --- mockpp.vcproj DELETED --- |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:27:07
|
Update of /cvsroot/mockpp/mockpp/msvc7 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29909/msvc7 Removed Files: vc7.sln vc7.suo Log Message: removed unmaintained (and somehow redundant) directory --- vc7.sln DELETED --- --- vc7.suo DELETED --- |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:25:11
|
Update of /cvsroot/mockpp/mockpp/msvc7 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29136/msvc7 Modified Files: Makefile.am Added Files: README Log Message: removed unmaintained (and somehow redundant) directory --- NEW FILE: README --- The files here have been removed due to the lack of maintainance. Please use the project files under msvc6 and convert them to msvc7 if needed. Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc7/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 30 Aug 2003 09:31:33 -0000 1.2 +++ Makefile.am 25 Mar 2005 10:24:59 -0000 1.3 @@ -1,10 +1,4 @@ -SUBDIRS = mockpp lib tests examples - -EXTRA_DIST = vc7.sln vc7.suo +EXTRA_DIST = README CLEANFILES = *.~* *.~~* *~ -AM_CFLAGS = -AM_CXXFLAGS = -AM_FFLAGS = -INCLUDES = |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:23:05
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27633/mockpp/examples/tutorial Modified Files: basicmock.vcproj chainmock.vcproj cppunit.vcproj poormock.vcproj visitmock.vcproj Log Message: updated project files Index: basicmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/basicmock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- basicmock.vcproj 23 Mar 2005 21:17:38 -0000 1.2 +++ basicmock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/basicmock.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -39,17 +39,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" - OutputFile=".\Debug/basicmock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/basicmock.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/basicmock.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool @@ -87,16 +87,16 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile="./basicmock.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" - OutputFile=".\Release./basicmock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release./basicmock.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" Index: visitmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/visitmock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- visitmock.vcproj 23 Mar 2005 21:17:56 -0000 1.2 +++ visitmock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/visitmock.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -39,17 +39,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" - OutputFile=".\Debug/visitmock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/visitmock.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/visitmock.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool @@ -87,9 +87,9 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile="./visitmock.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4"/> <Tool Name="VCCustomBuildTool"/> Index: poormock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/poormock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- poormock.vcproj 23 Mar 2005 21:17:56 -0000 1.2 +++ poormock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/poormock.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -39,17 +39,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" - OutputFile=".\Debug/poormock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/poormock.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/poormock.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -90,10 +90,10 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Release/poormock.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -102,16 +102,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" - OutputFile=".\Release/poormock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" - ProgramDatabaseFile=".\Release/poormock.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Release/poormock.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> Index: chainmock.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/chainmock.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- chainmock.vcproj 23 Mar 2005 21:17:39 -0000 1.2 +++ chainmock.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/chainmock.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -39,17 +39,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib" - OutputFile=".\Debug/chainmock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/chainmock.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/chainmock.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool @@ -87,16 +87,16 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile="./chainmock.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib" - OutputFile=".\Release/chainmock.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/chainmock.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" Index: cppunit.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/cppunit.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cppunit.vcproj 23 Mar 2005 21:17:43 -0000 1.2 +++ cppunit.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/cppunit.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -39,17 +39,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib cppunitd_dll.lib" - OutputFile=".\Debug/cppunit.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/cppunit.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/cppunit.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -90,10 +90,10 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Release/cppunit.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/" WarningLevel="4" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -102,16 +102,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib cppunit_dll.lib" - OutputFile=".\Release/cppunit.exe" + OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../../lib" - ProgramDatabaseFile=".\Release/cppunit.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Release/cppunit.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:23:04
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27633/mockpp/tests Modified Files: mock_test.vcproj Log Message: updated project files Index: mock_test.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/tests/mock_test.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mock_test.vcproj 23 Mar 2005 21:17:56 -0000 1.2 +++ mock_test.vcproj 25 Mar 2005 10:22:56 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\tests\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\tests\Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -28,10 +28,10 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Release/mock_test.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\tests\Release/mock_test.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\tests\Release/" + ObjectFile="C:\tmp\compile\mockpp\tests\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\tests\Release/" WarningLevel="4" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -40,16 +40,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib cppunit_dll.lib" - OutputFile=".\Release/mock_test.exe" + OutputFile="C:\tmp\compile\mockpp\tests\Release/mock_test.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" - ProgramDatabaseFile=".\Release/mock_test.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Release/mock_test.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Release/mock_test.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\tests\Release/mock_test.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\tests\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\tests\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -88,10 +88,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/mock_test.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\tests\Debug/" + ObjectFile="C:\tmp\compile\mockpp\tests\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\tests\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -101,12 +101,12 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib cppunitd_dll.lib" - OutputFile=".\Debug/mock_test.exe" + OutputFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/mock_test.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pdb" SubSystem="1" TargetMachine="1"/> <Tool |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:23:04
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27633/mockpp/examples Modified Files: examples.vcproj Log Message: updated project files Index: examples.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/examples.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- examples.vcproj 23 Mar 2005 21:17:33 -0000 1.2 +++ examples.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\examples\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\Debug" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/examples.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\Debug/examples.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\Debug/" + ObjectFile="C:\tmp\compile\mockpp\examples\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -39,17 +39,17 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockppd.lib cppunitd_dll.lib" - OutputFile=".\Debug/examples.exe" + OutputFile="C:\tmp\compile\mockpp\examples\Debug/examples.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\Debug/examples.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Debug/examples.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Debug/examples.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\Debug/examples.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> @@ -74,8 +74,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\examples\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\examples\Release" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -90,10 +90,10 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Release/examples.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\Release/examples.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\examples\Release/" + ObjectFile="C:\tmp\compile\mockpp\examples\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\Release/" WarningLevel="4" SuppressStartupBanner="TRUE" CompileAs="0"/> @@ -102,16 +102,16 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="mockpp.lib cppunit_dll.lib" - OutputFile=".\Release/examples.exe" + OutputFile="C:\tmp\compile\mockpp\examples\Release/examples.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="../../lib" - ProgramDatabaseFile=".\Release/examples.pdb" + ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Release/examples.pdb" SubSystem="1" TargetMachine="1"/> <Tool Name="VCMIDLTool" - TypeLibraryName=".\Release/examples.tlb" + TypeLibraryName="C:\tmp\compile\mockpp\examples\Release/examples.tlb" HeaderFileName=""/> <Tool Name="VCPostBuildEventTool"/> |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:23:04
|
Update of /cvsroot/mockpp/mockpp/msvc71/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27633/mockpp Modified Files: mockpp.vcproj Log Message: updated project files Index: mockpp.vcproj =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mockpp.vcproj 23 Mar 2005 21:17:29 -0000 1.2 +++ mockpp.vcproj 25 Mar 2005 10:22:55 -0000 1.3 @@ -12,8 +12,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\Debug" - IntermediateDirectory=".\Debug" + OutputDirectory="C:\tmp\compile\mockpp\Debug" + IntermediateDirectory="C:\tmp\compile\mockpp\Debug" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -26,10 +26,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Debug/mockpp.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\Debug/mockpp.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\Debug/" + ObjectFile="C:\tmp\compile\mockpp\Debug/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\Debug/" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="4" @@ -63,8 +63,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\Release" - IntermediateDirectory=".\Release" + OutputDirectory="C:\tmp\compile\mockpp\Release" + IntermediateDirectory="C:\tmp\compile\mockpp\Release" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" @@ -79,10 +79,10 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" RuntimeTypeInfo="TRUE" - PrecompiledHeaderFile=".\Release/mockpp.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="C:\tmp\compile\mockpp\Release/mockpp.pch" + AssemblerListingLocation="C:\tmp\compile\mockpp\Release/" + ObjectFile="C:\tmp\compile\mockpp\Release/" + ProgramDataBaseFileName="C:\tmp\compile\mockpp\Release/" WarningLevel="4" SuppressStartupBanner="TRUE" CompileAs="0"/> |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:22:22
|
Update of /cvsroot/mockpp/mockpp/msvc6/mockpp/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27129/mockpp/tests Modified Files: mock_test.dsp Log Message: updated project file Index: mock_test.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/tests/mock_test.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mock_test.dsp 2 Oct 2004 10:27:53 -0000 1.2 +++ mock_test.dsp 25 Mar 2005 10:22:12 -0000 1.3 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="mock_test" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** NICHT BEARBEITEN ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=mock_test - Win32 Release -!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE -!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "mock_test.mak". !MESSAGE -!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben -!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "mock_test.mak" CFG="mock_test - Win32 Release" !MESSAGE -!MESSAGE Für die Konfiguration stehen zur Auswahl: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mock_test - Win32 Release" (basierend auf "Win32 (x86) Console Application") -!MESSAGE "mock_test - Win32 Debug" (basierend auf "Win32 (x86) Console Application") +!MESSAGE "mock_test - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "mock_test - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,58 +26,60 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "mock_test - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\tests\Release" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\tests\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "C:\tmp\compile\mockpp\tests\Release" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\tests\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../.." /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" +# ADD BASE CPP /nologo /MD /I "../.." /I "../../.." /I "$(CPPUNIT_ROOT)/include" /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\tests\Release/mock_test.pch" /Fo"C:\tmp\compile\mockpp\tests\Release/" /Fd"C:\tmp\compile\mockpp\tests\Release/" /c /GX +# ADD CPP /nologo /MD /I "../.." /I "../../.." /I "$(CPPUNIT_ROOT)/include" /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\tests\Release/mock_test.pch" /Fo"C:\tmp\compile\mockpp\tests\Release/" /Fd"C:\tmp\compile\mockpp\tests\Release/" /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\tests\Release\mock_test.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\tests\Release\mock_test.tlb" /win32 +# ADD BASE RSC /l 1041 /d "NDEBUG" +# ADD RSC /l 1041 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 mockpp.lib cppunit_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib cppunit_dll.lib /nologo /out:"C:\tmp\compile\mockpp\tests\Release\mock_test.exe" /incremental:no /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" /pdb:"C:\tmp\compile\mockpp\tests\Release\mock_test.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib cppunit_dll.lib /nologo /out:"C:\tmp\compile\mockpp\tests\Release\mock_test.exe" /incremental:no /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" /pdb:"C:\tmp\compile\mockpp\tests\Release\mock_test.pdb" /pdbtype:sept /subsystem:console /machine:ix86 !ELSEIF "$(CFG)" == "mock_test - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\tests\Debug" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\tests\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "c:\tmp\compile\mockpp\tests\Debug" -# PROP Intermediate_Dir "c:\tmp\compile\mockpp\tests\Debug" -# PROP Ignore_Export_Lib 0 +# PROP Output_Dir "C:\tmp\compile\mockpp\tests\Debug" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\tests\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" +# ADD BASE CPP /nologo /MDd /I "../../.." /I "$(CPPUNIT_ROOT)/include" /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\tests\Debug/mock_test.pch" /Fo"C:\tmp\compile\mockpp\tests\Debug/" /Fd"C:\tmp\compile\mockpp\tests\Debug/" /GZ /c /GX +# ADD CPP /nologo /MDd /I "../../.." /I "$(CPPUNIT_ROOT)/include" /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\tests\Debug/mock_test.pch" /Fo"C:\tmp\compile\mockpp\tests\Debug/" /Fd"C:\tmp\compile\mockpp\tests\Debug/" /GZ /c /GX +# ADD BASE MTL /nologo /tlb"c:\tmp\compile\mockpp\tests\Debug\mock_test.tlb" /win32 +# ADD MTL /nologo /tlb"c:\tmp\compile\mockpp\tests\Debug\mock_test.tlb" /win32 +# ADD BASE RSC /l 1041 /d "_DEBUG" +# ADD RSC /l 1041 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 mockppd.lib cppunitd_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib cppunitd_dll.lib /nologo /out:"C:\tmp\compile\mockpp\tests\Debug\mock_test.exe" /incremental:yes /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" /debug /pdb:"C:\tmp\compile\mockpp\tests\Debug\mock_test.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib cppunitd_dll.lib /nologo /out:"C:\tmp\compile\mockpp\tests\Debug\mock_test.exe" /incremental:yes /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" /debug /pdb:"C:\tmp\compile\mockpp\tests\Debug\mock_test.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ENDIF +!ENDIF # Begin Target @@ -88,6 +90,30 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\..\mockpp\tests\AbstractDynamicChainingMock_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\AbstractInvocationDispatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\And_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\AnyArgumentsMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ArgumentsMatchBuilder_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ArgumentsMatcher_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\Assert_test.cpp # End Source File # Begin Source File @@ -96,6 +122,90 @@ # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_1_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_1_void_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_2_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_2_void_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_3_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_3_void_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_4_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_4_void_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_5_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_5_void_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainableMockObject_void_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainingMockBuilder_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ChainingMockObjectSupport_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\classes_ABCDE.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ConstraintList_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\ConstraintSet_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\CoreMock_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\CustomStub_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\DefaultResultStub_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\DynamicChainingMockError_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\Exception_test.cpp # End Source File # Begin Source File @@ -104,6 +214,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\ExpectationConglomeration_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\ExpectationCounter_test.cpp # End Source File # Begin Source File @@ -132,10 +246,114 @@ # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\FIFOInvocationDispatcher_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\Formatter_test.cpp # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\Invocation_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvocationMocker_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvocationMockerBuilder_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokeAtLeastMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokeAtLeastOnceMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokeAtMostMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokeCountMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokedAfterMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokedBeforeMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokedRecorder_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\InvokeOnceMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsAnything_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsCloseTo_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsEqual_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsGreaterOrEqual_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsGreaterThan_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsInstanceOf_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsLessOrEqual_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsLessThan_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsNot_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsNothing_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\IsSame_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\LIFOInvocationDispatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\MatchBuilder_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\MixedMockObject_5_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\mock_test.cpp # End Source File # Begin Source File @@ -148,10 +366,50 @@ # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\NoArgumentsMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\Or_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\ReturnObjectList_test.cpp # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\ReturnStub_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\StringContains_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\StringEndsWith_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\StringStartsWith_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\StubBuilder_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\StubSequence_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\TestFailureMatcher_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\TestFailureStub_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\Throwable_test.cpp # End Source File # Begin Source File @@ -160,10 +418,30 @@ # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\ThrowStub_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\TrackingCounter_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\TypelessStubSequence_test.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\UnlimitedMatcher_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\Verifiable_test.cpp # End Source File # Begin Source File +SOURCE=..\..\..\mockpp\tests\VerifyingTestCaller_test.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\mockpp\tests\VerifyingTestCase_test.cpp # End Source File # Begin Source File @@ -218,14 +496,27 @@ SOURCE=..\..\..\mockpp\tests\VisitableMockObject_void_test.cpp # End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\VoidStub_test.cpp +# End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +SOURCE=..\..\..\mockpp\tests\classes_ABCDE.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\MyBuilderNamespace.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\mockpp\tests\MyMatchBuilder.h +# End Source File # End Group # End Target # End Project + |
|
From: Ewald A. <ewa...@us...> - 2005-03-25 10:22:21
|
Update of /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27129/mockpp/examples/tutorial Modified Files: basicmock.dsp chainmock.dsp cppunit.dsp poormock.dsp visitmock.dsp Log Message: updated project file Index: visitmock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/visitmock.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- visitmock.dsp 15 Jan 2005 12:25:26 -0000 1.1 +++ visitmock.dsp 25 Mar 2005 10:22:11 -0000 1.2 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="visitmock" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** ÒWµÈ¢Å¾³¢ ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=visitmock - Win32 Debug -!MESSAGE ±êÍLøÈÒ²¸Ì§²ÙÅÍ èܹñB ±ÌÌßÛ¼Þª¸ÄðËÞÙÄÞ·é½ßÉÍ NMAKE ðgpµÄ¾³¢B -!MESSAGE [Ò²¸Ì§²ÙÌ´¸½Îß°Ä] ºÏÝÄÞðgpµÄÀsµÄ¾³¢ +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "visitmock.mak". !MESSAGE -!MESSAGE NMAKE ÌÀsÉ\¬ðwèÅ«Ü· -!MESSAGE ºÏÝÄÞ ×²ÝãÅϸÛÌÝèðè`µÜ·Bá: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "visitmock.mak" CFG="visitmock - Win32 Debug" !MESSAGE -!MESSAGE IðÂ\ÈËÞÙÄÞ Ó°ÄÞ: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "visitmock - Win32 Release" ("Win32 (x86) Console Application" p) -!MESSAGE "visitmock - Win32 Debug" ("Win32 (x86) Console Application" p) +!MESSAGE "visitmock - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "visitmock - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,78 +26,95 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "tutorial - Win32 Release" +!IF "$(CFG)" == "visitmock - Win32 Debug" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../.." /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" +# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.tlb" /win32 +# ADD BASE RSC /l 1041 /d "NDEBUG" /d "_DEBUG" +# ADD RSC /l 1041 /d "NDEBUG" /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 mockpp.lib cppunit_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\visitmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ELSEIF "$(CFG)" == "visitmock - Win32 Debug" +!ELSEIF "$(CFG)" == "visitmock - Win32 Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" +# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./visitmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD BASE MTL /nologo /tlb".\visitmock.tlb" /win32 +# ADD MTL /nologo /tlb".\visitmock.tlb" /win32 +# ADD BASE RSC /l 1036 +# ADD RSC /l 1036 BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 mockppd.lib cppunitd_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:".\visitmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\visitmock.pdb" /pdbtype:sept /subsystem:windows +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:".\visitmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\visitmock.pdb" /pdbtype:sept /subsystem:windows -!ENDIF +!ENDIF # Begin Target -# Name "visitmock - Win32 Release" # Name "visitmock - Win32 Debug" +# Name "visitmock - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\mockpp\examples\tutorial\visitmock.cpp + +!IF "$(CFG)" == "visitmock - Win32 Debug" + +# ADD CPP /nologo /Od /GZ /GX +!ENDIF + # End Source File # End Group # Begin Group "Header Files" -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" +# PROP Default_Filter "" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\interface.h +# End Source File # End Group # End Target # End Project + Index: chainmock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/chainmock.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- chainmock.dsp 15 Jan 2005 12:25:26 -0000 1.1 +++ chainmock.dsp 25 Mar 2005 10:22:11 -0000 1.2 @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="tutorial" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="chainmock" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** ÒWµÈ¢Å¾³¢ ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=tutorial - Win32 Debug -!MESSAGE ±êÍLøÈÒ²¸Ì§²ÙÅÍ èܹñB ±ÌÌßÛ¼Þª¸ÄðËÞÙÄÞ·é½ßÉÍ NMAKE ðgpµÄ¾³¢B -!MESSAGE [Ò²¸Ì§²ÙÌ´¸½Îß°Ä] ºÏÝÄÞðgpµÄÀsµÄ¾³¢ +CFG=chainmock - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "chainmock.mak". !MESSAGE -!MESSAGE NMAKE ÌÀsÉ\¬ðwèÅ«Ü· -!MESSAGE ºÏÝÄÞ ×²ÝãÅϸÛÌÝèðè`µÜ·Bá: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "chainmock.mak" CFG="chainmock - Win32 Debug" !MESSAGE -!MESSAGE IðÂ\ÈËÞÙÄÞ Ó°ÄÞ: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "chainmock - Win32 Release" ("Win32 (x86) Console Application" p) -!MESSAGE "chainmock - Win32 Debug" ("Win32 (x86) Console Application" p) +!MESSAGE "chainmock - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "chainmock - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,78 +26,95 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "tutorial - Win32 Release" +!IF "$(CFG)" == "chainmock - Win32 Debug" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../.." /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" +# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.tlb" /win32 +# ADD BASE RSC /l 1041 /d "NDEBUG" /d "_DEBUG" +# ADD RSC /l 1041 /d "NDEBUG" /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 mockpp.lib cppunit_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\chainmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ELSEIF "$(CFG)" == "tutorial - Win32 Debug" +!ELSEIF "$(CFG)" == "chainmock - Win32 Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" +# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./chainmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD BASE MTL /nologo /tlb".\chainmock.tlb" /win32 +# ADD MTL /nologo /tlb".\chainmock.tlb" /win32 +# ADD BASE RSC /l 1036 +# ADD RSC /l 1036 BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 mockppd.lib cppunitd_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\chainmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\chainmock.pdb" /pdbtype:sept /subsystem:windows +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\chainmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\chainmock.pdb" /pdbtype:sept /subsystem:windows -!ENDIF +!ENDIF # Begin Target -# Name "chainmock - Win32 Release" # Name "chainmock - Win32 Debug" +# Name "chainmock - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\chainmock.cpp + +!IF "$(CFG)" == "chainmock - Win32 Debug" + +# ADD CPP /nologo /Od /GZ /GX +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.cpp # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\interface.h +# End Source File # End Group # End Target # End Project + Index: poormock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/poormock.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- poormock.dsp 15 Jan 2005 12:25:26 -0000 1.1 +++ poormock.dsp 25 Mar 2005 10:22:11 -0000 1.2 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="poormock" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** ÒWµÈ¢Å¾³¢ ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=poormock - Win32 Debug -!MESSAGE ±êÍLøÈÒ²¸Ì§²ÙÅÍ èܹñB ±ÌÌßÛ¼Þª¸ÄðËÞÙÄÞ·é½ßÉÍ NMAKE ðgpµÄ¾³¢B -!MESSAGE [Ò²¸Ì§²ÙÌ´¸½Îß°Ä] ºÏÝÄÞðgpµÄÀsµÄ¾³¢ +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "poormock.mak". !MESSAGE -!MESSAGE NMAKE ÌÀsÉ\¬ðwèÅ«Ü· -!MESSAGE ºÏÝÄÞ ×²ÝãÅϸÛÌÝèðè`µÜ·Bá: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "poormock.mak" CFG="poormock - Win32 Debug" !MESSAGE -!MESSAGE IðÂ\ÈËÞÙÄÞ Ó°ÄÞ: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "poormock - Win32 Release" ("Win32 (x86) Console Application" p) -!MESSAGE "poormock - Win32 Debug" ("Win32 (x86) Console Application" p) +!MESSAGE "poormock - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "poormock - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,78 +26,113 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "poormock - Win32 Release" +!IF "$(CFG)" == "poormock - Win32 Debug" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../.." /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" +# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.tlb" /win32 +# ADD BASE RSC /l 1041 /d "_DEBUG" +# ADD RSC /l 1041 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 mockpp.lib cppunit_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ELSEIF "$(CFG)" == "poormock - Win32 Debug" +!ELSEIF "$(CFG)" == "poormock - Win32 Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" +# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD CPP /nologo /MD /I "../../../.." /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.tlb" /win32 +# ADD BASE RSC /l 1041 /d "NDEBUG" +# ADD RSC /l 1041 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 mockppd.lib cppunitd_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.exe" /incremental:no /libpath:"../../../lib" /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.exe" /incremental:no /libpath:"../../../lib" /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Release\poormock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ENDIF +!ENDIF # Begin Target -# Name "poormock - Win32 Release" # Name "poormock - Win32 Debug" +# Name "poormock - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\poormock-se.cpp + +!IF "$(CFG)" == "poormock - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "poormock - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=..\..\..\..\mockpp\examples\tutorial\poormock.cpp + +!IF "$(CFG)" == "poormock - Win32 Debug" + +# ADD CPP /nologo /Od /GZ /GX +!ELSEIF "$(CFG)" == "poormock - Win32 Release" + +# ADD CPP /nologo /O2 /GX +!ENDIF + # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\interface.h +# End Source File # End Group # End Target # End Project + Index: basicmock.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/basicmock.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- basicmock.dsp 15 Jan 2005 12:25:26 -0000 1.1 +++ basicmock.dsp 25 Mar 2005 10:22:11 -0000 1.2 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="basicmock" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** ÒWµÈ¢Å¾³¢ ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=basicmock - Win32 Debug -!MESSAGE ±êÍLøÈÒ²¸Ì§²ÙÅÍ èܹñB ±ÌÌßÛ¼Þª¸ÄðËÞÙÄÞ·é½ßÉÍ NMAKE ðgpµÄ¾³¢B -!MESSAGE [Ò²¸Ì§²ÙÌ´¸½Îß°Ä] ºÏÝÄÞðgpµÄÀsµÄ¾³¢ +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "basicmock.mak". !MESSAGE -!MESSAGE NMAKE ÌÀsÉ\¬ðwèÅ«Ü· -!MESSAGE ºÏÝÄÞ ×²ÝãÅϸÛÌÝèðè`µÜ·Bá: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "basicmock.mak" CFG="basicmock - Win32 Debug" !MESSAGE -!MESSAGE IðÂ\ÈËÞÙÄÞ Ó°ÄÞ: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "basicmock - Win32 Release" ("Win32 (x86) Console Application" p) -!MESSAGE "basicmock - Win32 Debug" ("Win32 (x86) Console Application" p) +!MESSAGE "basicmock - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "basicmock - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,78 +26,95 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "tutorial - Win32 Release" +!IF "$(CFG)" == "basicmock - Win32 Debug" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../.." /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" +# ADD BASE CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD CPP /nologo /MDd /I "../../../.." /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.tlb" /win32 +# ADD BASE RSC /l 1041 /d "NDEBUG" /d "_DEBUG" +# ADD RSC /l 1041 /d "NDEBUG" /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 mockpp.lib cppunit_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\basicmock.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ELSEIF "$(CFG)" == "basicmock - Win32 Debug" +!ELSEIF "$(CFG)" == "basicmock - Win32 Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" +# ADD BASE CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD CPP /nologo /MD /I "../../../.." /W4 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /GF /Gy /Fp"./basicmock.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD BASE MTL /nologo /tlb".\basicmock.tlb" /win32 +# ADD MTL /nologo /tlb".\basicmock.tlb" /win32 +# ADD BASE RSC /l 1036 +# ADD RSC /l 1036 BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 mockppd.lib cppunitd_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release.\basicmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\basicmock.pdb" /pdbtype:sept /subsystem:windows +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release.\basicmock.exe" /incremental:no /libpath:"../../../lib" /pdb:".\basicmock.pdb" /pdbtype:sept /subsystem:windows -!ENDIF +!ENDIF # Begin Target -# Name "basicmock - Win32 Release" # Name "basicmock - Win32 Debug" +# Name "basicmock - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\basicmock.cpp + +!IF "$(CFG)" == "basicmock - Win32 Debug" + +# ADD CPP /nologo /Od /GZ /GX +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.cpp # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +SOURCE=..\..\..\..\mockpp\examples\tutorial\consumer.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\mockpp\examples\tutorial\interface.h +# End Source File # End Group # End Target # End Project + Index: cppunit.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/examples/tutorial/cppunit.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cppunit.dsp 15 Jan 2005 12:25:26 -0000 1.1 +++ cppunit.dsp 25 Mar 2005 10:22:11 -0000 1.2 @@ -1,24 +1,24 @@ # Microsoft Developer Studio Project File - Name="cppunit" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** ÒWµÈ¢Å¾³¢ ** +# ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=cppunit - Win32 Debug -!MESSAGE ±êÍLøÈÒ²¸Ì§²ÙÅÍ èܹñB ±ÌÌßÛ¼Þª¸ÄðËÞÙÄÞ·é½ßÉÍ NMAKE ðgpµÄ¾³¢B -!MESSAGE [Ò²¸Ì§²ÙÌ´¸½Îß°Ä] ºÏÝÄÞðgpµÄÀsµÄ¾³¢ +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "cppunit.mak". !MESSAGE -!MESSAGE NMAKE ÌÀsÉ\¬ðwèÅ«Ü· -!MESSAGE ºÏÝÄÞ ×²ÝãÅϸÛÌÝèðè`µÜ·Bá: +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "cppunit.mak" CFG="cppunit - Win32 Debug" !MESSAGE -!MESSAGE IðÂ\ÈËÞÙÄÞ Ó°ÄÞ: +!MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "cppunit - Win32 Release" ("Win32 (x86) Console Application" p) -!MESSAGE "cppunit - Win32 Debug" ("Win32 (x86) Console Application" p) +!MESSAGE "cppunit - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "cppunit - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -26,78 +26,90 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "cppunit - Win32 Release" +!IF "$(CFG)" == "cppunit - Win32 Debug" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../.." /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "NDEBUG" -# ADD RSC /l 0x411 /d "NDEBUG" +# ADD BASE CPP /nologo /MDd /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD CPP /nologo /MDd /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /ZI /W4 /Od /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Debug/" /GZ /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\cppunit.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Debug\cppunit.tlb" /win32 +# ADD BASE RSC /l 1041 /d "_DEBUG" +# ADD RSC /l 1041 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 mockpp.lib cppunit_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib cppunitd_dll.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\cppunit.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\cppunit.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockppd.lib cppunitd_dll.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Debug\cppunit.exe" /incremental:yes /libpath:"../../../lib" /debug /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Debug\cppunit.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ELSEIF "$(CFG)" == "cppunit - Win32 Debug" +!ELSEIF "$(CFG)" == "cppunit - Win32 Release" # PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP BASE Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" +# PROP Intermediate_Dir "C:\tmp\compile\mockpp\examples\tutorial\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../.." /I "$(CPPUNIT_ROOT)/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "CPPUNIT_DLL" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x411 /d "_DEBUG" -# ADD RSC /l 0x411 /d "_DEBUG" +# ADD BASE CPP /nologo /MD /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD CPP /nologo /MD /I "../../../.." /I "$(CPPUNIT_ROOT)/include" /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "CPPUNIT_DLL" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pch" /Fo"C:\tmp\compile\mockpp\examples\tutorial\Release/" /Fd"C:\tmp\compile\mockpp\examples\tutorial\Release/" /c /GX +# ADD BASE MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\cppunit.tlb" /win32 +# ADD MTL /nologo /tlb"C:\tmp\compile\mockpp\examples\tutorial\Release\cppunit.tlb" /win32 +# ADD BASE RSC /l 1041 /d "NDEBUG" +# ADD RSC /l 1041 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 mockppd.lib cppunitd_dll.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib" /libpath:"$(CPPUNIT_ROOT)/lib" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib cppunit_dll.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\cppunit.exe" /incremental:no /libpath:"../../../lib" /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Release\cppunit.pdb" /pdbtype:sept /subsystem:console /machine:ix86 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mockpp.lib cppunit_dll.lib /nologo /out:"C:\tmp\compile\mockpp\examples\tutorial\Release\cppunit.exe" /incremental:no /libpath:"../../../lib" /pdb:"C:\tmp\compile\mockpp\examples\tutorial\Release\cppunit.pdb" /pdbtype:sept /subsystem:console /machine:ix86 -!ENDIF +!ENDIF # Begin Target -# Name "cppunit - Win32 Release" # Name "cppunit - Win32 Debug" +# Name "cppunit - Win32 Release" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=..\..\..\..\mockpp\examples\tutorial\cppunit.cpp + +!IF "$(CFG)" == "cppunit - Win32 Debug" + +# ADD CPP /nologo /Od /GZ /GX +!ELSEIF "$(CFG)" == "cppunit - Win32 Release" + +# ADD CPP /nologo /O2 /GX +!ENDIF + # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" +# Begin Source File -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +SOURCE=..\..\..\..\mockpp\examples\tutorial\Calculator.h +# End Source File # End Group # End Target # End Project + |
