[Erp5-report] r34171 leonardo - in /erp5/trunk/buildout: ./ local-eggs/localbin/ profiles/ ...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Mar 27 02:03:33 CET 2010
Author: leonardo
Date: Sat Mar 27 02:03:32 2010
New Revision: 34171
URL: http://svn.erp5.org?rev=34171&view=rev
Log:
streamlined python recipes, dispensing the use of the localbin egg
Added:
erp5/trunk/buildout/software-profiles/python-common.cfg
erp5/trunk/buildout/testpython.cfg
Removed:
erp5/trunk/buildout/local-eggs/localbin/
Modified:
erp5/trunk/buildout/profiles/official.cfg
erp5/trunk/buildout/profiles/software-definition.cfg
erp5/trunk/buildout/software-profiles/erp5.cfg
erp5/trunk/buildout/software-profiles/python-2.4.cfg
erp5/trunk/buildout/software-profiles/python-2.6.cfg
Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=34171&r1=34170&r2=34171&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -1,4 +1,6 @@
[buildout]
+software_home = ${:directory}
+
extends =
../profiles/versions.cfg
../profiles/software-definition.cfg
@@ -13,12 +15,13 @@
../software-profiles/ocropus.cfg
../software-profiles/oood.cfg
../software-profiles/openoffice-bin.cfg
+ ../software-profiles/python-common.cfg
../software-profiles/python-2.4.cfg
../software-profiles/varnish.cfg
../software-profiles/zope-2.8.cfg
../profiles/common.cfg
-python = software_definition
+python = python2.4
versions = versions
parts =
@@ -39,7 +42,6 @@
products-other
openoffice-bin
oood
- pythonbin
[show-requirements]
recipe = plone.recipe.command
@@ -49,4 +51,4 @@
update-command = ${:command}
[software_definition]
-software_home = ${buildout:directory}
+software_home = ${buildout:software_home}
Modified: erp5/trunk/buildout/profiles/software-definition.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/software-definition.cfg?rev=34171&r1=34170&r2=34171&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/software-definition.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/software-definition.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -9,7 +9,6 @@
oood_software = ${:software_home}/parts/oood
openoffice_software = ${:software_home}/parts/openoffice-bin
zope_software = ${:software_home}/parts/zope-2.8
-executable = ${:software_home}/parts/python2.4/bin/python2.4
products-zope = ${:zope_software}/lib/python/Products
products-erp5 = ${:software_home}/parts/products-erp5
products-erp5-development = ${:software_home}/parts/products-erp5-development
Modified: erp5/trunk/buildout/software-profiles/erp5.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5.cfg?rev=34171&r1=34170&r2=34171&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -18,8 +18,8 @@
[itools]
# use a custom build for itools, to add lib64 to the include path
-depends = ${python:location}
recipe = zc.recipe.egg:custom
+python = python2.4
egg = itools
include-dirs = /usr/include/glib-2.0:/usr/lib/glib-2.0/include/:/usr/lib64/glib-2.0/include/
@@ -78,6 +78,14 @@
threadframe
timerserver
uuid
+python = python2.4
+dependent-scripts = true
+interpreter = python${python2.4:version}
+extra-paths =
+ ${zope-2.8:location}/lib/python
+scripts =
+ python=${:interpreter}
+ ipython=ipython${python2.4:version}
[requirements]
development =
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=34171&r1=34170&r2=34171&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.4.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -1,12 +1,8 @@
[buildout]
-# http://bluedynamics.com/articles/jens/build-python-in-buildout
-# based on https://svn.plone.org/svn/collective/buildout/bda-naked-python/buildout2.4.cfg
-develop += local-eggs/localbin
+# extend your buildout with python-common.cfg before extending with this file
-python_version = 2.4
parts =
- python
- pythonbin
+ python2.4
[python2.4-dbm-patch]
recipe = hexagonit.recipe.download
@@ -14,47 +10,12 @@
download-only = true
filename = attachment.cgi
-[python]
-recipe = hexagonit.recipe.cmmi
+[python2.4]
+<= python-common
+python_version_major = 2.4
python_version_minor = 6
-python_version_full = ${buildout:python_version}.${:python_version_minor}
-url =
- http://python.org/ftp/python/${:python_version_full}/Python-${:python_version_full}.tgz
-prefix = ${buildout:parts-directory}/python${buildout:python_version}
-configure-options =
- --enable-unicode=ucs4
- --with-threads
- --with-readline
- --with-dbm
- --with-zlib
- --with-ssl
- --with-bz2
-
-patches = ${python2.4-dbm-patch:location}/${python2.4-dbm-patch:filename}
-
-[pythonbin]
-# XXX/Note: This is hackish way to have fully featured python interpreter
-recipe = zc.recipe.egg:scripts
-eggs = ${eggs:eggs}
- invokepython
-extra-paths =
- ${zope-2.8:location}/lib/python
-dependent-scripts = true
-scripts =
- invokepython=python${buildout:python_version}
- ipython=ipython${buildout:python_version}
-
-[requirements]
-binary =
- g++
- gcc
- make
-
-development =
- /usr/include/bzlib.h
- /usr/include/curses.h
- /usr/include/gdbm.h
- /usr/include/jpeglib.h
- /usr/include/openssl/ssl.h
- /usr/include/termcap.h
- /usr/include/zlib.h
+# this next setting should always match the name of this part
+name = python2.4
+# XXX maybe add the tarfile patch as well?
+patches =
+ ${python2.4-dbm-patch:location}/${python2.4-dbm-patch:filename}
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=34171&r1=34170&r2=34171&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/python-2.6.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -1,8 +1,12 @@
[buildout]
-# http://bluedynamics.com/articles/jens/build-python-in-buildout
-extends = https://svn.plone.org/svn/collective/buildout/bda-naked-python/buildout2.6.cfg
-python_version = 2.6
+# extend your buildout with python-common.cfg before extending with this file
-[pythonbin]
-recipe = plone.recipe.command
-command = ln -s ${python:executable} ${buildout:bin-directory}/python${buildout:python_version}
+parts =
+ python2.6
+
+[python2.6]
+<= python-common
+python_version_major = 2.6
+python_version_minor = 5
+# this next setting should always match the name of this part
+name = python2.6
Added: erp5/trunk/buildout/software-profiles/python-common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/python-common.cfg?rev=34171&view=auto
==============================================================================
--- erp5/trunk/buildout/software-profiles/python-common.cfg (added)
+++ erp5/trunk/buildout/software-profiles/python-common.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -1,0 +1,43 @@
+# part template for building python distributions
+# http://bluedynamics.com/articles/jens/build-python-in-buildout
+# based on https://svn.plone.org/svn/collective/buildout/bda-naked-python/buildout2.4.cfg
+
+[python-common]
+# override these three variables in parts that extend this one:
+#python_version_major = 2.4
+#python_version_minor = 6
+#name = python2.4 # unfortunately there is no way to get the part name here
+
+# This is actually the default setting for prefix, but we can't use it in
+# other settings in this part if we don't set it explicitly here.
+prefix = ${buildout:parts-directory}/${:name}
+version = ${:python_version_major}
+executable = ${:prefix}/bin/python${:version}
+
+recipe = hexagonit.recipe.cmmi
+python_version_full = ${:python_version_major}.${:python_version_minor}
+url =
+ http://python.org/ftp/python/${:python_version_full}/Python-${:python_version_full}.tgz
+configure-options =
+ --enable-unicode=ucs4
+ --with-threads
+ --with-readline
+ --with-dbm
+ --with-zlib
+ --with-ssl
+ --with-bz2
+
+[requirements]
+binary =
+ g++
+ gcc
+ make
+
+development =
+ /usr/include/bzlib.h
+ /usr/include/curses.h
+ /usr/include/gdbm.h
+ /usr/include/jpeglib.h
+ /usr/include/openssl/ssl.h
+ /usr/include/termcap.h
+ /usr/include/zlib.h
Added: erp5/trunk/buildout/testpython.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/testpython.cfg?rev=34171&view=auto
==============================================================================
--- erp5/trunk/buildout/testpython.cfg (added)
+++ erp5/trunk/buildout/testpython.cfg [utf8] Sat Mar 27 02:03:32 2010
@@ -1,0 +1,19 @@
+[buildout]
+software_home = ${:directory}
+versions = versions
+extends =
+ profiles/versions.cfg
+ profiles/software-definition.cfg
+ software-profiles/zope-2.8.cfg
+ software-profiles/python-common.cfg
+ software-profiles/python-2.4.cfg
+ software-profiles/python-2.6.cfg
+ software-profiles/mysql-tritonn-5.0.cfg
+ software-profiles/erp5.cfg
+ profiles/common.cfg
+
+python = python2.4
+parts = eggs
+
+[software_definition]
+software_home = ${buildout:software_home}
More information about the Erp5-report
mailing list