From 0920c79c12d99e09c841724592c766ac306cdc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 19 Feb 2010 09:05:44 +0000 Subject: [PATCH] - 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. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32841 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/instance-profiles/oood.cfg | 3 ++ buildout/profiles/common.cfg | 11 ++++++ buildout/profiles/deployment.cfg | 10 +++++- buildout/profiles/official.cfg | 34 ++----------------- buildout/profiles/software-definition.cfg | 22 ++++++++++++ buildout/software-profiles/openoffice-bin.cfg | 5 --- 6 files changed, 47 insertions(+), 38 deletions(-) create mode 100644 buildout/profiles/common.cfg create mode 100644 buildout/profiles/software-definition.cfg diff --git a/buildout/instance-profiles/oood.cfg b/buildout/instance-profiles/oood.cfg index a4f67fa8a3..0a0271c286 100644 --- a/buildout/instance-profiles/oood.cfg +++ b/buildout/instance-profiles/oood.cfg @@ -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 diff --git a/buildout/profiles/common.cfg b/buildout/profiles/common.cfg new file mode 100644 index 0000000000..4d28343f79 --- /dev/null +++ b/buildout/profiles/common.cfg @@ -0,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} + + diff --git a/buildout/profiles/deployment.cfg b/buildout/profiles/deployment.cfg index 3662f38ad0..32340a56dc 100644 --- a/buildout/profiles/deployment.cfg +++ b/buildout/profiles/deployment.cfg @@ -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 diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg index 3fcc5aa487..c3e3f98925 100644 --- a/buildout/profiles/official.cfg +++ b/buildout/profiles/official.cfg @@ -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 @@ -20,14 +18,6 @@ extends = ../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 find-links = @@ -65,25 +55,5 @@ command = 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 - diff --git a/buildout/profiles/software-definition.cfg b/buildout/profiles/software-definition.cfg new file mode 100644 index 0000000000..48d962f4d5 --- /dev/null +++ b/buildout/profiles/software-definition.cfg @@ -0,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 + diff --git a/buildout/software-profiles/openoffice-bin.cfg b/buildout/software-profiles/openoffice-bin.cfg index 09e47374f1..a8608092b2 100644 --- a/buildout/software-profiles/openoffice-bin.cfg +++ b/buildout/software-profiles/openoffice-bin.cfg @@ -2,11 +2,6 @@ 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 install-pyuno-egg = no -- 2.30.9