[Erp5-report] r33027 luke - in /erp5/trunk/buildout: instance-profiles/ local-eggs/erp5.rec...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Feb 23 14:11:51 CET 2010
Author: luke
Date: Tue Feb 23 14:11:50 2010
New Revision: 33027
URL: http://svn.erp5.org?rev=33027&view=rev
Log:
- do magic to prepend in product declaration with 'products' in standaloneinstance recipe
- update profile using products directive with this recipe
Modified:
erp5/trunk/buildout/instance-profiles/zope.cfg
erp5/trunk/buildout/local-eggs/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py
erp5/trunk/buildout/profiles/development.cfg
erp5/trunk/buildout/templates/default-erp5-standalone-zope.conf.in
Modified: erp5/trunk/buildout/instance-profiles/zope.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/zope.cfg?rev=33027&r1=33026&r2=33027&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/zope.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/zope.cfg [utf8] Tue Feb 23 14:11:50 2010
@@ -26,10 +26,10 @@
# instancehome and http-address have to be defined
# User modifable keys:
products =
- products ${software_definition:cmf15}
- products ${software_definition:products-deps}
- products ${software_definition:products-erp5}
- products ${software_definition:products-other}/Products
+ ${software_definition:cmf15}
+ ${software_definition:products-deps}
+ ${software_definition:products-erp5}
+ ${software_definition:products-other}/Products
environment =
debug-mode = off
ip-address = 0.0.0.0
Modified: erp5/trunk/buildout/local-eggs/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py
URL: http://svn.erp5.org/erp5/trunk/buildout/local-eggs/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py?rev=33027&r1=33026&r2=33027&view=diff
==============================================================================
--- erp5/trunk/buildout/local-eggs/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] (original)
+++ erp5/trunk/buildout/local-eggs/erp5.recipe.standaloneinstance/src/erp5/recipe/standaloneinstance/__init__.py [utf8] Tue Feb 23 14:11:50 2010
@@ -136,7 +136,16 @@
file(self.options['zope_conf_template'].strip()).readlines()
)
template = WithMinusTemplate(template_input_data)
- result = template.substitute(self.options.copy())
+ # make prepend products with 'products'
+ options_dict = self.options.copy()
+ if 'products' in options_dict:
+ prefixed_products = []
+ for product in options_dict['products'].split('\n'):
+ product = product.strip()
+ if product:
+ prefixed_products.append('products %s' % product)
+ options_dict['products'] = '\n'.join(prefixed_products)
+ result = template.substitute(options_dict)
zope_conf_path = os.path.join(location, 'etc', 'zope.conf')
file(zope_conf_path, 'w').write(result)
Modified: erp5/trunk/buildout/profiles/development.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/development.cfg?rev=33027&r1=33026&r2=33027&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/development.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/development.cfg [utf8] Tue Feb 23 14:11:50 2010
@@ -45,12 +45,12 @@
# until we will have more control over products we need to redefine to insert
# local products to be able to override
products =
- products ${:instancehome}/Products/
- products ${cmf15:location}
- products ${products-deps:location}
- products ${products-erp5-development:location}
- products ${products-erp5:location}
- products ${products-other:location}/Products
+ ${:instancehome}/Products/
+ ${cmf15:location}
+ ${products-deps:location}
+ ${products-erp5-development:location}
+ ${products-erp5:location}
+ ${products-other:location}/Products
# zope.conf template part ENDS
eggs +=
Modified: erp5/trunk/buildout/templates/default-erp5-standalone-zope.conf.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/default-erp5-standalone-zope.conf.in?rev=33027&r1=33026&r2=33027&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/default-erp5-standalone-zope.conf.in [utf8] (original)
+++ erp5/trunk/buildout/templates/default-erp5-standalone-zope.conf.in [utf8] Tue Feb 23 14:11:50 2010
@@ -47,8 +47,8 @@
# to it here).
# In profile use:
-# products X
-# products Y
+# ProductLocationX
+# ProductLocationY
${products}
More information about the Erp5-report
mailing list