diff --git a/buildout/profiles/common.cfg b/buildout/profiles/common.cfg index 39329d9d85ccb52e1341aa045fc59933786328a4..882083684fbeb38414cef7b1e5cf0ebc6770ad66 100644 --- a/buildout/profiles/common.cfg +++ b/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: diff --git a/buildout/profiles/official-2.12.cfg b/buildout/profiles/official-2.12.cfg index c28b5a8e3f422afa46854019b486bef849f8b9ec..9849218c123836fb6f34d4b4d6076547fd1568ad 100644 --- a/buildout/profiles/official-2.12.cfg +++ b/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 diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg index f52b6b363343a74337032731386064164ae3e6a9..1329122b1836cd017501ba68e543c940c59c08ad 100644 --- a/buildout/profiles/official.cfg +++ b/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 diff --git a/buildout/profiles/versions-common.cfg b/buildout/profiles/versions-common.cfg index 6d258f21b49f705035ca77bd95440665787e5c00..d9d1cdc6fa31caf877d4c5c2c3db461ff2acaad7 100644 --- a/buildout/profiles/versions-common.cfg +++ b/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 diff --git a/buildout/software-profiles/erp5-2.12.cfg b/buildout/software-profiles/erp5-2.12.cfg index 027dbb0b3e78bf18c0f0a7042435b8b5b3e48865..cbed581809acdd3d091d368875e8161fd468e786 100644 --- a/buildout/software-profiles/erp5-2.12.cfg +++ b/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 = diff --git a/buildout/software-profiles/products-erp5.cfg b/buildout/software-profiles/products-erp5.cfg new file mode 100644 index 0000000000000000000000000000000000000000..47c208d449c367ae322468b800f48fa4bcd7f762 --- /dev/null +++ b/buildout/software-profiles/products-erp5.cfg @@ -0,0 +1,57 @@ +[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