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

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Feb 12 11:37:27 CET 2010 

Author: luke
Date: Fri Feb 12 11:37:26 2010
New Revision: 32486

URL: http://svn.erp5.org?rev=32486&view=rev
Log:
 - really separate software from data
 - rename templates and output files to be consistent with original (mysqld -> mysqld_safe)
 - reuse buildout automatic dependency
 - put binaries into var/bin and reuse from there

Sometimes software is in "data" directory - especially those binaries which
are controlling software configuration.

Added:
    erp5/trunk/buildout/mysql-instance/templates/mysqld_safe.in
      - copied, changed from r32478, erp5/trunk/buildout/mysql-instance/templates/mysqld.in
Removed:
    erp5/trunk/buildout/mysql-instance/templates/mysqld.in
Modified:
    erp5/trunk/buildout/development.cfg
    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-tritonn-5.0/buildout.cfg
    erp5/trunk/buildout/official.cfg
    erp5/trunk/buildout/zope-instance/buildout.cfg

Modified: erp5/trunk/buildout/development.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/development.cfg?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/development.cfg [utf8] (original)
+++ erp5/trunk/buildout/development.cfg [utf8] Fri Feb 12 11:37:26 2010
@@ -3,7 +3,6 @@
 
 parts +=
   create-directories
-  mysql-binaries
   mysql-cnf
   mysql-instance
   start-mysql-instance

Modified: erp5/trunk/buildout/mysql-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/buildout.cfg?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] Fri Feb 12 11:37:26 2010
@@ -4,7 +4,6 @@
 
 [buildout]
 parts =
-    mycnf
     mysql-instance
 
 [configuration]
@@ -19,17 +18,17 @@
 [mysql-bin]
 recipe = collective.recipe.template
 input = ${buildout:directory}/mysql-instance/templates/mysql.in
-output = ${buildout:directory}/bin/mysql
+output = ${buildout:data-bin-directory}/mysql
 
 [mysql-admin]
 recipe = collective.recipe.template
 input = ${buildout:directory}/mysql-instance/templates/mysqladmin.in
-output = ${buildout:directory}/bin/mysqladmin
+output = ${buildout:data-bin-directory}/mysqladmin
 
-[mysqld-bin]
+[mysqld_safe-bin]
 recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysqld.in
-output = ${buildout:directory}/bin/mysqld
+input = ${buildout:directory}/mysql-instance/templates/mysqld_safe.in
+output = ${buildout:data-bin-directory}/mysqld_safe
 
 [mysql-cnf]
 recipe = collective.recipe.template
@@ -37,6 +36,13 @@
 output = ${configuration:mysql_cnf_file}
 
 [mysql-instance]
+depends =
+  ${create-directories:command}
+  ${mysql-cnf:output}
+  ${mysql-bin:output}
+  ${mysql-admin:output}
+  ${mysqld_safe-bin:output}
+
 recipe = plone.recipe.command
 command =
     mkdir -p ${configuration:mysql_datadir}
@@ -44,7 +50,7 @@
 
 [start-mysql-instance]
 recipe = plone.recipe.command
-command = ${software_definition:software_home}/bin/mysqld_safe --defaults-file=${configuration:mysql_cnf_file} &
+command = ${buildout:data-bin-directory}/bin/mysqld_safe &
 update-command = ${:command}
 
 [stop-mysql-instance]

Modified: erp5/trunk/buildout/mysql-instance/templates/mysql.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysql.in?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysql.in [utf8] Fri Feb 12 11:37:26 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysql --no-defaults --protocol=tcp --host=${configuration:mysql_host} --port=${configuration:mysql_port} $@
+${software_definition:mysql_software}/bin/mysql --defaults-file=${configuration:mysql_cnf_file} $@

Modified: erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in [utf8] Fri Feb 12 11:37:26 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqladmin --no-defaults --protocol=tcp --host=${configuration:mysql_host} --port=${configuration:mysql_port} $@
+${software_definition:mysql_software}/bin/mysqladmin --defaults-file=${configuration:mysql_cnf_file} $@

Removed: erp5/trunk/buildout/mysql-instance/templates/mysqld.in
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld.in?rev=32485&view=auto
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld.in (removed)
@@ -1,3 +1,0 @@
-#!/bin/sh
-
-${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${configuration:mysql_pid} --log-error=${configuration:mysql_error_log} --basedir=${software_definition:mysql_software} --datadir=${configuration:mysql_datadir} --socket=${configuration:mysql_sock}

Copied: erp5/trunk/buildout/mysql-instance/templates/mysqld_safe.in (from r32478, erp5/trunk/buildout/mysql-instance/templates/mysqld.in)
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-instance/templates/mysqld_safe.in?p2=erp5/trunk/buildout/mysql-instance/templates/mysqld_safe.in&p1=erp5/trunk/buildout/mysql-instance/templates/mysqld.in&r1=32478&r2=32486&rev=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/templates/mysqld.in [utf8] (original)
+++ erp5/trunk/buildout/mysql-instance/templates/mysqld_safe.in [utf8] Fri Feb 12 11:37:26 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${software_definition:mysql_software}/bin/mysqld_safe --no-defaults --port=${configuration:mysql_port} --pid-file=${configuration:mysql_pid} --log-error=${configuration:mysql_error_log} --basedir=${software_definition:mysql_software} --datadir=${configuration:mysql_datadir} --socket=${configuration:mysql_sock}
+${software_definition:mysql_software}/bin/mysqld_safe --defaults-file=${configuration:mysql_cnf_file} $@

Modified: erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg [utf8] Fri Feb 12 11:37:26 2010
@@ -42,15 +42,6 @@
     CXXFLAGS =-I${senna:location}/include
     LDLAGS =-L${senna:location}/lib
 
-[mysql-binaries]
-# another approach - software buildout provides easily accessible binaries
-recipe = plone.recipe.command
-command =
-  ln -sf ${software_definition:mysql_software}/bin/mysql ${buildout:directory}/bin/mysql
-  ln -sf ${software_definition:mysql_software}/bin/mysqladmin ${buildout:directory}/bin/mysqladmin
-  ln -sf ${software_definition:mysql_software}/bin/mysqld_safe ${buildout:directory}/bin/mysqld_safe
-  ln -sf ${software_definition:mysql_software}/bin/mysql_install_db ${buildout:directory}/bin/mysql_install_db
-
 [requirements]
 binary = flex bison patch gcc g++
 development = /usr/include/termcap.h /usr/include/curses.h

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Fri Feb 12 11:37:26 2010
@@ -17,6 +17,7 @@
 var-directory = ${:directory}/var
 etc-directory = ${:var-directory}/etc
 log-directory = ${:var-directory}/log
+data-bin-directory = ${:var-directory}/bin
 
 versions = versions
 find-links =
@@ -63,6 +64,7 @@
   mkdir -p ${buildout:etc-directory}
   mkdir -p ${buildout:var-directory}
   mkdir -p ${buildout:log-directory}
+  mkdir -p ${buildout:data-bin-directory}
 
 [software_definition]
 software_home = ${buildout:directory}

Modified: erp5/trunk/buildout/zope-instance/buildout.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/zope-instance/buildout.cfg?rev=32486&r1=32485&r2=32486&view=diff
==============================================================================
--- erp5/trunk/buildout/zope-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/zope-instance/buildout.cfg [utf8] Fri Feb 12 11:37:26 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" | ${software_definition:software_home}/bin/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" | ${buildout:data-bin-directory}/mysql -u root
 
 [create_erp5_site]
 depends = ${create_mysql_database:command}

More information about the Erp5-report mailing list