[Mockpp-commits] mockpp/mockpp .cvsignore,1.10,1.11 Makefile.am,1.98,1.99 MixedMockObject.h,1.3,1.4
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp .cvsignore,1.10,1.11 Makefile.am,1.98,1.99 MixedMockObject.h,1.3,1.4
|
From: Ewald A. <ewa...@us...> - 2005-12-10 20:07:30
|
Update of /cvsroot/mockpp/mockpp/mockpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7221/mockpp Modified Files: .cvsignore Makefile.am MixedMockObject.h Log Message: restructuring and cleanup Index: .cvsignore =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- .cvsignore 22 Mar 2005 22:03:21 -0000 1.10 +++ .cvsignore 10 Dec 2005 20:07:21 -0000 1.11 @@ -20,6 +20,7 @@ doc-template.h visitable-template.h chainable-template.h +var Index: MixedMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/MixedMockObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- MixedMockObject.h 13 Nov 2005 11:53:18 -0000 1.3 +++ MixedMockObject.h 10 Dec 2005 20:07:21 -0000 1.4 @@ -32,8 +32,9 @@ #include <mockpp/mockpp.h> // always first -#include <mockpp/VisitableMockObject.h> -#include <mockpp/ChainableMockObject.h> +#include <mockpp/visiting/VisitableMockObject.h> + +#include <mockpp/chaining/ChainableMockObject.h> namespace mockpp { Index: Makefile.am =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- Makefile.am 9 Dec 2005 21:16:49 -0000 1.98 +++ Makefile.am 10 Dec 2005 20:07:21 -0000 1.99 @@ -1,7 +1,9 @@ INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir) $(EA_EXTRA_INC) DEFAULT_INCLUDES = $(INCLUDES) -SUBDIRS = chaining compat util builder constraint matcher stub production . docs tests po examples +SUBDIRS = chaining visiting compat util builder constraint matcher stub \ + production framework \ + . config docs tests po examples lib_LTLIBRARIES = libmockpp.la @@ -14,39 +16,32 @@ $(top_builddir)/mockpp/util/libutil.la $(top_builddir)/mockpp/stub/libstub.la \ $(top_builddir)/mockpp/matcher/libmatcher.la $(top_builddir)/mockpp/constraint/libconstraint.la \ $(top_builddir)/mockpp/compat/libcompat.la $(top_builddir)/mockpp/chaining/libchaining.la \ + $(top_builddir)/mockpp/visiting/libvisiting.la $(top_builddir)/mockpp/framework/libframework.la \ $(top_builddir)/mockpp/builder/libbuilder.la \ $(EA_EXTRA_LIB) $(LIBCPPUNIT) libmockpp_la_SOURCES = ExpectationCounter.cpp mockpp.cpp Throwable.cpp \ - ThrowableList.cpp MockObject.cpp VisitableMockObject.cpp VerifiableList.cpp \ - Verifiable.cpp VerifyingTestCase.cpp SelfDescribing.cpp ChainableMockObject.cpp \ - VerifyingTestCaller.cpp TrackingCounter.cpp MixedMockObject.cpp MockTimeServer.cpp \ - VisitableMockMethod.cpp + ThrowableList.cpp MockObject.cpp VerifiableList.cpp \ + Verifiable.cpp SelfDescribing.cpp\ + TrackingCounter.cpp MixedMockObject.cpp MockTimeServer.cpp pkginclude_HEADERS = mockpp_config.h ReturnObjectList.h Expectation.h \ AbstractExpectation.h ExpectationValue.h ExpectationSegment.h ExpectationList.h \ ExpectationSet.h ExpectationMap.h ExpectationBoundary.h AbstractExpectationCollection.h \ - VisitableMockObject_macro.h VisitableMockObject_template.h ExpectationConglomeration.h \ - ExpectationCounter.h mockpp.h Throwable.h ThrowableList.h MockObject.h VisitableMockObject.h \ - VerifiableList.h Verifiable.h VerifyingTestCase.h SelfDescribing.h ChainableMockObject.h \ - VerifyingTestCaller.h TrackingCounter.h MixedMockObject.h mockpp_dbc.h MockTimeServer.h \ - VisitableMockMethod.h VisitableMockMethod0.h VisitableMockMethod1.h VisitableMockMethod2.h \ - VisitableMockMethod3.h VisitableMockMethod4.h VisitableMockMethod5.h VisitableMockMethod6.h \ - CountParameters.h CountedVisitableMethod.h ResponseVector1.h ResponseVector2.h \ - ResponseVector3.h ResponseVector4.h ResponseVector5.h ResponseVector6.h CxxTestSupport.h + ExpectationConglomeration.h \ + ExpectationCounter.h mockpp.h Throwable.h ThrowableList.h MockObject.h \ + VerifiableList.h Verifiable.h SelfDescribing.h \ + TrackingCounter.h MixedMockObject.h mockpp_dbc.h MockTimeServer.h \ + CountParameters.h EXTRA_DIST = \ mockpp_config-bcb5.h \ - mockpp_config-msvc_60_70.h \ mockpp_config-msvc_71.h \ - gen_visitablemethod_N.pl \ - gen_countparams_N.pl \ - gen_countvisitable_N.pl \ - gen_responsevector_N.pl + gen_countparams_N.pl CLEANFILES = *.~* *.~~* *~ mockpp_config.h *.old -.PHONY: chainer mockpp_config-bcb5.h mockpp_config-msvc_60_70.h mockpp_config-msvc_71.h mockpp_config.h metrics templates +.PHONY: chainer mockpp_config-bcb5.h mockpp_config-msvc_71.h mockpp_config.h metrics templates metrics: TODAY=`date +%y%m%d`; \ @@ -103,22 +98,22 @@ grep MOCKPP_USE_MINI_STL ../config.h >>$@ mockpp_config-bcb5.h: - perl -i.bak -pe "s/(.*mockpp_production)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg $(top_srcdir)/bcbX/*.cbx - perl -i.bak -pe "s/\\\\(mockpp)_(\d*)\\\\/\\\\\1_$(LT_CURRENT)\\\\/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcbX/*.bat + perl -i.bak -pe "s/(.*mockpp_production)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg + perl -i.bak -pe "s/\\\\(mockpp)_(\d*)\\\\/\\\\\1_$(LT_CURRENT)\\\\/g" $(top_srcdir)/bcb5/*.bpr perl -i.bak -pe "s/\\\\(mockpp)_(\d*)/\\\\\1_$(LT_CURRENT)/g" $(top_srcdir)/bcb5/*.bat - perl -i.bak -pe "s/(.*mockpp)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg $(top_srcdir)/bcbX/*.cbx - perl -i.bak -pe "s/(cppunit)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(readability_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(verifying)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(basicmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(chainmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(visitmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(poormock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(poormock_se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(poormock-se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(mock_greeter)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(mock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf - perl -i.bak -pe "s/(jmock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcbX/*.cbx $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(.*mockpp)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg + perl -i.bak -pe "s/(cppunit)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(readability_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(verifying)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(basicmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(chainmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(visitmock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(poormock)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(poormock_se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(poormock-se)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(mock_greeter)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(mock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf + perl -i.bak -pe "s/(jmock_test)_(\d*)(\.exe)/\1_$(LT_CURRENT)\3/g" $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf echo "// #define's for Borland BCB5" >$@ echo "// derived from automatically generated config.h. See Makefile.am." >>$@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ @@ -153,7 +148,7 @@ echo "#define HAVE_CWCHAR" >>$@ echo "" >>$@ echo "/* Define if you have the std::wstring type. */" >>$@ - echo "#define HAVE_WSTRING" >>$@ + echo "#defi$(top_srcdir)/bcbX/*.cbx ne HAVE_WSTRING" >>$@ echo "" >>$@ echo "/* Define if you have the wcscmp function. */" >>$@ echo "#define HAVE_WCSCMP" >>$@ @@ -167,7 +162,7 @@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) mockpp_config-msvc_71.h: - echo "// #define's for MS Visual C++ 7.1 (NOT 6.0/7.0)" >$@ + echo "// #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0)" >$@ echo "// derived from automatically generated config.h. See Makefile.am." >>$@ TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ echo "" >>$@ @@ -209,52 +204,6 @@ echo "" >>$@ -test $@ -ef $(srcdir) || cp $@ $(srcdir) -mockpp_config-msvc_60_70.h: - echo "// #define's for MS Visual C++ (only V6?)" >$@ - echo "// derived from automatically generated config.h. See Makefile.am." >>$@ - TODAY=`date +%Y-%m-%d` ; echo "/* Generated: $$TODAY */" >>$@ - echo "" >>$@ - echo "/* Define to turn debugging globally on. */" >>$@ - echo "#undef DEBUG" >>$@ - echo "" >>$@ - echo "/* Turn on support for weak template capabilities. */" >>$@ - echo "#define MOCKPP_PTI_WEAKNESS" >>$@ - echo "" >>$@ - echo "/* Version number of package */" >>$@ - echo "#define MOCKPP_VERSION \"$(VERSION)\"" >>$@ - echo "" >>$@ - echo "/* Name of package */" >>$@ - echo "#define MOCKPP_PACKAGE \"$(PACKAGE)\"" >>$@ - echo "" >>$@ - echo "/* Define if you have CppUnit installed. */" >>$@ - echo "#define HAVE_CPPUNIT" >>$@ - echo "" >>$@ - echo "/* Define to 1 if you have the <limits> header file. */" >>$@ - echo "#define HAVE_LIMITS 1" >>$@ - echo "" >>$@ - echo "/* Define to 1 if you have the <cppunit/Message.h> header file. */" >>$@ - echo "#define HAVE_CPPUNIT_MESSAGE_H 1" >>$@ - echo "" >>$@ - echo "/* Define to compile for unicode environment. */" >>$@ - echo "#undef MOCKPP_UNICODE" >>$@ - echo "" >>$@ - echo "/* Define if you have the cwchar header. */" >>$@ - echo "#define HAVE_CWCHAR" >>$@ - echo "" >>$@ - echo "/* Define if you have the std::wstring type. */" >>$@ - echo "#define HAVE_WSTRING" >>$@ - echo "" >>$@ - echo "/* Define if you have the wcscmp function. */" >>$@ - echo "#define HAVE_WCSCMP" >>$@ - echo "" >>$@ - echo "/* Define if you have the std::wcscmp function. */" >>$@ - echo "#undef HAVE_STD_WCSCMP" >>$@ - echo "" >>$@ - echo "/* Define to supress compiler warnings about unused variables. */" >>$@ - echo "#define MOCKPP_UNUSED(x) x;" >>$@ - echo "" >>$@ - -test $@ -ef $(srcdir) || cp $@ $(srcdir) - i18n_files = $(srcdir)/*.cpp $(srcdir)/*.h \ $(srcdir)/compat/*.h $(srcdir)/compat/*.cpp \ $(srcdir)/util/*.h $(srcdir)/util/*.cpp |
