[Erp5-report] r32841 luke - in /erp5/trunk/buildout: instance-profiles/ profiles/ software-...

[nobody at svn.erp5.org]

Author: luke
Date: Fri Feb 19 10:05:44 2010
New Revision: 32841

URL: http://svn.erp5.org?rev=32841&view=rev
Log:
 - detach instance from software *completly*

Instace part of buildout is reusing software part, but without using buildout
mechanism. Thanks to this it is possible to separate software and data in
clean way.

Added:
    erp5/trunk/buildout/profiles/common.cfg
    erp5/trunk/buildout/profiles/software-definition.cfg
Modified:
    erp5/trunk/buildout/instance-profiles/oood.cfg
    erp5/trunk/buildout/profiles/deployment.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/openoffice-bin.cfg

Modified: erp5/trunk/buildout/instance-profiles/oood.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/oood.cfg?rev=32841&r1=32840&r2=32841&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] Fri Feb 19 10:05:44 2010
@@ -2,6 +2,9 @@
 parts = oood-instance
 
 [configuration]
+openoffice_python = ${software_definition:openoffice_software}/basis-link/program/python.bin
+openoffice_program = ${software_definition:openoffice_software}/program
+openoffice_uno = ${software_definition:openoffice_software}/basis-link/program/
 oood_conf_file = ${buildout:etc-directory}/oood.conf
 oood_log_file = ${buildout:log-directory}/oood.log
 oood_run = ${buildout:var-directory}/oood

Added: erp5/trunk/buildout/profiles/common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/common.cfg?rev=32841&view=auto
==============================================================================
--- erp5/trunk/buildout/profiles/common.cfg (added)
+++ erp5/trunk/buildout/profiles/common.cfg [utf8] Fri Feb 19 10:05:44 2010
@@ -1,0 +1,11 @@
+[buildout]
+
+[create-directories]
+recipe = plone.recipe.command
+command =
+  mkdir -p ${buildout:etc-directory}
+  mkdir -p ${buildout:var-directory}
+  mkdir -p ${buildout:log-directory}
+  mkdir -p ${buildout:data-bin-directory}
+
+

Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=32841&r1=32840&r2=32841&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Fri Feb 19 10:05:44 2010
@@ -1,5 +1,13 @@
 [buildout]
-extends = ../profiles/official.cfg
+extends =
+  ../profiles/versions.cfg
+  ../profiles/software-definition.cfg
+  ../profiles/common.cfg
+  ../instance-profiles/mysql.cfg
+  ../instance-profiles/oood.cfg
+  ../instance-profiles/supervisor.cfg
+  ../instance-profiles/zope.cfg
+
 parts =
   mysql-instance
   oood-instance

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=32841&r1=32840&r2=32841&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Fri Feb 19 10:05:44 2010
@@ -1,10 +1,8 @@
 [buildout]
 extends =
-  ../instance-profiles/mysql.cfg
-  ../instance-profiles/oood.cfg
-  ../instance-profiles/supervisor.cfg
-  ../instance-profiles/zope.cfg
   ../profiles/versions.cfg
+  ../profiles/software-definition.cfg
+  ../profiles/common.cfg
   ../software-profiles/apache.cfg
   ../software-profiles/erp5.cfg
   ../software-profiles/flare.cfg
@@ -19,14 +17,6 @@
   ../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
-log-directory = ${:var-directory}/log
-data-bin-directory = ${:var-directory}/bin
-
-eggs-directory = ${software_definition:software_home}/eggs
-develop-eggs-directory = ${software_definition:software_home}/develop-eggs
 
 python = software_definition
 versions = versions
@@ -65,25 +55,5 @@
   echo "Required header files: ${requirements:development}"
 update-command = ${:command}
 
-[create-directories]
-recipe = plone.recipe.command
-command =
-  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}
-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}
-products-erp5 = ${:software_home}/parts/products-erp5
-products-erp5-development = ${:software_home}/parts/products-development-erp5
-products-deps = ${:software_home}/parts/products-deps
-products-other = ${:software_home}/parts/products-other
-products-cmf15 = ${:software_home}/parts/cmf15
-bt5-erp5 = ${:software_home}/parts/bt5-erp5
-

Added: erp5/trunk/buildout/profiles/software-definition.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/software-definition.cfg?rev=32841&view=auto
==============================================================================
--- erp5/trunk/buildout/profiles/software-definition.cfg (added)
+++ erp5/trunk/buildout/profiles/software-definition.cfg [utf8] Fri Feb 19 10:05:44 2010
@@ -1,0 +1,22 @@
+[buildout]
+var-directory = ${:directory}/var
+etc-directory = ${:var-directory}/etc
+log-directory = ${:var-directory}/log
+data-bin-directory = ${:var-directory}/bin
+
+eggs-directory = ${software_definition:software_home}/eggs
+develop-eggs-directory = ${software_definition:software_home}/develop-eggs
+
+[software_definition]
+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/python2.4/bin/python2.4
+products-erp5 = ${:software_home}/parts/products-erp5
+products-erp5-development = ${:software_home}/parts/products-development-erp5
+products-deps = ${:software_home}/parts/products-deps
+products-other = ${:software_home}/parts/products-other
+products-cmf15 = ${:software_home}/parts/cmf15
+bt5-erp5 = ${:software_home}/parts/bt5-erp5
+

Modified: erp5/trunk/buildout/software-profiles/openoffice-bin.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/openoffice-bin.cfg?rev=32841&r1=32840&r2=32841&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/openoffice-bin.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/openoffice-bin.cfg [utf8] Fri Feb 19 10:05:44 2010
@@ -1,11 +1,6 @@
 [buildout]
 parts =
   openoffice-bin
-
-[configuration]
-openoffice_python = ${software_definition:openoffice_software}/basis-link/program/python.bin
-openoffice_program = ${software_definition:openoffice_software}/program
-openoffice_uno = ${software_definition:openoffice_software}/basis-link/program/
 
 [openoffice-bin]
 recipe = z3c.recipe.openoffice