[Opentrep-svn] SF.net SVN: opentrep:[208] trunk/opentrep

[<den...@us...>]

Revision: 208
          http://opentrep.svn.sourceforge.net/opentrep/?rev=208&view=rev
Author:   denis_arnaud
Date:     2009-12-31 12:23:45 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
[Test] ExtraCC is now referenced as an external project, rather than embedded.

Modified Paths:
--------------
    trunk/opentrep/Makefile.am
    trunk/opentrep/configure.ac
    trunk/opentrep/test/IndexBuildingTestSuite.cpp
    trunk/opentrep/test/Makefile.am

Property Changed:
----------------
    trunk/opentrep/


Property changes on: trunk/opentrep
___________________________________________________________________
Added: svn:externals
   + config https://stdair.svn.sourceforge.net/svnroot/stdair/trunk/stdair/config
extracppunit https://extracc.svn.sourceforge.net/svnroot/extracc/trunk/extracc/extracppunit



Modified: trunk/opentrep/Makefile.am
===================================================================
--- trunk/opentrep/Makefile.am	2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/Makefile.am	2009-12-31 12:23:45 UTC (rev 208)
@@ -25,7 +25,7 @@
 
 # Build in these directories:
 SUBDIRS = @PACKAGE@ win32 po man $(INFO_DOC_DIR) $(HTML_DOC_DIR) db \
-	gui $(TEST_DIR)
+	gui extracppunit $(TEST_DIR)
 
 
 # Configuration helpers

Modified: trunk/opentrep/configure.ac
===================================================================
--- trunk/opentrep/configure.ac	2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/configure.ac	2009-12-31 12:23:45 UTC (rev 208)
@@ -292,7 +292,7 @@
 	gui/Makefile
 	gui/icons/Makefile
 	gui/psp/Makefile
-	test/com/Makefile
+	extracppunit/Makefile
 	test/parsers/Makefile
 	test/i18n/Makefile
 	test/i18n/icu/Makefile

Modified: trunk/opentrep/test/IndexBuildingTestSuite.cpp
===================================================================
--- trunk/opentrep/test/IndexBuildingTestSuite.cpp	2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/test/IndexBuildingTestSuite.cpp	2009-12-31 12:23:45 UTC (rev 208)
@@ -2,7 +2,7 @@
 #include <fstream>
 #include <string>
 // CPPUNIT
-#include <test/com/CppUnitCore.hpp>
+#include <extracppunit/CppUnitCore.hpp>
 // OpenTrep
 #include <opentrep/OPENTREP_Service.hpp>
 #include <opentrep/Location.hpp>

Modified: trunk/opentrep/test/Makefile.am
===================================================================
--- trunk/opentrep/test/Makefile.am	2009-12-28 15:18:46 UTC (rev 207)
+++ trunk/opentrep/test/Makefile.am	2009-12-31 12:23:45 UTC (rev 208)
@@ -1,22 +1,25 @@
-## command sub-directory
+## test/opentrep sub-directory
 include $(top_srcdir)/Makefile.common
 
 MAINTAINERCLEANFILES = Makefile.in
 
 ##
-SUBDIRS = com parsers
+SUBDIRS = parsers
 
+EXTRA_DIST = testIndexer.sh testSearcher.sh
+
 ##
 check_PROGRAMS = IndexBuildingTestSuite
 TESTS = $(check_PROGRAMS)
 XFAIL_TESTS = #IndexBuildingTestSuite
 
+#
 IndexBuildingTestSuite_SOURCES = IndexBuildingTestSuite.hpp \
 				IndexBuildingTestSuite.cpp
 IndexBuildingTestSuite_CXXFLAGS= $(CPPUNIT_CFLAGS) $(BOOST_CFLAGS)
-IndexBuildingTestSuite_LDADD = $(top_builddir)/test/com/libcppunitcore.la
+IndexBuildingTestSuite_LDADD = \
+	$(top_builddir)/extracppunit/libextracc-extracppunit.la
 IndexBuildingTestSuite_LDFLAGS = \
-		$(BOOST_LIBS) $(SOCI_LIBS) $(CPPUNIT_LIBS) \
+		$(BOOST_LIBS) $(SOCI_LIBS) $(XAPIAN_LIBS) $(CPPUNIT_LIBS) \
 		$(top_builddir)/@PACKAGE@/lib@PACKAGE@.la
 
-EXTRA_DIST = testIndexer.sh testSearcher.sh


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.