- drop infrae.subversion for ERP5 products in 2.8 flavour and merge with 2.12

   flavour
 - use separate profile, as common is reused in instances, and shall not refer
   directly to built software, which is requirement for fetching products by
   using self provided subversion
 - support revision by using non empty HEAD keyword for svn


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40868 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/profiles/common.cfg

@@ -33,68 +33,6 @@ command =
   mkdir -p ${buildout:data-bin-directory}
 update-command = ${:command}
 
-[products-erp5-development]
-recipe = infrae.subversion
-revision = ${versions:erp5_products_revision}
-ignore_verification = true
-urls =
-    ${products-erp5:base}/ERP5Subversion/${:revision} ERP5Subversion
-
-[products-erp5-development-no-svn]
-recipe = hexagonit.recipe.download
-url = http://www.erp5.org/dists/snapshot/products/ERP5Subversion.tgz
-
-[products-erp5]
-recipe = infrae.subversion
-revision = ${versions:erp5_products_revision}
-base = https://svn.erp5.org/repos/public/erp5/trunk/products
-urls =
-    ${:base}/AGProjects/${:revision} AGProjects
-    ${:base}/CMFActivity/${:revision} CMFActivity
-    ${:base}/CMFCategory/${:revision} CMFCategory
-    ${:base}/ERP5/${:revision} ERP5
-    ${:base}/ERP5Catalog/${:revision} ERP5Catalog
-    ${:base}/ERP5Form/${:revision} ERP5Form
-    ${:base}/ERP5Legacy/${:revision} ERP5Legacy
-    ${:base}/ERP5OOo/${:revision} ERP5OOo
-    ${:base}/ERP5Security/${:revision} ERP5Security
-    ${:base}/ERP5SyncML/${:revision} ERP5SyncML
-    ${:base}/ERP5Type/${:revision} ERP5Type
-    ${:base}/ERP5Wizard/${:revision} ERP5Wizard
-    ${:base}/ERP5Workflow/${:revision} ERP5Workflow
-    ${:base}/Formulator/${:revision} Formulator
-    ${:base}/HBTreeFolder2/${:revision} HBTreeFolder2
-    ${:base}/MailTemplates/${:revision} MailTemplates
-    ${:base}/PortalTransforms/${:revision} PortalTransforms
-    ${:base}/TimerService/${:revision} TimerService
-    ${:base}/ZMySQLDA/${:revision} ZMySQLDA
-    ${:base}/ZMySQLDDA/${:revision} ZMySQLDDA
-    ${:base}/ZSQLCatalog/${:revision} ZSQLCatalog
-
-[products-erp5-no-svn]
-recipe = erp5.recipe.multidownload
-urls =
-  http://www.erp5.org/dists/snapshot/products/AGProjects.tgz
-  http://www.erp5.org/dists/snapshot/products/CMFActivity.tgz
-  http://www.erp5.org/dists/snapshot/products/CMFCategory.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5Catalog.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5Form.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5Legacy.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5OOo.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5Security.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5SyncML.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5Type.tgz
-  http://www.erp5.org/dists/snapshot/products/ERP5Workflow.tgz
-  http://www.erp5.org/dists/snapshot/products/Formulator.tgz
-  http://www.erp5.org/dists/snapshot/products/HBTreeFolder2.tgz
-  http://www.erp5.org/dists/snapshot/products/MailTemplates.tgz
-  http://www.erp5.org/dists/snapshot/products/PortalTransforms.tgz
-  http://www.erp5.org/dists/snapshot/products/TimerService.tgz
-  http://www.erp5.org/dists/snapshot/products/ZMySQLDA.tgz
-  http://www.erp5.org/dists/snapshot/products/ZMySQLDDA.tgz
-  http://www.erp5.org/dists/snapshot/products/ZSQLCatalog.tgz
-
 [software_home]
 recipe = collective.recipe.template
 input = inline:

buildout/profiles/official-2.12.cfg

@@ -6,6 +6,7 @@ extends =
   ../profiles/software-definition.cfg
   ../software-profiles/apache.cfg
   ../profiles/common.cfg
+  ../software-profiles/products-erp5.cfg
   ../software-profiles/erp5-2.12.cfg
   ../software-profiles/file.cfg
   ../software-profiles/garbage-collector.cfg

buildout/profiles/official.cfg

@@ -7,6 +7,7 @@ software_home = ${:directory}
 extends =
   ../profiles/versions.cfg
   ../profiles/software-definition.cfg
+  ../software-profiles/products-erp5.cfg
   ../software-profiles/apache.cfg
   ../software-profiles/erp5.cfg
   ../software-profiles/file.cfg

buildout/profiles/versions-common.cfg

@@ -3,7 +3,7 @@
 # XXX refactor parts shared with versions.cfg into a common file
 PyXML = 0.8.4
 erp5_bt5_revision = ${:erp5_products_revision}
-erp5_products_revision =
+erp5_products_revision = HEAD
 numpy = 1.3.0
 plone.recipe.zope2instance = 3.6
 # modified version that works fine for buildout installation

buildout/software-profiles/erp5-2.12.cfg

@@ -58,32 +58,6 @@ update-command =
   cd ${:location}/Localizer &&
   ${git:location}/bin/git pull --quiet
 
-[products-erp5]
-# Recipe infrae.subversion is using svn command under the hood, but there is
-# no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour
-# it is better to evaluate usage of provided subversion command
-recipe = plone.recipe.command
-svn_param =--trust-server-cert --non-interactive --quiet
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-update-command = ${:command}
-product_list = AGProjects CMFActivity CMFCategory ERP5 ERP5Catalog ERP5Form ERP5Legacy ERP5OOo ERP5Security ERP5SyncML ERP5Type ERP5Wizard ERP5Workflow Formulator HBTreeFolder2 MailTemplates PortalTransforms TimerService ZMySQLDA ZMySQLDDA ZSQLCatalog
-command =
-  for product in ${:product_list} ; do ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/products/$product ${:location}/$product || exit 1 ; done
-
-[products-erp5-development]
-# Recipe infrae.subversion is using svn command under the hood, but there is
-# no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour
-# it is better to evaluate usage of provided subversion command
-recipe = plone.recipe.command
-svn_param =--trust-server-cert --non-interactive --quiet
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-update-command = ${:command}
-product_list = ERP5Subversion
-command =
-  for product in ${:product_list} ; do ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/products/$product ${:location}/$product || exit 1 ; done
-
 [products]
 recipe = plone.recipe.command
 paths =

buildout/software-profiles/products-erp5.cfg

+[buildout]
+extends =
+  ../software-profiles/subversion.cfg
+/bin/bash: :w: command not found
+[products-erp5]
+# Recipe infrae.subversion is using svn command under the hood, but there is
+# no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour
+# it is better to evaluate usage of provided subversion command
+recipe = plone.recipe.command
+svn_param =--trust-server-cert --non-interactive --quiet --revision ${versions:erp5_products_revision}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+update-command = ${:command}
+product_list = AGProjects CMFActivity CMFCategory ERP5 ERP5Catalog ERP5Form ERP5Legacy ERP5OOo ERP5Security ERP5SyncML ERP5Type ERP5Wizard ERP5Workflow Formulator HBTreeFolder2 MailTemplates PortalTransforms TimerService ZMySQLDA ZMySQLDDA ZSQLCatalog
+command =
+  for product in ${:product_list} ; do ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/products/$product ${:location}/$product || exit 1 ; done
+
+[products-erp5-development]
+# Recipe infrae.subversion is using svn command under the hood, but there is
+# no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour
+# it is better to evaluate usage of provided subversion command
+recipe = plone.recipe.command
+svn_param =--trust-server-cert --non-interactive --quiet --revision ${versions:erp5_products_revision}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+update-command = ${:command}
+product_list = ERP5Subversion
+command =
+  for product in ${:product_list} ; do ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/products/$product ${:location}/$product || exit 1 ; done
+
+[products-erp5-development-no-svn]
+recipe = hexagonit.recipe.download
+url = http://www.erp5.org/dists/snapshot/products/ERP5Subversion.tgz
+
+[products-erp5-no-svn]
+recipe = erp5.recipe.multidownload
+urls =
+  http://www.erp5.org/dists/snapshot/products/AGProjects.tgz
+  http://www.erp5.org/dists/snapshot/products/CMFActivity.tgz
+  http://www.erp5.org/dists/snapshot/products/CMFCategory.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5Catalog.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5Form.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5Legacy.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5OOo.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5Security.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5SyncML.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5Type.tgz
+  http://www.erp5.org/dists/snapshot/products/ERP5Workflow.tgz
+  http://www.erp5.org/dists/snapshot/products/Formulator.tgz
+  http://www.erp5.org/dists/snapshot/products/HBTreeFolder2.tgz
+  http://www.erp5.org/dists/snapshot/products/MailTemplates.tgz
+  http://www.erp5.org/dists/snapshot/products/PortalTransforms.tgz
+  http://www.erp5.org/dists/snapshot/products/TimerService.tgz
+  http://www.erp5.org/dists/snapshot/products/ZMySQLDA.tgz
+  http://www.erp5.org/dists/snapshot/products/ZMySQLDDA.tgz
+  http://www.erp5.org/dists/snapshot/products/ZSQLCatalog.tgz