diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg index cacfee9444f2fffebaaa7f99fab24bcaed01f0fe..62aaa7a3c469e45af392dfc6defcfdd61df13b90 100644 --- a/buildout/profiles/official.cfg +++ b/buildout/profiles/official.cfg @@ -24,6 +24,7 @@ etc-directory = ${:var-directory}/etc log-directory = ${:var-directory}/log data-bin-directory = ${:var-directory}/bin +python = software_definition versions = versions find-links = http://download.zope.org/distribution/ @@ -78,3 +79,4 @@ mysql_software = ${:software_home}/parts/mysql-tritonn-5.0 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/python${buildout:python_version}/bin/python${buildout:python_version} diff --git a/buildout/software-profiles/python-2.4.cfg b/buildout/software-profiles/python-2.4.cfg index b3fe8c19ed56ab7a0e59b30d17619082fceddb68..ba10a56e21eb075dcabb588298ff9f1e0c973b23 100644 --- a/buildout/software-profiles/python-2.4.cfg +++ b/buildout/software-profiles/python-2.4.cfg @@ -2,15 +2,14 @@ # 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_version = 2.4 -python_version_minor = 6 -python_version_full = ${:python_version}.${:python_version_minor} -python = python parts = python pythonbin [python] recipe = hexagonit.recipe.cmmi +python_version_minor = 6 +python_version_full = ${buildout:python_version}.${:python_version_minor} url = http://python.org/ftp/python/${buildout:python_version_full}/Python-${buildout:python_version_full}.tgz prefix = ${buildout:parts-directory}/python${buildout:python_version} @@ -25,11 +24,9 @@ configure-options = patches = ${buildout:directory}/patches/python2.4-dbm.patch -executable = ${:prefix}/bin/python${buildout:python_version} - [pythonbin] recipe = plone.recipe.command -command = ln -sf ${python:executable} ${software_definition:software_home}/bin/python${buildout:python_version} +command = ln -sf ${software_definition:executable} ${software_definition:software_home}/bin/python${buildout:python_version} [requirements] binary =