[Erp5-report] r36826 rafael - in /erp5/trunk/buildout/profiles: official-2.12.cfg official.cfg

[nobody at svn.erp5.org]

Author: rafael
Date: Fri Jul  2 22:35:41 2010
New Revision: 36826

URL: http://svn.erp5.org?rev=36826&view=rev
Log:
Reduce the diff between files. Creates software-home.inc when use zope 2.8 setup also.

Modified:
    erp5/trunk/buildout/profiles/official-2.12.cfg
    erp5/trunk/buildout/profiles/official.cfg

Modified: erp5/trunk/buildout/profiles/official-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official-2.12.cfg?rev=36826&r1=36825&r2=36826&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official-2.12.cfg [utf8] Fri Jul  2 22:35:41 2010
@@ -25,8 +25,8 @@ extends =
   ../software-profiles/python-2.6.cfg
   ../software-profiles/rdiff-backup.cfg
   ../software-profiles/w3m.cfg
-  ../software-profiles/xpdf.cfg
   ../software-profiles/varnish.cfg
+  ../software-profiles/xpdf.cfg
   ../profiles/common.cfg
 
 python = software_definition
@@ -44,11 +44,11 @@ parts =
   rdiff-backup
   ocropus
   haproxy
+  varnish
   flare
   w3m
   xpdf
   imagemagick
-  varnish
   mysql-tritonn-5.0
   mysql-python
   products-erp5

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=36826&r1=36825&r2=36826&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Fri Jul  2 22:35:41 2010
@@ -57,6 +57,7 @@ parts =
   products-other
   openoffice-bin
   oood
+  software_home
 
 [show-requirements]
 recipe = plone.recipe.command
@@ -73,3 +74,9 @@ software_home = ${buildout:software_home
 # Thanks to this it is possible to build mysql-python part in own environment
 # with local mysql, but by default buildout mysql will be used.
 mysql_software = ${mysql-tritonn-5.0:location}
+
+[software_home]
+recipe = collective.recipe.template
+input = ${buildout:software_home}/templates/software-home.inc.in
+output = ${buildout:software_home}/instance-profiles/software-home.inc
+