From e8ab903a73af20e5d3b8befb3d2a5631d6c56fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 4 Feb 2011 17:35:47 +0000 Subject: [PATCH] - make python profiles self contained, as they are only software providers - remove not needed profile used as bootstrap template git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43069 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/profiles/bootstrap.cfg | 11 ----------- buildout/software-profiles/python-2.4.cfg | 10 ++++++---- buildout/software-profiles/python-2.6.cfg | 10 ++++++---- buildout/software-profiles/python-2.7.cfg | 11 ++++++----- 4 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 buildout/profiles/bootstrap.cfg diff --git a/buildout/profiles/bootstrap.cfg b/buildout/profiles/bootstrap.cfg deleted file mode 100644 index ef67779c7c..0000000000 --- a/buildout/profiles/bootstrap.cfg +++ /dev/null @@ -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"] diff --git a/buildout/software-profiles/python-2.4.cfg b/buildout/software-profiles/python-2.4.cfg index f079649dd3..6e0ba07f0e 100644 --- a/buildout/software-profiles/python-2.4.cfg +++ b/buildout/software-profiles/python-2.4.cfg @@ -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 diff --git a/buildout/software-profiles/python-2.6.cfg b/buildout/software-profiles/python-2.6.cfg index 4b770910cb..048b7bce13 100644 --- a/buildout/software-profiles/python-2.6.cfg +++ b/buildout/software-profiles/python-2.6.cfg @@ -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 diff --git a/buildout/software-profiles/python-2.7.cfg b/buildout/software-profiles/python-2.7.cfg index 4387a848aa..29db6af044 100644 --- a/buildout/software-profiles/python-2.7.cfg +++ b/buildout/software-profiles/python-2.7.cfg @@ -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 = edee1f9ccb3bbdab68cae1931e954701 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] -- 2.30.9