[Erp5-report] r43069 luke - in /erp5/trunk/buildout: profiles/ software-profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Fri Feb  4 18:35:47 2011
New Revision: 43069

URL: http://svn.erp5.org?rev=43069&view=rev
Log:
 - make python profiles self contained, as they are only software providers
 - remove not needed profile used as bootstrap template

Removed:
    erp5/trunk/buildout/profiles/bootstrap.cfg
Modified:
    erp5/trunk/buildout/software-profiles/python-2.4.cfg
    erp5/trunk/buildout/software-profiles/python-2.6.cfg
    erp5/trunk/buildout/software-profiles/python-2.7.cfg

Removed: erp5/trunk/buildout/profiles/bootstrap.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/bootstrap.cfg?rev=43068&view=auto
==============================================================================
--- erp5/trunk/buildout/profiles/bootstrap.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/bootstrap.cfg (removed)
@@ -1,11 +0,0 @@
-[buildout]
-parts =
-  bootstrap
-
-[bootstrap]
-recipe = zc.recipe.egg
-eggs = zc.buildout
-suffix =
-scripts =
-    buildout=bootstrap${:suffix}
-arguments = sys.argv[1:] + ["bootstrap"]

Modified: erp5/trunk/buildout/software-profiles/python-2.4.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.4.cfg?rev=43069&r1=43068&r2=43069&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] Fri Feb  4 18:35:47 2011
@@ -1,5 +1,4 @@
 [buildout]
-# XXX: Extends shall not jump out of software
 extends =
   bzip2.cfg
   gdbm.cfg
@@ -9,8 +8,6 @@ extends =
   readline.cfg
   sqlite3.cfg
   zlib.cfg
-  ../profiles/bootstrap.cfg
-  ../profiles/links.cfg
 
 parts =
     pythonbin2.4
@@ -60,6 +57,11 @@ scripts =
   ipython=ipython${python2.4:python_version_major}
 
 [bootstrap2.4]
-<= bootstrap
+recipe = zc.recipe.egg
+eggs = zc.buildout
+suffix =
+scripts =
+    buildout=bootstrap2.4
+arguments = sys.argv[1:] + ["bootstrap"]
 suffix = 2.4
 python = python2.4

Modified: erp5/trunk/buildout/software-profiles/python-2.6.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.6.cfg?rev=43069&r1=43068&r2=43069&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] Fri Feb  4 18:35:47 2011
@@ -9,8 +9,6 @@ extends =
   readline.cfg
   sqlite3.cfg
   zlib.cfg
-  ../profiles/bootstrap.cfg
-  ../profiles/links.cfg
 
 parts =
     python2.6
@@ -36,6 +34,10 @@ environment =
   LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
 
 [bootstrap2.6]
-<= bootstrap
-suffix = 2.6
+recipe = zc.recipe.egg
+eggs = zc.buildout
+suffix =
+scripts =
+    buildout=bootstrap2.6
+arguments = sys.argv[1:] + ["bootstrap"]
 python = python2.6

Modified: erp5/trunk/buildout/software-profiles/python-2.7.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-2.7.cfg?rev=43069&r1=43068&r2=43069&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.7.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.7.cfg [utf8] Fri Feb  4 18:35:47 2011
@@ -1,5 +1,4 @@
 [buildout]
-# XXX: Extends shall not jump out of software
 extends =
   bzip2.cfg
   gdbm.cfg
@@ -8,8 +7,6 @@ extends =
   readline.cfg
   sqlite3.cfg
   zlib.cfg
-  ../profiles/bootstrap.cfg
-  ../profiles/links.cfg
 
 parts =
     python2.7
@@ -30,8 +27,12 @@ md5sum = edee1f9ccb3bbdab68cae1931e95470
 package_version_suffix = rc1
 
 [bootstrap2.7]
-<= bootstrap
-suffix = 2.7
+recipe = zc.recipe.egg
+eggs = zc.buildout
+suffix =
+scripts =
+    buildout=bootstrap2.7
+arguments = sys.argv[1:] + ["bootstrap"]
 python = python2.7
 
 [python2.7common]