Commit 3893140a authored by Łukasz Nowak's avatar Łukasz Nowak

- use everywhere software_definition:software_home as reference to

   provided software and drop buildout:software_home


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40998 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 07ef4156
...@@ -17,7 +17,7 @@ bt5-path = ...@@ -17,7 +17,7 @@ bt5-path =
erp5_sql_connection_string = ${:mysql_database_name}@${:mysql_host}:${:mysql_port} ${:mysql_user} ${:mysql_password} erp5_sql_connection_string = ${:mysql_database_name}@${:mysql_host}:${:mysql_port} ${:mysql_user} ${:mysql_password}
zope_conf_template = zope_conf_template =
${buildout:software_home}/templates/default-erp5-standalone-zope-2.12.conf.in ${software_definition:software_home}/templates/default-erp5-standalone-zope-2.12.conf.in
portal_id = erp5 portal_id = erp5
force-zodb-update = false force-zodb-update = false
......
...@@ -11,7 +11,7 @@ extends = links.cfg ...@@ -11,7 +11,7 @@ extends = links.cfg
# instances. It should probably be moved to a .cfg file inside # instances. It should probably be moved to a .cfg file inside
# "instance-profiles" # "instance-profiles"
pkgname = itools-0.50.8 pkgname = itools-0.50.8
location = ${buildout:software_home}/parts/itools location = ${software_definition:software_home}/parts/itools
lib = ${:location}/lib lib = ${:location}/lib
source = ${:location}/src source = ${:location}/src
...@@ -28,11 +28,10 @@ update-command = ${:command} ...@@ -28,11 +28,10 @@ update-command = ${:command}
recipe = collective.recipe.template recipe = collective.recipe.template
input = inline: input = inline:
[buildout] [buildout]
software_home = ${buildout:software_home}
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
[software_definition] [software_definition]
software_home = ${buildout:software_home} software_home = ${software_definition:software_home}
mysql_software = ${software_definition:mysql_software} mysql_software = ${software_definition:mysql_software}
output = ${buildout:software_home}/instance-profiles/software-home.inc output = ${buildout:directory}/instance-profiles/software-home.inc
[buildout] [buildout]
software_home = ${:directory}
extends = extends =
../profiles/versions-2.12.cfg ../profiles/versions-2.12.cfg
../profiles/software-definition.cfg ../profiles/software-definition.cfg
...@@ -83,4 +81,4 @@ version = 1 ...@@ -83,4 +81,4 @@ version = 1
section = python2.6 section = python2.6
[software_definition] [software_definition]
software_home = ${buildout:software_home} software_home = ${buildout:directory}
...@@ -83,7 +83,7 @@ parts = ...@@ -83,7 +83,7 @@ parts =
ipaex-fonts ipaex-fonts
[software_definition] [software_definition]
software_home = ${buildout:software_home} software_home = ${buildout:directory}
# as mysql-python part, which uses mysql-python-env is not depending directly # as mysql-python part, which uses mysql-python-env is not depending directly
# on mysql-tritonn-5.0 part, but official buildout shall provide whole software # on mysql-tritonn-5.0 part, but official buildout shall provide whole software
# set dependency here # set dependency here
......
...@@ -41,5 +41,5 @@ eggs = ...@@ -41,5 +41,5 @@ eggs =
cloudooo cloudooo
[software_definition] [software_definition]
software_home = ${buildout:software_home} software_home = ${buildout:directory}
executable = ${python2.6:executable} executable = ${python2.6:executable}
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