[Erp5-report] r43996 kazuhiko - /erp5/trunk/software_release/erp5/software.cfg

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Sat Mar  5 22:18:12 2011
New Revision: 43996

URL: http://svn.erp5.org?rev=43996&view=rev
Log:
sync with r43994 (build whole Zope-2.12 environment with its dedicated python-2.6).

Modified:
    erp5/trunk/software_release/erp5/software.cfg

Modified: erp5/trunk/software_release/erp5/software.cfg
URL: http://svn.erp5.org/erp5/trunk/software_release/erp5/software.cfg?rev=43996&r1=43995&r2=43996&view=diff
==============================================================================
--- erp5/trunk/software_release/erp5/software.cfg [utf8] (original)
+++ erp5/trunk/software_release/erp5/software.cfg [utf8] Sat Mar  5 22:18:12 2011
@@ -103,9 +103,7 @@ name = slapos.recipe.erp5
 list = ${products-deps:location} ${products-tidstorage:location} ${products-erp5:location} ${products-erp5-development:location}
 
 [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]
 # Default first version of rebootstrapped python
@@ -139,10 +137,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}
@@ -184,6 +183,7 @@ update-command =
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
 #      expose entry point for test runner
 recipe = zc.recipe.egg
+python = python2.6
 eggs = ${eggs:eggs}
 extra-paths = ${eggs:extra-paths}
 entry-points =
@@ -206,10 +206,12 @@ initialization =
 # *Why* python-MySQL workED and pycrypto DID not? Because MySQL distribution
 # was unpacked, and pycrypto was packed.
 recipe = zc.recipe.egg:custom
+python = python2.6
 egg = pycrypto
 
 [eggs]
 recipe = zc.recipe.egg
+python = python2.6
 eggs =
   ${mysql-python:egg}
   ${lxml-python:egg}
@@ -286,8 +288,21 @@ scripts =
 extra-paths =
   ${itools:location}/lib
 
+[mysql-python]
+python = python2.6
+
+[lxml-python]
+python = python2.6
+
+[python-ldap-python]
+python = python2.6
+
+[pysvn-python]
+python = python2.6
+
 [cloudooo]
 recipe = zc.recipe.egg
+python = python2.6
 eggs =
   ${lxml-python:egg}
   cloudooo