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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Mar  4 22:41:18 2011
New Revision: 43994

URL: http://svn.erp5.org?rev=43994&view=rev
Log:
here is the proof so that we can build whole Zope-2.12 environment with its dedicated python-2.6 and its eggs by running buildout on python-2.7 and its eggs.

these changes will be ported to software_release/erp5/software.cfg after checking on SlapOS.

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

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=43994&r1=43993&r2=43994&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Fri Mar  4 22:41:18 2011
@@ -30,6 +30,7 @@ extends =
   ../software-profiles/w3-validator.cfg
   ../software-profiles/libreoffice-bin.cfg
   ../software-profiles/python-2.6.cfg
+  ../software-profiles/python-2.7.cfg
   ../software-profiles/rdiff-backup.cfg
   ../software-profiles/w3m.cfg
   ../software-profiles/varnish.cfg
@@ -80,14 +81,12 @@ parts =
   products-erp5-development
 
 [bootstrap2.6]
-# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0
-# is used it is required to go back to default -- use own version of python
-python = buildout
+python = python2.6
 
 [rebootstrap]
 # This is first version of python
 version = 1
-section = python2.6
+section = python2.7
 
 [software_definition]
 software_home = ${buildout:directory}

Modified: erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5-2.12.cfg?rev=43994&r1=43993&r2=43994&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] Fri Mar  4 22:41:18 2011
@@ -32,10 +32,11 @@ destination = ${itools:source}
 recipe = plone.recipe.command
 # reference itools-download:destination instead of itools:source to trigger its
 # execution
+# here, we unset PYTHONPATH to invoke different python than buildout one.
 command =
     cd ${itools-download:destination} &&
-    ${buildout:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib &&
-    ${buildout:executable} setup.py install_lib -d ${itools:lib}
+    PYTHONPATH= ${python2.6:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib &&
+    PYTHONPATH= ${python2.6:executable} setup.py install_lib -d ${itools:lib}
 
 update-command = ${:command}
 location = ${itools:location}
@@ -123,9 +124,7 @@ eggs =
     StructuredText
 
 dependent-scripts = true
-# XXX getting python from [buildout] for the benefit of instance recipes
-# which should not attempt to compile python again
-#python = python2.6
+python = python2.6
 
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the
@@ -137,7 +136,20 @@ scripts =
   runzope
   runzeo
 
+[mysql-python]
+python = python2.6
+
+[lxml-python]
+python = python2.6
+
+[python-ldap-python]
+python = python2.6
+
+[pysvn-python]
+python = python2.6
+
 [precache-eggs]
+python = python2.6
 eggs +=
   plone.recipe.zope2instance
   plone.recipe.zeoserver

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=43994&r1=43993&r2=43994&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Fri Mar  4 22:41:18 2011
@@ -2247,7 +2247,7 @@ class AssertStunnel(AssertSoftwareMixin)
 if python_version >= '2.6':
   class AssertPython26(AssertSoftwareMixin):
     # .1 could be read from current buildout
-    parts_name = 'rebootstrap.1.parts'
+    parts_name = 'parts'
     python_path = parts_name + '/python%s' % python_version
     rpath_list = [
         'bzip2',