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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Sun Dec 12 09:42:26 2010
New Revision: 41363

URL: http://svn.erp5.org?rev=41363&view=rev
Log:
use our own libraries for itools and lxml in zope-2.8 flavour.

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

Modified: erp5/trunk/buildout/software-profiles/erp5.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5.cfg?rev=41363&r1=41362&r2=41363&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] Sun Dec 12 09:42:26 2010
@@ -2,6 +2,7 @@
 extends =
   mysql-tritonn-5.0.cfg
   python-2.4.cfg
+  lxml-python.cfg
   mysql-python.cfg
   subversion.cfg
   pysvn-python.cfg
@@ -30,7 +31,13 @@ version-suffix-packages =
 recipe = zc.recipe.egg:custom
 python = python2.4
 egg = itools
-include-dirs = /usr/include/glib-2.0:/usr/lib/glib-2.0/include/:/usr/lib64/glib-2.0/include/
+include-dirs =
+  ${glib:location}/include/glib-2.0
+  ${glib:location}/lib/glib-2.0/include
+library-dirs =
+  ${glib:location}/lib
+rpath =
+  ${glib:location}/lib
 
 [products-deps]
 recipe = plone.recipe.distros
@@ -74,6 +81,7 @@ recipe = zc.recipe.egg
 eggs =
   ${itools:egg}
   ${mysql-python:egg}
+  ${lxml-python:egg}
   ${pysvn-python:egg}
   ${python-ldap-python:egg}
   ClientForm

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=41363&r1=41362&r2=41363&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Sun Dec 12 09:42:26 2010
@@ -1072,10 +1072,6 @@ class AssertApache(AssertSoftwareMixin):
       'libsqlite3',
       ], self.apache_rpath)
 
-class AssertItools(AssertSoftwareMixin):
-  def test_ld_parserso(self):
-    self.assertLibraryList('parts/itools/lib/itools/xml/parser.so', ['libc', 'libglib-2.0', 'libpthread'], ['glib'])
-
 class AssertOpenssl(AssertSoftwareMixin):
   def test_ld_openssl(self):
     self.assertLibraryList('parts/openssl/bin/openssl', ['libc', 'libcrypto', 'libdl', 'libssl'], ['openssl'])
@@ -2213,6 +2209,10 @@ if python_version >= '2.6':
       self.assertEquals([],
                         glob(self.python_path+'/lib/python%s/lib-dynload/*_failed.so' % python_version))
 
+  class AssertItools(AssertSoftwareMixin):
+    def test_ld_parserso(self):
+      self.assertLibraryList('parts/itools/lib/itools/xml/parser.so', ['libc', 'libglib-2.0', 'libpthread'], ['glib'])
+
   class AssertCurl(AssertSoftwareMixin):
     def test_ld_curl(self):
       self.assertLibraryList('parts/curl/bin/curl', [
@@ -2315,6 +2315,11 @@ elif python_version == '2.4':
       self.assertEquals([],
                         glob(self.python_path+'/lib/python%s/lib-dynload/*_failed.so' % python_version))
 
+  class AssertItools(AssertSoftwareMixin):
+    def test_ld_parserso(self):
+      egg_name = self.getDevelopEggName('itools', '0.20.8')
+      self.assertLibraryList('develop-eggs/%s/itools/xml/parser.so' % (egg_name), ['libc', 'libglib-2.0', 'libpthread'], ['glib'])
+
 class AssertElfLinkedInternally(AssertSoftwareMixin):
   def test(self):
     result_dict = {}