[Mockpp-commits] mockpp/msvc6/mockpp mockpp.dsp,1.4,1.5 mockpp.dsw,1.4,1.5
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2005-04-02 21:55:05
|
Update of /cvsroot/mockpp/mockpp/msvc6/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8649/msvc6/mockpp Modified Files: mockpp.dsp mockpp.dsw Log Message: updated project files Index: mockpp.dsw =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/mockpp.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mockpp.dsw 25 Mar 2005 10:22:11 -0000 1.4 +++ mockpp.dsw 2 Apr 2005 21:54:48 -0000 1.5 @@ -3,7 +3,7 @@ ############################################################################### -Project: "basicmock"=examples\tutorial\basicmock.dsp - Package Owner=<4> +Project: "basicmock"=".\examples\tutorial\basicmock.dsp" - Package Owner=<4> Package=<5> {{{ @@ -11,11 +11,14 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### -Project: "chainmock"=examples\tutorial\chainmock.dsp - Package Owner=<4> +Project: "chainmock"=".\examples\tutorial\chainmock.dsp" - Package Owner=<4> Package=<5> {{{ @@ -23,11 +26,14 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### -Project: "cppunit"=examples\tutorial\cppunit.dsp - Package Owner=<4> +Project: "cppunit"=".\examples\tutorial\cppunit.dsp" - Package Owner=<4> Package=<5> {{{ @@ -35,11 +41,14 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### -Project: "examples"=examples\examples.dsp - Package Owner=<4> +Project: "examples"=".\examples\examples.dsp" - Package Owner=<4> Package=<5> {{{ @@ -47,11 +56,14 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### -Project: "mock_test"=tests\mock_test.dsp - Package Owner=<4> +Project: "mock_test"=".\tests\mock_test.dsp" - Package Owner=<4> Package=<5> {{{ @@ -59,11 +71,14 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### -Project: "mockpp"=mockpp.dsp - Package Owner=<4> +Project: "mockpp"=".\mockpp.dsp" - Package Owner=<4> Package=<5> {{{ @@ -75,7 +90,7 @@ ############################################################################### -Project: "poormock"=examples\tutorial\poormock.dsp - Package Owner=<4> +Project: "poormock"=".\examples\tutorial\poormock.dsp" - Package Owner=<4> Package=<5> {{{ @@ -83,11 +98,14 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### -Project: "visitmock"=examples\tutorial\visitmock.dsp - Package Owner=<4> +Project: "visitmock"=".\examples\tutorial\visitmock.dsp" - Package Owner=<4> Package=<5> {{{ @@ -95,6 +113,9 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name mockpp + End Project Dependency }}} ############################################################################### Index: mockpp.dsp =================================================================== RCS file: /cvsroot/mockpp/mockpp/msvc6/mockpp/mockpp.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mockpp.dsp 25 Mar 2005 10:22:11 -0000 1.4 +++ mockpp.dsp 2 Apr 2005 21:54:48 -0000 1.5 @@ -26,7 +26,6 @@ # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe -MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "mockpp - Win32 Debug" @@ -41,18 +40,19 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\Debug" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /I "../.." /ZI /W4 /Od /D "WIN32" /D "_LIB" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\Debug/mockpp.pch" /Fo"C:\tmp\compile\mockpp\Debug/" /Fd"C:\tmp\compile\mockpp\Debug/" /GZ /c /GX -# ADD CPP /nologo /MDd /I "../.." /ZI /W4 /Od /D "WIN32" /D "_LIB" /D "_MBCS" /GR /Fp"C:\tmp\compile\mockpp\Debug/mockpp.pch" /Fo"C:\tmp\compile\mockpp\Debug/" /Fd"C:\tmp\compile\mockpp\Debug/" /GZ /c /GX -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE RSC /l 1041 /d "_DEBUG" -# ADD RSC /l 1041 /d "_DEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /win32 +# ADD MTL /nologo /win32 +# ADD BASE CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../.." /D "WIN32" /D "_LIB" /D "_MBCS" /GZ /c +# ADD CPP /nologo /MDd /W4 /GR /GX /ZI /Od /I "../.." /D "WIN32" /D "_LIB" /D "_MBCS" /GZ /c +# ADD BASE RSC /l 0x411 /d "_DEBUG" +# ADD RSC /l 0x411 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\mockppd.lib" -# ADD LIB32 /nologo /out:"..\lib\mockppd.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\mockppd.lib" +# ADD LIB32 /nologo /out:"..\lib\mockppd.lib" !ELSEIF "$(CFG)" == "mockpp - Win32 Release" @@ -66,20 +66,21 @@ # PROP Output_Dir "C:\tmp\compile\mockpp\Release" # PROP Intermediate_Dir "C:\tmp\compile\mockpp\Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /I "../.." /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\Release/mockpp.pch" /Fo"C:\tmp\compile\mockpp\Release/" /Fd"C:\tmp\compile\mockpp\Release/" /c /GX -# ADD CPP /nologo /MD /I "../.." /W4 /O2 /Ob1 /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_MBCS" /GF /Gy /GR /Fp"C:\tmp\compile\mockpp\Release/mockpp.pch" /Fo"C:\tmp\compile\mockpp\Release/" /Fd"C:\tmp\compile\mockpp\Release/" /c /GX -# ADD BASE MTL /nologo /win32 -# ADD MTL /nologo /win32 -# ADD BASE RSC /l 1041 /d "NDEBUG" -# ADD RSC /l 1041 /d "NDEBUG" +MTL=midl.exe +# ADD BASE MTL /nologo /win32 +# ADD MTL /nologo /win32 +# ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I "../.." /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_MBCS" /GF /c +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /I "../.." /D "NDEBUG" /D "WIN32" /D "_LIB" /D "_MBCS" /GF /c +# ADD BASE RSC /l 0x411 /d "NDEBUG" +# ADD RSC /l 0x411 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\lib\mockpp.lib" -# ADD LIB32 /nologo /out:"..\lib\mockpp.lib" +# ADD BASE LIB32 /nologo /out:"..\lib\mockpp.lib" +# ADD LIB32 /nologo /out:"..\lib\mockpp.lib" -!ENDIF +!ENDIF # Begin Target @@ -88,62 +89,6 @@ # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\mockpp\ChainableMockObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationCounter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\MixedMockObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\MockObject.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\mockpp.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\SelfDescribing.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\Throwable.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ThrowableList.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\TrackingCounter.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\Verifiable.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\VerifiableList.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\VerifyingTestCaller.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\VerifyingTestCase.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\VisitableMockObject.cpp -# End Source File # Begin Group "compat" # PROP Default_Filter "cpp" @@ -173,11 +118,13 @@ !IF "$(CFG)" == "mockpp - Win32 Debug" -# ADD CPP /nologo /Od /GZ /GX +# ADD CPP /nologo /GX /Od /GZ + !ELSEIF "$(CFG)" == "mockpp - Win32 Release" -# ADD CPP /nologo /O2 /GX -!ENDIF +# ADD CPP /nologo /GX /O2 + +!ENDIF # End Source File # Begin Source File @@ -186,11 +133,13 @@ !IF "$(CFG)" == "mockpp - Win32 Debug" -# ADD CPP /nologo /Od /GZ /GX +# ADD CPP /nologo /GX /Od /GZ + !ELSEIF "$(CFG)" == "mockpp - Win32 Release" -# ADD CPP /nologo /O2 /GX -!ENDIF +# ADD CPP /nologo /GX /O2 + +!ENDIF # End Source File # End Group @@ -286,135 +235,67 @@ SOURCE=..\..\mockpp\stub\VoidStub.cpp # End Source File # End Group -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\mockpp\AbstractExpectation.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\AbstractExpectationCollection.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\chainable-template.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ChainableMockObject.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\Expectation.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationBoundary.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationConglomeration.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationCounter.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationList.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationMap.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationSegment.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationSet.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\ExpectationValue.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\MixedMockObject.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\MockObject.h -# End Source File -# Begin Source File - -SOURCE=..\..\mockpp\mockpp.h -# End Source File # Begin Source File -SOURCE=..\..\mockpp\mockpp_config-msvc.h +SOURCE=..\..\mockpp\ChainableMockObject.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\mockpp_config.h +SOURCE=..\..\mockpp\ExpectationCounter.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\ReturnObjectList.h +SOURCE=..\..\mockpp\MixedMockObject.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\SelfDescribing.h +SOURCE=..\..\mockpp\MockObject.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\Throwable.h +SOURCE=..\..\mockpp\mockpp.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\ThrowableList.h +SOURCE=..\..\mockpp\SelfDescribing.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\TrackingCounter.h +SOURCE=..\..\mockpp\Throwable.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\Verifiable.h +SOURCE=..\..\mockpp\ThrowableList.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\VerifiableList.h +SOURCE=..\..\mockpp\TrackingCounter.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\VerifyingTestCaller.h +SOURCE=..\..\mockpp\Verifiable.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\VerifyingTestCase.h +SOURCE=..\..\mockpp\VerifiableList.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\visitable-template.h +SOURCE=..\..\mockpp\VerifyingTestCaller.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\VisitableMockObject.h +SOURCE=..\..\mockpp\VerifyingTestCase.cpp # End Source File # Begin Source File -SOURCE=..\..\mockpp\VisitableMockObject_macro.h +SOURCE=..\..\mockpp\VisitableMockObject.cpp # End Source File -# Begin Source File +# End Group +# Begin Group "Header Files" -SOURCE=..\..\mockpp\VisitableMockObject_template.h -# End Source File -# Begin Group "compat" +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Group "compat No. 1" # PROP Default_Filter "h" # Begin Source File @@ -434,7 +315,7 @@ SOURCE=..\..\mockpp\compat\Formatter.h # End Source File # End Group -# Begin Group "util" +# Begin Group "util No. 1" # PROP Default_Filter "h" # Begin Source File @@ -450,7 +331,7 @@ SOURCE=..\..\mockpp\util\NotImplementedException.h # End Source File # End Group -# Begin Group "chaining" +# Begin Group "chaining No. 1" # PROP Default_Filter "h" # Begin Source File @@ -518,7 +399,7 @@ SOURCE=..\..\mockpp\chaining\StubMatchersCollection.h # End Source File # End Group -# Begin Group "builder" +# Begin Group "builder No. 1" # PROP Default_Filter "h" # Begin Source File @@ -546,7 +427,7 @@ SOURCE=..\..\mockpp\builder\StubBuilder.h # End Source File # End Group -# Begin Group "stub" +# Begin Group "stub No. 1" # PROP Default_Filter "h" # Begin Source File @@ -594,7 +475,7 @@ SOURCE=..\..\mockpp\stub\VoidStub.h # End Source File # End Group -# Begin Group "matcher" +# Begin Group "matcher No. 1" # PROP Default_Filter "h" # Begin Source File @@ -666,7 +547,7 @@ SOURCE=..\..\mockpp\matcher\UnlimitedMatcher.h # End Source File # End Group -# Begin Group "constraint" +# Begin Group "constraint No. 1" # PROP Default_Filter "h" # Begin Source File @@ -754,7 +635,138 @@ SOURCE=..\..\mockpp\constraint\TypelessConstraint.h # End Source File # End Group +# Begin Source File + +SOURCE=..\..\mockpp\AbstractExpectation.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\AbstractExpectationCollection.h +# End Source File +# Begin Source File + +SOURCE="..\..\mockpp\chainable-template.h" +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ChainableMockObject.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\Expectation.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationBoundary.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationConglomeration.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationCounter.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationList.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationMap.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationSegment.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationSet.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ExpectationValue.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\MixedMockObject.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\MockObject.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\mockpp.h +# End Source File +# Begin Source File + +SOURCE="..\..\mockpp\mockpp_config-bcb5.h" +# End Source File +# Begin Source File + +SOURCE="..\..\mockpp\mockpp_config-msvc_60_70.h" +# End Source File +# Begin Source File + +SOURCE="..\..\mockpp\mockpp_config-msvc_71.h" +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\mockpp_config.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ReturnObjectList.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\SelfDescribing.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\Throwable.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\ThrowableList.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\TrackingCounter.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\Verifiable.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\VerifiableList.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\VerifyingTestCaller.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\VerifyingTestCase.h +# End Source File +# Begin Source File + +SOURCE="..\..\mockpp\visitable-template.h" +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\VisitableMockObject.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\VisitableMockObject_macro.h +# End Source File +# Begin Source File + +SOURCE=..\..\mockpp\VisitableMockObject_template.h +# End Source File # End Group # End Target # End Project - |