[Erp5-report] r40977 luke - /erp5/trunk/buildout/profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Wed Dec  1 16:18:12 2010
New Revision: 40977

URL: http://svn.erp5.org?rev=40977&view=rev
Log:
 - use slapos.rebootstrap in version 2.0 (only 2.12 flavour)

Python will be provided by buildout, but outside of usual buildout environment
(with own parts-directory and installed file). Because of this python binary
which is used to run buildout will no more suffer from uncontrolled rebuilds of
python or its dependencies, as python will be not automatically updated. By
changing rebootstrap:version value it is possible to *add* new python
compilation or switch to existing one.

As, even if python is provided by "same" buildout, but it is out of usual
bin/buildout control, there is no need to recompile it (after rebootstrap is
run buildout:executable becomes "self provided python"). So that is why python
compilation is avoided and python with dependencies can be safely deleted.

Modified:
    erp5/trunk/buildout/profiles/deployment-2.12.cfg
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/versions-2.12.cfg
    erp5/trunk/buildout/profiles/versions-common.cfg
    erp5/trunk/buildout/profiles/versions.cfg

Modified: erp5/trunk/buildout/profiles/deployment-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment-2.12.cfg?rev=40977&r1=40976&r2=40977&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] Wed Dec  1 16:18:12 2010
@@ -27,7 +27,6 @@ parts =
   supervisor-instance
   memcached-instance
 
-python = software_definition
 versions = versions
 
 [eggs]

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=40977&r1=40976&r2=40977&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Wed Dec  1 16:18:12 2010
@@ -33,10 +33,6 @@ extends =
   ../software-profiles/varnish.cfg
   ../software-profiles/xpdf.cfg
 
-rebootstrap-section = python2.6
-
-python = software_definition
-
 versions = versions
 
 parts =
@@ -72,6 +68,16 @@ parts =
   precache-eggs
   software_home
 
+[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
+
+[rebootstrap]
+# This is first version of python
+version = 1
+section = python2.6
+
 [software_definition]
 software_home = ${buildout:software_home}
 executable = ${python2.6:executable}

Modified: erp5/trunk/buildout/profiles/versions-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions-2.12.cfg?rev=40977&r1=40976&r2=40977&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions-2.12.cfg [utf8] Wed Dec  1 16:18:12 2010
@@ -12,3 +12,6 @@ Products.DCWorkflow = 2.2.1nxd001
 
 # 1.0.3 fixes bug https://bugs.launchpad.net/zelenium/+bug/673610
 Products.Zelenium >= 1.0.3
+
+# Use new version of slapos.rebootstrap
+slapos.rebootstrap >= 2.0

Modified: erp5/trunk/buildout/profiles/versions-common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions-common.cfg?rev=40977&r1=40976&r2=40977&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions-common.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions-common.cfg [utf8] Wed Dec  1 16:18:12 2010
@@ -29,6 +29,3 @@ xml-marshaller >= 0.9.2
 distribute =
 zc.buildout =
 setuptools =
-
-# use well known version of slapos.rebootstrap, 1.0
-slapos.rebootstrap = 1.0

Modified: erp5/trunk/buildout/profiles/versions.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions.cfg?rev=40977&r1=40976&r2=40977&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions.cfg [utf8] Wed Dec  1 16:18:12 2010
@@ -13,3 +13,6 @@ lxml = 2.2.8
 #pysvn = 1.7.2
 # zc.recipe.egg is pinned as this is known compatible versions with
 zc.recipe.egg = 1.2.2
+
+# use well known version of slapos.rebootstrap, 1.0
+slapos.rebootstrap = 1.0