[Erp5-report] r31915 luke - in /erp5/trunk/buildout: ./ mysql-instance/ mysql-instance/temp...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jan 22 16:05:37 2010
New Revision: 31915

URL: http://svn.erp5.org?rev=31915&view=rev
Log:
 - create software definition section

Modified:
    erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/mysql-instance/templates/mysql.in
    erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
    erp5/trunk/buildout/mysql-instance/templates/mysqld.in
    erp5/trunk/buildout/official.cfg

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=31915&r1=31914&r2=31915&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Fri Jan 22 16:05:37 2010
@@ -40,13 +40,13 @@
 [mysql_install_db]
 recipe = plone.recipe.command
 command = 
-    ${buildout:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir}
+    ${software_definition:mysql_software}/bin/mysql_install_db --datadir=${mycnf:datadir}
 update-command = ${mysql_install_db:command}
 
 [mycnf]
 recipe = plone.recipe.command
 command =
-basedir=${buildout:mysql_software}
+basedir=${software_definition:mysql_software}
 datadir=${buildout:mysql_datadir}
 # files shall be in better places
 pid=${:datadir}/mysql.pid

Modified: erp5/trunk/buildout/mysql-instance/templates/mysql.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysql.in?rev=31915&r1=31914&r2=31915&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] Fri Jan 22 16:05:37 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${buildout:mysql_software}/bin/mysql -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${software_definition:mysql_software}/bin/mysql -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in?rev=31915&r1=31914&r2=31915&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] Fri Jan 22 16:05:37 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${buildout:mysql_software}/bin/mysqladmin -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*
+${software_definition:mysql_software}/bin/mysqladmin -P ${ports:mysql} -S ${mycnf:sock} -u root -p $*

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=31915&r1=31914&r2=31915&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] Fri Jan 22 16:05:37 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${buildout:mysql_software}/bin/mysqld_safe ${mycnf:opt}
+${software_definition:mysql_software}/bin/mysqld_safe ${mycnf:opt}

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=31915&r1=31914&r2=31915&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Fri Jan 22 16:05:37 2010
@@ -36,5 +36,5 @@
 #  erp5-bt5
 #  erp5-products
 
-# XXX: shall be moved to mysql software buildout
+[software_definition]
 mysql_software = ${mysql-tritonn-5.0:location}