[Erp5-report] r32806 luke - in /erp5/trunk/buildout: instance-profiles/ profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Thu Feb 18 18:01:29 2010
New Revision: 32806

URL: http://svn.erp5.org?rev=32806&view=rev
Log:
 - in instance profile global software definition shall be used

Modified:
    erp5/trunk/buildout/instance-profiles/zope.cfg
    erp5/trunk/buildout/profiles/official.cfg

Modified: erp5/trunk/buildout/instance-profiles/zope.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/zope.cfg?rev=32806&r1=32805&r2=32806&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/zope.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/zope.cfg [utf8] Thu Feb 18 18:01:29 2010
@@ -19,17 +19,17 @@
   ${buildout:directory}/templates/default-erp5-standalone-zope.conf.in
 
 portal_id = erp5
-bt5-path = ${bt5-erp5:location}
+bt5-path = ${software_definition:bt5-erp5}
 bt5 =
 force-zodb-update = false
 # zope.conf template part BEGIN
 # instancehome and http-address have to be defined
 # User modifable keys:
 products =
-  products ${cmf15:location}/CMF/
-  products ${products-deps:location}
-  products ${products-erp5:location}
-  products ${products-other:location}
+  products ${software_definition:cmf15}/CMF/
+  products ${software_definition:products-deps}
+  products ${software_definition:products-erp5}
+  products ${software_definition:products-other}
 environment =
 debug-mode = off
 ip-address = 0.0.0.0
@@ -97,4 +97,4 @@
 recipe = erp5.recipe.genbt5list
 bt5_base = ${bt5-erp5:location}
 bt5_urls = ${bt5-erp5:urls}
-genbt5list = ${products-erp5:location}/ERP5/bin/genbt5list
+genbt5list = ${software_definition:products-erp5}/ERP5/bin/genbt5list

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=32806&r1=32805&r2=32806&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Thu Feb 18 18:01:29 2010
@@ -80,3 +80,10 @@
 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}/products-erp5
+products-erp5-development = ${:software_home}/products-development-erp5
+products-deps = ${:software_home}/products-deps
+products-other = ${:software_home}/products-other
+products-cmf15 = ${:software_home}/products-cmf15
+bt5-erp5 = ${:software_home}/bt5-erp5
+