[Erp5-report] r40725 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 25 17:36:10 2010
New Revision: 40725

URL: http://svn.erp5.org?rev=40725&view=rev
Log:
update sphinx.cfg:
* use our own libexpat.
* enable/disable features explicitly.

Modified:
    erp5/trunk/buildout/software-profiles/sphinx.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/sphinx.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/sphinx.cfg?rev=40725&r1=40724&r2=40725&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/sphinx.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/sphinx.cfg [utf8] Thu Nov 25 17:36:10 2010
@@ -1,6 +1,7 @@
 [buildout]
 parts = sphinx
 extends =
+  ../software-profiles/libexpat.cfg
   ../software-profiles/mysql-5.1.cfg
   ../software-profiles/zlib.cfg
 
@@ -28,10 +29,13 @@ configure-options =
   --with-mysql-includes=${mysql-5.1:location}/include/mysql
   --with-mysql-libs=${mysql-5.1:location}/lib/mysql
   --with-libstemmer
+  --with-iconv
+  --without-pgsql
+  --without-unixodbc
 patch-options = -p1
 patches =
   ${sphinx-1.10-fix_nosigpipe.patch:location}/${sphinx-1.10-fix_nosigpipe.patch:filename}
   ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql
+  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mysql-5.1:location}/lib/mysql -Wl,-rpath ${libexpat:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40725&r1=40724&r2=40725&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Nov 25 17:36:10 2010
@@ -1832,6 +1832,30 @@ class AssertFontconfig(AssertSoftwareMix
     self.assertLibraryList('parts/fontconfig/bin/fc-scan', self.lib_list,
         self.rpath_list)
 
+class AssertSphinx(AssertSoftwareMixin):
+  core_lib_list = [
+      'libc',
+      'libexpat',
+      'libgcc_s',
+      'libm',
+      'libmysqlclient',
+      'libpthread',
+      'librt',
+      'libstdc++',
+      'libz',
+      ]
+  core_rpath_list = [
+      'libexpat',
+      'zlib'
+      ]
+  core_additional_rpath_list = [
+      os.path.join(os.path.abspath(os.curdir), 'parts', 'mysql-5.1', 'lib', 'mysql')
+      ]
+
+  def test_ld_sphinx(self):
+    for i in ('indexer', 'indextool', 'search', 'searchd', 'spelldump'):
+      self.assertLibraryList('parts/sphinx/bin/%s' % i,
+        self.core_lib_list, self.core_rpath_list, self.core_additional_rpath_list)
 
 class AssertElfLinkedInternally(AssertSoftwareMixin):
   def test(self):