Commit 0920c79c authored by Łukasz Nowak's avatar Łukasz Nowak

- 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
parent e2cf04f0
No related merge requests found
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
parts = oood-instance parts = oood-instance
[configuration] [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_conf_file = ${buildout:etc-directory}/oood.conf
oood_log_file = ${buildout:log-directory}/oood.log oood_log_file = ${buildout:log-directory}/oood.log
oood_run = ${buildout:var-directory}/oood oood_run = ${buildout:var-directory}/oood
......
[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}
[buildout] [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 = parts =
mysql-instance mysql-instance
oood-instance oood-instance
......
[buildout] [buildout]
extends = extends =
../instance-profiles/mysql.cfg
../instance-profiles/oood.cfg
../instance-profiles/supervisor.cfg
../instance-profiles/zope.cfg
../profiles/versions.cfg ../profiles/versions.cfg
../profiles/software-definition.cfg
../profiles/common.cfg
../software-profiles/apache.cfg ../software-profiles/apache.cfg
../software-profiles/erp5.cfg ../software-profiles/erp5.cfg
../software-profiles/flare.cfg ../software-profiles/flare.cfg
...@@ -20,14 +18,6 @@ extends = ...@@ -20,14 +18,6 @@ extends =
../software-profiles/varnish.cfg ../software-profiles/varnish.cfg
../software-profiles/zope-2.8.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 python = software_definition
versions = versions versions = versions
find-links = find-links =
...@@ -65,25 +55,5 @@ command = ...@@ -65,25 +55,5 @@ command =
echo "Required header files: ${requirements:development}" echo "Required header files: ${requirements:development}"
update-command = ${:command} 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_definition]
software_home = ${buildout:directory} 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
[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
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
parts = parts =
openoffice-bin 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] [openoffice-bin]
recipe = z3c.recipe.openoffice recipe = z3c.recipe.openoffice
install-pyuno-egg = no install-pyuno-egg = no
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment