[Erp5-report] r32484 luke - in /erp5/trunk/buildout: mysql-instance/ python-2.4/ zope-insta...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Feb 12 10:59:39 2010
New Revision: 32484

URL: http://svn.erp5.org?rev=32484&view=rev
Log:
 - reuse software_definition part to find software

Modified:
    erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/python-2.4/buildout.cfg
    erp5/trunk/buildout/zope-instance/buildout.cfg

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=32484&r1=32483&r2=32484&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Fri Feb 12 10:59:39 2010
@@ -40,11 +40,11 @@
 recipe = plone.recipe.command
 command =
     mkdir -p ${configuration:mysql_datadir}
-    ${buildout:bin-directory}/mysql_install_db --datadir=${configuration:mysql_datadir}
+    ${software_definition:software_home}/bin/mysql_install_db --datadir=${configuration:mysql_datadir}
 
 [start-mysql-instance]
 recipe = plone.recipe.command
-command = ${buildout:bin-directory}/mysqld_safe --defaults-file=${configuration:mysql_cnf_file} &
+command = ${software_definition:software_home}/bin/mysqld_safe --defaults-file=${configuration:mysql_cnf_file} &
 update-command = ${:command}
 
 [stop-mysql-instance]

Modified: erp5/trunk/buildout/python-2.4/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/python-2.4/buildout.cfg?rev=32484&r1=32483&r2=32484&view=diff
==============================================================================
--- erp5/trunk/buildout/python-2.4/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/python-2.4/buildout.cfg [utf8] Fri Feb 12 10:59:39 2010
@@ -26,7 +26,7 @@
 
 [pythonbin]
 recipe = plone.recipe.command
-command = ln -sf ${python:executable} ${buildout:bin-directory}/python${buildout:python_version}
+command = ln -sf ${python:executable} ${software_definition:software_home}/bin/python${buildout:python_version}
 
 [requirements]
 binary =

Modified: erp5/trunk/buildout/zope-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/zope-instance/buildout.cfg?rev=32484&r1=32483&r2=32484&view=diff
==============================================================================
--- erp5/trunk/buildout/zope-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/zope-instance/buildout.cfg [utf8] Fri Feb 12 10:59:39 2010
@@ -40,7 +40,7 @@
 # XXX: This have to be converted into recipe
 recipe = plone.recipe.command
 command =
-  echo "CREATE DATABASE IF NOT EXISTS ${create_erp5_site:mysql_database_name} DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci" | ${buildout:bin-directory}/mysql --defaults-file=${configuration:mysql_cnf_file} -u root
+  echo "CREATE DATABASE IF NOT EXISTS ${create_erp5_site:mysql_database_name} DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci" | ${software_definition:software_home}/bin/mysql --defaults-file=${configuration:mysql_cnf_file} -u root
 
 [create_erp5_site]
 depends = ${create_mysql_database:command}