[Erp5-report] r32608 luke - in /erp5/trunk/buildout: ./ apache/ erp5-software/ haproxy/ hoo...

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Feb 16 13:46:53 CET 2010 

Author: luke
Date: Tue Feb 16 13:46:51 2010
New Revision: 32608

URL: http://svn.erp5.org?rev=32608&view=rev
Log:
 - reorganise internal structure

Put software and instance profiles in grouped directories.
Cleanup official.cfg extends.

Added:
    erp5/trunk/buildout/hooks/
    erp5/trunk/buildout/hooks/mysql-tritonn-hooks.py
      - copied unchanged from r32607, erp5/trunk/buildout/mysql-tritonn-5.0/src/mysql_hooks.py
    erp5/trunk/buildout/instance-profiles/
    erp5/trunk/buildout/instance-profiles/mysql.cfg
      - copied, changed from r32607, erp5/trunk/buildout/mysql-instance/buildout.cfg
    erp5/trunk/buildout/instance-profiles/oood.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/oood-instance/buildout.cfg
    erp5/trunk/buildout/instance-profiles/zeo.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/zeo-instance/buildout.cfg
    erp5/trunk/buildout/instance-profiles/zope.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/zope-instance/buildout.cfg
    erp5/trunk/buildout/software-profiles/
    erp5/trunk/buildout/software-profiles/apache.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/apache/buildout.cfg
    erp5/trunk/buildout/software-profiles/erp5.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/erp5-software/buildout.cfg
    erp5/trunk/buildout/software-profiles/haproxy.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/haproxy/buildout.cfg
    erp5/trunk/buildout/software-profiles/imagemagick.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/imagemagick/buildout.cfg
    erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg
      - copied, changed from r32607, erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg
    erp5/trunk/buildout/software-profiles/oood.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/oood/buildout.cfg
    erp5/trunk/buildout/software-profiles/openoffice-bin.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/openoffice-bin/buildout.cfg
    erp5/trunk/buildout/software-profiles/openoffice.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/openoffice/buildout.cfg
    erp5/trunk/buildout/software-profiles/python-2.4.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/python-2.4/buildout.cfg
    erp5/trunk/buildout/software-profiles/python-2.6.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/python-2.6/buildout.cfg
    erp5/trunk/buildout/software-profiles/supervisor.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/supervisor/buildout.cfg
    erp5/trunk/buildout/software-profiles/varnish.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/varnish/buildout.cfg
    erp5/trunk/buildout/software-profiles/zope-2.12.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/zope-2.12/buildout.cfg
    erp5/trunk/buildout/software-profiles/zope-2.8.cfg
      - copied unchanged from r32607, erp5/trunk/buildout/zope-2.8/buildout.cfg
    erp5/trunk/buildout/templates/
    erp5/trunk/buildout/templates/my.cnf.in
      - copied unchanged from r32607, erp5/trunk/buildout/mysql-instance/templates/my.cnf.in
    erp5/trunk/buildout/templates/mysql.in
      - copied unchanged from r32607, erp5/trunk/buildout/mysql-instance/templates/mysql.in
    erp5/trunk/buildout/templates/mysqladmin.in
      - copied unchanged from r32607, erp5/trunk/buildout/mysql-instance/templates/mysqladmin.in
    erp5/trunk/buildout/templates/mysqld_safe.in
      - copied unchanged from r32607, erp5/trunk/buildout/mysql-instance/templates/mysqld_safe.in
Removed:
    erp5/trunk/buildout/apache/
    erp5/trunk/buildout/erp5-software/
    erp5/trunk/buildout/haproxy/
    erp5/trunk/buildout/imagemagick/
    erp5/trunk/buildout/mysql-instance/
    erp5/trunk/buildout/mysql-tritonn-5.0/
    erp5/trunk/buildout/oood/
    erp5/trunk/buildout/oood-instance/
    erp5/trunk/buildout/openoffice/
    erp5/trunk/buildout/openoffice-bin/
    erp5/trunk/buildout/python-2.4/
    erp5/trunk/buildout/python-2.6/
    erp5/trunk/buildout/supervisor/
    erp5/trunk/buildout/varnish/
    erp5/trunk/buildout/zeo-instance/
    erp5/trunk/buildout/zope-2.12/
    erp5/trunk/buildout/zope-2.8/
    erp5/trunk/buildout/zope-instance/
Modified:
    erp5/trunk/buildout/minimal.cfg
    erp5/trunk/buildout/official.cfg

Copied: erp5/trunk/buildout/instance-profiles/mysql.cfg (from r32607, erp5/trunk/buildout/mysql-instance/buildout.cfg)
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/mysql.cfg?p2=erp5/trunk/buildout/instance-profiles/mysql.cfg&p1=erp5/trunk/buildout/mysql-instance/buildout.cfg&r1=32607&r2=32608&rev=32608&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-instance/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] Tue Feb 16 13:46:51 2010
@@ -17,22 +17,22 @@
 
 [mysql-bin]
 recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysql.in
+input = ${buildout:directory}/templates/mysql.in
 output = ${buildout:data-bin-directory}/mysql
 
 [mysql-admin]
 recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysqladmin.in
+input = ${buildout:directory}/templates/mysqladmin.in
 output = ${buildout:data-bin-directory}/mysqladmin
 
 [mysqld_safe-bin]
 recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/mysqld_safe.in
+input = ${buildout:directory}/templates/mysqld_safe.in
 output = ${buildout:data-bin-directory}/mysqld_safe
 
 [mysql-cnf]
 recipe = collective.recipe.template
-input = ${buildout:directory}/mysql-instance/templates/my.cnf.in
+input = ${buildout:directory}/templates/my.cnf.in
 output = ${configuration:mysql_cnf_file}
 
 [mysql-instance]

Modified: erp5/trunk/buildout/minimal.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/minimal.cfg?rev=32608&r1=32607&r2=32608&view=diff
==============================================================================
--- erp5/trunk/buildout/minimal.cfg [utf8] (original)
+++ erp5/trunk/buildout/minimal.cfg [utf8] Tue Feb 16 13:46:51 2010
@@ -1,8 +1,8 @@
 [buildout]
 extends =
   profiles/versions.cfg
-  erp5-software/buildout.cfg
-  zope-instance/buildout.cfg
+  software-profiles/erp5.cfg
+  instance-profiles/zope.cfg
 
 parts =
   cmf15

Modified: erp5/trunk/buildout/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/official.cfg?rev=32608&r1=32607&r2=32608&view=diff
==============================================================================
--- erp5/trunk/buildout/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/official.cfg [utf8] Tue Feb 16 13:46:51 2010
@@ -1,18 +1,16 @@
 [buildout]
 extends =
   profiles/versions.cfg
-  apache/buildout.cfg
-  erp5-software/buildout.cfg
-  haproxy/buildout.cfg
-  mysql-tritonn-5.0/buildout.cfg
-  mysql-instance/buildout.cfg
-  oood/buildout.cfg
-  imagemagick/buildout.cfg
-  openoffice-bin/buildout.cfg
-  python-2.4/buildout.cfg
-  varnish/buildout.cfg
-  zope-2.8/buildout.cfg
-  zope-instance/buildout.cfg
+  software-profiles/apache.cfg
+  software-profiles/erp5.cfg
+  software-profiles/haproxy.cfg
+  software-profiles/mysql-tritonn-5.0.cfg
+  software-profiles/openoffice-bin.cfg
+  software-profiles/oood.cfg
+  software-profiles/imagemagick.cfg
+  software-profiles/python-2.4.cfg
+  software-profiles/varnish.cfg
+  software-profiles/zope-2.8.cfg
 
 var-directory = ${:directory}/var
 etc-directory = ${:var-directory}/etc

Copied: erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg (from r32607, erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg)
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg?p2=erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg&p1=erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg&r1=32607&r2=32608&rev=32608&view=diff
==============================================================================
--- erp5/trunk/buildout/mysql-tritonn-5.0/buildout.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/mysql-tritonn-5.0.cfg [utf8] Tue Feb 16 13:46:51 2010
@@ -22,8 +22,8 @@
 [mysql-tritonn-5.0]
 recipe = hexagonit.recipe.cmmi
 url = http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.87.tar.gz
-pre-configure-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_hooks.py:pre_configure_hook
-post-make-hook = ${buildout:directory}/mysql-tritonn-5.0/src/mysql_hooks.py:post_make_hook
+pre-configure-hook = ${buildout:directory}/hooks/mysql-tritonn-hooks.py:pre_configure_hook
+post-make-hook = ${buildout:directory}/hooks/mysql-tritonn-hooks.py:post_make_hook
 # configure: how to avoid searching for my.cnf?
 #  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
 configure-options =

More information about the Erp5-report mailing list