[Erp5-report] r41450 luke - in /erp5/trunk/buildout: profiles/ software-profiles/

[nobody at svn.erp5.org]

Author: luke
Date: Wed Dec 15 11:16:14 2010
New Revision: 41450

URL: http://svn.erp5.org?rev=41450&view=rev
Log:
 - put common list of precache eggs in software-common and add
   selectively different eggs in 2.8 and 2.12 flavours

Modified:
    erp5/trunk/buildout/profiles/software-common.cfg
    erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
    erp5/trunk/buildout/software-profiles/erp5.cfg

Modified: erp5/trunk/buildout/profiles/software-common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/software-common.cfg?rev=41450&r1=41449&r2=41450&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/software-common.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/software-common.cfg [utf8] Wed Dec 15 11:16:14 2010
@@ -7,3 +7,26 @@ extensions =
 
 dump-picked-versions-file = dumped-versions.cfg
 overwrite-picked-versions-file = true
+
+[precache-eggs]
+# recipe to populate the egg cache during software-home build, so instances can
+# run in offline mode. Hence, no scripts
+recipe = zc.recipe.egg
+scripts =
+eggs =
+  cloudooo
+  collective.recipe.supervisor
+  collective.recipe.template
+  erp5.conflictresolver
+  erp5.recipe.cloudoooinstance
+  erp5.recipe.genbt5list
+  erp5.recipe.memcachedserver
+  erp5.recipe.mysqldatabase
+  erp5.recipe.mysqlserver
+  erp5.recipe.ooodinstance
+  erp5.recipe.sphinxserver
+  erp5.recipe.testrunner
+  erp5.recipe.zope2instance
+  plone.recipe.command
+  supervisor
+  z3c.recipe.mkdir

Modified: erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5-2.12.cfg?rev=41450&r1=41449&r2=41450&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] Wed Dec 15 11:16:14 2010
@@ -132,31 +132,6 @@ scripts =
 	python=${:interpreter}
 	ipython=i${:interpreter}
 
-[precache-eggs]
-# recipe to populate the egg cache during software-home build, so instances can
-# run in offline mode. Hence, no scripts
-recipe = zc.recipe.egg
-scripts =
-eggs =
-  cloudooo
-  collective.recipe.supervisor
-  collective.recipe.template
-  erp5.conflictresolver
-  erp5.recipe.cloudoooinstance
-  erp5.recipe.genbt5list
-  erp5.recipe.memcachedserver
-  erp5.recipe.mysqldatabase
-  erp5.recipe.mysqlserver
-  erp5.recipe.ooodinstance
-  erp5.recipe.sphinxserver
-  erp5.recipe.testrunner
-  erp5.recipe.zope2instance
-  plone.recipe.command
-  plone.recipe.zeoserver
-  plone.recipe.zope2instance
-  supervisor
-  z3c.recipe.mkdir
-
 [erp5-zope2.12-template]
 # XXX: Template is downloaded to satisfy *bad* erp5.recipe.standaloneinstance
 recipe = hexagonit.recipe.download
@@ -165,6 +140,11 @@ filename = template.in
 download-only = true
 md5sum = c299a7d5b60f5929eacfa6e947213615
 
+[precache-eggs]
+eggs +=
+  plone.recipe.zope2instance
+  plone.recipe.zeoserver
+
 [omelette]
 # XXX don't use this part until this omelette bug is fixed:
 # https://bugs.launchpad.net/collective.buildout/+bug/553005

Modified: erp5/trunk/buildout/software-profiles/erp5.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5.cfg?rev=41450&r1=41449&r2=41450&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5.cfg [utf8] Wed Dec 15 11:16:14 2010
@@ -126,30 +126,6 @@ scripts =
         python=${:interpreter}
         ipython=i${:interpreter}
 
-[precache-eggs]
-# recipe to populate the egg cache during software-home build, so instances can
-# run in offline mode. Hence, no scripts
-recipe = zc.recipe.egg
-scripts =
-eggs =
-  cloudooo
-  collective.recipe.supervisor
-  collective.recipe.template
-  erp5.conflictresolver
-  erp5.recipe.cloudoooinstance
-  erp5.recipe.genbt5list
-  erp5.recipe.memcachedserver
-  erp5.recipe.mysqldatabase
-  erp5.recipe.mysqlserver
-  erp5.recipe.ooodinstance
-  erp5.recipe.sphinxserver
-  erp5.recipe.testrunner
-  erp5.recipe.zope2instance
-  plone.recipe.command
-  plone.recipe.zope2zeoserver
-  supervisor
-  z3c.recipe.mkdir
-
 [omelette]
 # XXX don't use this part until this omelette bug is fixed:
 # https://bugs.launchpad.net/collective.buildout/+bug/553005
@@ -157,3 +133,7 @@ recipe = collective.recipe.omelette
 eggs = ${eggs:eggs}
 packages =
       ${itools:lib} .
+
+[precache-eggs]
+eggs +=
+  plone.recipe.zope2zeoserver