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

[nobody at svn.erp5.org]

Author: luke
Date: Wed Dec  1 18:37:22 2010
New Revision: 40998

URL: http://svn.erp5.org?rev=40998&view=rev
Log:
 - use everywhere software_definition:software_home as reference to
   provided software and drop buildout:software_home

Modified:
    erp5/trunk/buildout/instance-profiles/zope-2.12.cfg
    erp5/trunk/buildout/profiles/common.cfg
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/software-profiles/cloudooo.cfg

Modified: erp5/trunk/buildout/instance-profiles/zope-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/zope-2.12.cfg?rev=40998&r1=40997&r2=40998&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/zope-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/zope-2.12.cfg [utf8] Wed Dec  1 18:37:22 2010
@@ -17,7 +17,7 @@ bt5-path =
 erp5_sql_connection_string = ${:mysql_database_name}@${:mysql_host}:${:mysql_port} ${:mysql_user} ${:mysql_password}
 
 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
 force-zodb-update = false

Modified: erp5/trunk/buildout/profiles/common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/common.cfg?rev=40998&r1=40997&r2=40998&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/common.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/common.cfg [utf8] Wed Dec  1 18:37:22 2010
@@ -11,7 +11,7 @@ extends = links.cfg
 # instances. It should probably be moved to a .cfg file inside
 # "instance-profiles"
 pkgname = itools-0.50.8
-location = ${buildout:software_home}/parts/itools
+location = ${software_definition:software_home}/parts/itools
 lib = ${:location}/lib
 source = ${:location}/src
 
@@ -28,11 +28,10 @@ update-command = ${:command}
 recipe = collective.recipe.template
 input = inline:
   [buildout]
-  software_home = ${buildout:software_home}
   eggs-directory = ${buildout:eggs-directory}
   develop-eggs-directory = ${buildout:develop-eggs-directory}
 
   [software_definition]
-  software_home = ${buildout:software_home}
+  software_home = ${software_definition:software_home}
   mysql_software = ${software_definition:mysql_software}
-output = ${buildout:software_home}/instance-profiles/software-home.inc
+output = ${buildout:directory}/instance-profiles/software-home.inc

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=40998&r1=40997&r2=40998&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Wed Dec  1 18:37:22 2010
@@ -1,6 +1,4 @@
 [buildout]
-software_home = ${:directory}
-
 extends =
   ../profiles/versions-2.12.cfg
   ../profiles/software-definition.cfg
@@ -83,4 +81,4 @@ version = 1
 section = python2.6
 
 [software_definition]
-software_home = ${buildout:software_home}
+software_home = ${buildout:directory}

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=40998&r1=40997&r2=40998&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Wed Dec  1 18:37:22 2010
@@ -83,7 +83,7 @@ parts =
   ipaex-fonts
 
 [software_definition]
-software_home = ${buildout:software_home}
+software_home = ${buildout:directory}
 # 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
 # set dependency here

Modified: erp5/trunk/buildout/software-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/cloudooo.cfg?rev=40998&r1=40997&r2=40998&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/cloudooo.cfg [utf8] Wed Dec  1 18:37:22 2010
@@ -41,5 +41,5 @@ eggs =
   cloudooo
 
 [software_definition]
-software_home = ${buildout:software_home}
+software_home = ${buildout:directory}
 executable = ${python2.6:executable}