[avida-cvs] avida(kaben) CVS commits: /current configure.in /current/source/qt-viewer/exp/exp_cleanup2 CMakeLists.txt /current/source/testsuites/unit_testsuites Makefile.am /current/source/testsuites/unit_testsuites/level_0 Makefile.am /current/source/testsuites/unit_testsuites/level_1 Makefile.am /current/source/third-party CMakeLists.txt Makefile.am /current/source/third-party/Loki/Borland AbstractFactory.h AssocVector.h EmptyType.h Factory.h Functor.h HierarchyGenerators.h MultiMethods.h NullType.h Singleton.cpp Singleton.h SmallObj.cpp SmallObj.h SmartPtr.h Threads.h Tuple.h TypeInfo.h TypeManip.h TypeTraits.h Typelist.h Visitor.h loki_typeinfo.h readme.txt static_check.h /current/source/third-party/Loki/tools/HeaderGen HeaderGen.cpp HeaderGen.sln HeaderGen.vcproj Headers.lst readme.txt vendors.lst /current/source/third-party/Loki/tools/RegressionTest RegressionTest.sln Simulate_PS.cpp Test_AbstractFactory.cpp Test_Factory.cpp Test_Functor.cpp Test_HierarchyGenerators1.cpp Test_HierarchyGenerators2.cpp Test_HierarchyGenerators3.cpp Test_HierarchyGenerators4.cpp Test_MultiMethods.cpp Test_Singleton.cpp Test_SmallObj.cpp Test_SmartPtr.cpp Test_SmartPtrWin.cpp Test_Threads.cpp Test_Tuple.cpp Test_TypeList.cpp Test_Variant.cpp Test_Visitor.cpp readme.txt /current/source/third-party/Loki/tools/RegressionTest/AllTest AllTest.cpp AllTest.vcproj /current/source/third-party/Loki/tools/RegressionTest2 AbstractFactoryTest.h AssocVectorTest.h FactoryTest.h FunctorTest.h LokiTest.h SingletonTest.h SmallObjectTest.h SmartPtrTest.h Test.cpp TypeManipTest.h TypeTraitsTest.h TypelistTest.h UnitTest.h /current/source/third-party/mockpp AbstractExpectation.h AbstractExpectationCollection.h CMakeLists.txt Expectation.h ExpectationBoundary.h ExpectationCounter.cpp ExpectationCounter.h ExpectationList.h ExpectationMap.h ExpectationSegment.h ExpectationSet.h ExpectationValue.h Makefile.am MockObject.cpp MockObject.h ReturnObjectList.h Throwable.cpp Throwable.h ThrowableList.cpp ThrowableList.h Verifiable.cpp Verifiable.h VerifiableList.cpp VerifiableList.h VisitableMockObject.cpp VisitableMockObject.h VisitableMockObject_macro.h VisitableMockObject_template.h doc-template.h mockpp.cpp mockpp.h mockpp_config.h /current/source/third-party/mockpp/compat Assert.cpp Assert.h AssertionFailedError.cpp AssertionFailedError.h Exception.cpp Exception.h Formatter.cpp Formatter.h Makefile.am /current/source/third-party/mockpp/docs Makefile.am /current/source/third-party/mockpp/docs/api Makefile.am /current/source/third-party/mockpp/docs/en Makefile.am appendix.docbook bookinfo.docbook credits.docbook customize.xsl dev_advanced.docbook dev_basic.docbook dev_helper.docbook dev_intro.docbook faq.docbook index.docbook /current/source/third-party/mockpp/examples Makefile.am mock_greeter.cpp /current/source/third-party/mockpp/po Makefile.am de.gmo de.po mockpp.pot /current/source/third-party/mockpp/tests AssertMo_test.cpp Assert_test.cpp Exception_test.cpp ExpectationBoundary_test.cpp ExpectationCounterRange_test.cpp ExpectationCounter_test.cpp ExpectationList_test.cpp ExpectationMap_test.cpp ExpectationSegment_test.cpp ExpectationSet_test.cpp ExpectationValue_test.cpp Formatter_test.cpp Makefile.am MockObject_test.cpp ReturnObjectList_test.cpp ThrowableList_test.cpp Throwable_test.cpp Verifiable_test.cpp VisitableMockObject_1_test.cpp VisitableMockObject_1_void_test.cpp VisitableMockObject_2_test.cpp VisitableMockObject_2_void_test.cpp VisitableMockObject_3_test.cpp VisitableMockObject_3_void_test.cpp VisitableMockObject_4_test.cpp VisitableMockObject_4_void_test.cpp VisitableMockObject_5_test.cpp VisitableMockObject_5_void_test.cpp VisitableMockObject_template_test.cpp VisitableMockObject_test.cpp VisitableMockObject_void_test.cpp mock_test.cpp mock_test_qt.cpp mockpp_test.cpp /current/source/third-party/mockpp/util AssertMo.cpp AssertMo.h Makefile.am NotImplementedException.cpp NotImplementedException.h /current/source/third-party/trio FILES.0 README.0 autogen.sh.0 config.guess.0 config.sub.0 configure.in.0 maketgz.0 /current/source/third-party/yaktest AUTHORS.0 COPYING.0 ChangeLog.0 INSTALL.0 Makefile.am.0 NEWS.0 README.0 aclocal.m4.0 configure.in.0 depcomp.0 install-sh.0 missing.0 mkinstalldirs.0
kaben
avida-cvs at alife.org
Tue Dec 30 09:41:22 PST 2003
kaben Tue Dec 30 01:41:22 2003 EDT
Removed files: (Branch: kaben)
/avida/current/source/third-party/Loki/Borland AbstractFactory.h
AssocVector.h
EmptyType.h
Factory.h Functor.h
HierarchyGenerators.h
MultiMethods.h
NullType.h
Singleton.cpp
Singleton.h
SmallObj.cpp
SmallObj.h
SmartPtr.h Threads.h
Tuple.h TypeInfo.h
TypeManip.h
TypeTraits.h
Typelist.h Visitor.h
loki_typeinfo.h
readme.txt
static_check.h
/avida/current/source/third-party/Loki/tools/HeaderGen
HeaderGen.cpp
HeaderGen.sln
HeaderGen.vcproj
Headers.lst
readme.txt
vendors.lst
/avida/current/source/third-party/Loki/tools/RegressionTest
RegressionTest.sln
Simulate_PS.cpp
Test_AbstractFactory.cpp
Test_Factory.cpp
Test_Functor.cpp
Test_HierarchyGenerators1.cpp
Test_HierarchyGenerators2.cpp
Test_HierarchyGenerators3.cpp
Test_HierarchyGenerators4.cpp
Test_MultiMethods.cpp
Test_Singleton.cpp
Test_SmallObj.cpp
Test_SmartPtr.cpp
Test_SmartPtrWin.cpp
Test_Threads.cpp
Test_Tuple.cpp
Test_TypeList.cpp
Test_Variant.cpp
Test_Visitor.cpp
readme.txt
/avida/current/source/third-party/Loki/tools/RegressionTest/AllTest
AllTest.cpp
AllTest.vcproj
/avida/current/source/third-party/Loki/tools/RegressionTest2
AbstractFactoryTest.h
AssocVectorTest.h
FactoryTest.h
FunctorTest.h
LokiTest.h
SingletonTest.h
SmallObjectTest.h
SmartPtrTest.h
Test.cpp
TypeManipTest.h
TypeTraitsTest.h
TypelistTest.h
UnitTest.h
/avida/current/source/third-party/mockpp AbstractExpectation.h
AbstractExpectationCollection.h
CMakeLists.txt
Expectation.h
ExpectationBoundary.h
ExpectationCounter.cpp
ExpectationCounter.h
ExpectationList.h
ExpectationMap.h
ExpectationSegment.h
ExpectationSet.h
ExpectationValue.h
Makefile.am MockObject.cpp
MockObject.h
ReturnObjectList.h
Throwable.cpp Throwable.h
ThrowableList.cpp
ThrowableList.h
Verifiable.cpp
Verifiable.h
VerifiableList.cpp
VerifiableList.h
VisitableMockObject.cpp
VisitableMockObject.h
VisitableMockObject_macro.h
VisitableMockObject_template.h
doc-template.h mockpp.cpp
mockpp.h mockpp_config.h
/avida/current/source/third-party/mockpp/compat Assert.cpp Assert.h
AssertionFailedError.cpp
AssertionFailedError.h
Exception.cpp
Exception.h
Formatter.cpp
Formatter.h
Makefile.am
/avida/current/source/third-party/mockpp/docs Makefile.am
/avida/current/source/third-party/mockpp/docs/api Makefile.am
/avida/current/source/third-party/mockpp/docs/en Makefile.am
appendix.docbook
bookinfo.docbook
credits.docbook
customize.xsl
dev_advanced.docbook
dev_basic.docbook
dev_helper.docbook
dev_intro.docbook
faq.docbook
index.docbook
/avida/current/source/third-party/mockpp/examples Makefile.am
mock_greeter.cpp
/avida/current/source/third-party/mockpp/po Makefile.am de.gmo
de.po mockpp.pot
/avida/current/source/third-party/mockpp/tests AssertMo_test.cpp
Assert_test.cpp
Exception_test.cpp
ExpectationBoundary_test.cpp
ExpectationCounterRange_test.cpp
ExpectationCounter_test.cpp
ExpectationList_test.cpp
ExpectationMap_test.cpp
ExpectationSegment_test.cpp
ExpectationSet_test.cpp
ExpectationValue_test.cpp
Formatter_test.cpp
Makefile.am
MockObject_test.cpp
ReturnObjectList_test.cpp
ThrowableList_test.cpp
Throwable_test.cpp
Verifiable_test.cpp
VisitableMockObject_1_test.cpp
VisitableMockObject_1_void_test.cpp
VisitableMockObject_2_test.cpp
VisitableMockObject_2_void_test.cpp
VisitableMockObject_3_test.cpp
VisitableMockObject_3_void_test.cpp
VisitableMockObject_4_test.cpp
VisitableMockObject_4_void_test.cpp
VisitableMockObject_5_test.cpp
VisitableMockObject_5_void_test.cpp
VisitableMockObject_template_test.cpp
VisitableMockObject_test.cpp
VisitableMockObject_void_test.cpp
mock_test.cpp
mock_test_qt.cpp
mockpp_test.cpp
/avida/current/source/third-party/mockpp/util AssertMo.cpp
AssertMo.h
Makefile.am
NotImplementedException.cpp
NotImplementedException.h
/avida/current/source/third-party/trio FILES.0 README.0
autogen.sh.0 config.guess.0
config.sub.0 configure.in.0
maketgz.0
/avida/current/source/third-party/yaktest AUTHORS.0 COPYING.0
ChangeLog.0 INSTALL.0
Makefile.am.0 NEWS.0
README.0 aclocal.m4.0
configure.in.0 depcomp.0
install-sh.0 missing.0
mkinstalldirs.0
Modified files:
/avida/current configure.in
/avida/current/source/qt-viewer/exp/exp_cleanup2 CMakeLists.txt
/avida/current/source/testsuites/unit_testsuites Makefile.am
/avida/current/source/testsuites/unit_testsuites/level_0
Makefile.am
/avida/current/source/testsuites/unit_testsuites/level_1
Makefile.am
/avida/current/source/third-party CMakeLists.txt Makefile.am
Log:
Merge from branch HEAD.
Index: avida/current/configure.in
diff -u avida/current/configure.in:1.35 avida/current/configure.in:1.35.2.1
--- avida/current/configure.in:1.35 Tue Nov 25 10:20:43 2003
+++ avida/current/configure.in Tue Dec 30 01:41:12 2003
@@ -50,13 +50,6 @@
AC_MSG_ERROR(perl compiler not found! Must have perl in the search path to compile Avida. Please set your PATH variable accordingly.)
fi
-AC_CHECK_HEADERS(limits)
-AC_CHECK_HEADERS(machine/limits.h)
-AC_CHECK_HEADERS(values.h)
-
-AH_TEMPLATE([DEBUG],
-[Define to turn debugging globally on.])
-
dnl ****************************************
dnl Configure options
dnl ****************************************
@@ -217,15 +210,6 @@
source/testsuites/unit_testsuites/level_0/Makefile
source/testsuites/unit_testsuites/level_1/Makefile
source/third-party/Makefile
- source/third-party/mockpp/Makefile \
- source/third-party/mockpp/compat/Makefile \
- source/third-party/mockpp/docs/Makefile \
- source/third-party/mockpp/docs/api/Makefile \
- source/third-party/mockpp/docs/en/Makefile \
- source/third-party/mockpp/examples/Makefile \
- source/third-party/mockpp/po/Makefile \
- source/third-party/mockpp/tests/Makefile \
- source/third-party/mockpp/util/Makefile \
source/third-party/trio/Makefile
source/third-party/yaktest/Makefile
source/third-party/yaktest/example/Makefile
Index: avida/current/source/qt-viewer/exp/exp_cleanup2/CMakeLists.txt
diff -u avida/current/source/qt-viewer/exp/exp_cleanup2/CMakeLists.txt:1.1.2.3 avida/current/source/qt-viewer/exp/exp_cleanup2/CMakeLists.txt:1.1.2.4
--- avida/current/source/qt-viewer/exp/exp_cleanup2/CMakeLists.txt:1.1.2.3 Wed Dec 17 10:36:33 2003
+++ avida/current/source/qt-viewer/exp/exp_cleanup2/CMakeLists.txt Tue Dec 30 01:41:13 2003
@@ -261,7 +261,6 @@
)
LINK_DIRECTORIES(
${ALL_LIB_DIRS}
- ${THIRDPARTY_BLD_DIR}/mockpp
${THIRDPARTY_BLD_DIR}/trio
${THIRDPARTY_BLD_DIR}/yaktest
.
@@ -298,7 +297,6 @@
main
tools
trio
- mockpp
yaktest
xqtviewer_moc
# xqtviewer_ui
@@ -328,7 +326,6 @@
main
tools
trio
- mockpp
yaktest
)
ADD_TEST(${TESTSUITE} ${TESTSUITE})
Index: avida/current/source/testsuites/unit_testsuites/Makefile.am
diff -u avida/current/source/testsuites/unit_testsuites/Makefile.am:1.1 avida/current/source/testsuites/unit_testsuites/Makefile.am:1.1.2.1
--- avida/current/source/testsuites/unit_testsuites/Makefile.am:1.1 Tue Nov 25 09:37:59 2003
+++ avida/current/source/testsuites/unit_testsuites/Makefile.am Tue Dec 30 01:41:14 2003
@@ -17,10 +17,7 @@
$(BLD_DIR)/tools/libtools.a \
$(BLD_DIR)/main/libmain.a \
$(BLD_DIR)/third-party/trio/libtrio.a \
- $(BLD_DIR)/third-party/yaktest/libyaktest.a \
- $(BLD_DIR)/third-party/mockpp/libmockpp.a \
- $(BLD_DIR)/third-party/mockpp/compat/libcompat.a \
- $(BLD_DIR)/third-party/mockpp/util/libutil.a
+ $(BLD_DIR)/third-party/yaktest/libyaktest.a
LINK = $(CXXLINK)
LDADD = $(UNITTEST_LIBS)
Index: avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am
diff -u avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am:1.1 avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am:1.1.2.1
--- avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am:1.1 Tue Nov 25 09:37:59 2003
+++ avida/current/source/testsuites/unit_testsuites/level_0/Makefile.am Tue Dec 30 01:41:14 2003
@@ -15,10 +15,7 @@
$(BLD_DIR)/tools/libtools.a \
$(BLD_DIR)/main/libmain.a \
$(BLD_DIR)/third-party/trio/libtrio.a \
- $(BLD_DIR)/third-party/yaktest/libyaktest.a \
- $(BLD_DIR)/third-party/mockpp/libmockpp.a \
- $(BLD_DIR)/third-party/mockpp/compat/libcompat.a \
- $(BLD_DIR)/third-party/mockpp/util/libutil.a
+ $(BLD_DIR)/third-party/yaktest/libyaktest.a
LINK = $(CXXLINK)
LDADD = $(UNITTEST_LIBS)
Index: avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am
diff -u avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am:1.1 avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am:1.1.2.1
--- avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am:1.1 Tue Nov 25 09:38:00 2003
+++ avida/current/source/testsuites/unit_testsuites/level_1/Makefile.am Tue Dec 30 01:41:14 2003
@@ -13,18 +13,13 @@
TOOLS_INC = -I$(TOOLS_DIR)
MAIN_DIR = $(SOURCE_DIR)/main
MAIN_INC = -I$(MAIN_DIR)
-MOCKPP_DIR = $(SOURCE_DIR)/third-party
-MOCKPP_INC = -I$(MOCKPP_DIR)
-INCLUDES = $(EVENT_INC) $(CPU_INC) $(TOOLS_INC) $(MAIN_INC) $(MOCKPP_INC) $(SOURCE_INC)
+INCLUDES = $(EVENT_INC) $(CPU_INC) $(TOOLS_INC) $(MAIN_INC) $(SOURCE_INC)
BLD_DIR = ../../..
UNITTEST_LIBS = \
- $(BLD_DIR)/third-party/yaktest/libyaktest.a \
- $(BLD_DIR)/third-party/mockpp/libmockpp.a \
- $(BLD_DIR)/third-party/mockpp/compat/libcompat.a \
- $(BLD_DIR)/third-party/mockpp/util/libutil.a
+ $(BLD_DIR)/third-party/yaktest/libyaktest.a
# cInstruction test
#if DEFAULT_TESTS
Index: avida/current/source/third-party/CMakeLists.txt
diff -u avida/current/source/third-party/CMakeLists.txt:1.1.2.1 avida/current/source/third-party/CMakeLists.txt:1.1.2.2
--- avida/current/source/third-party/CMakeLists.txt:1.1.2.1 Mon Dec 15 10:05:49 2003
+++ avida/current/source/third-party/CMakeLists.txt Tue Dec 30 01:41:14 2003
@@ -1,2 +1,2 @@
-SUBDIRS(trio yaktest mockpp)
+SUBDIRS(trio yaktest)
Index: avida/current/source/third-party/Makefile.am
diff -u avida/current/source/third-party/Makefile.am:1.3 avida/current/source/third-party/Makefile.am:1.3.2.1
--- avida/current/source/third-party/Makefile.am:1.3 Tue Nov 25 11:43:48 2003
+++ avida/current/source/third-party/Makefile.am Tue Dec 30 01:41:14 2003
@@ -1 +1 @@
-SUBDIRS = mockpp trio yaktest
+SUBDIRS = trio yaktest
More information about the Avida-cvs
mailing list