[Erp5-report] r45825 luke - in /erp5/trunk/software_release/erp5: instance.cfg software.cfg

[nobody at svn.erp5.org]

Author: luke
Date: Wed May  4 14:50:13 2011
New Revision: 45825

URL: http://svn.erp5.org?rev=45825&view=rev
Log:
Install TIDStorage products as disribution and generate required scripts.
Expose tidstorage provided scripts to instance.

Modified:
    erp5/trunk/software_release/erp5/instance.cfg
    erp5/trunk/software_release/erp5/software.cfg

Modified: erp5/trunk/software_release/erp5/instance.cfg
URL: http://svn.erp5.org/erp5/trunk/software_release/erp5/instance.cfg?rev=45825&r1=45824&r2=45825&view=diff
==============================================================================
--- erp5/trunk/software_release/erp5/instance.cfg [utf8] (original)
+++ erp5/trunk/software_release/erp5/instance.cfg [utf8] Wed May  4 14:50:13 2011
@@ -25,6 +25,8 @@ runTestSuite_binary = ${buildout:bin-dir
 runUnitTest_binary = ${buildout:bin-directory}/runUnitTest
 runzeo_binary = ${buildout:bin-directory}/runzeo
 runzope_binary = ${buildout:bin-directory}/runzope
+tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
+tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
 zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent
 
 # Expose TIDStorage location

Modified: erp5/trunk/software_release/erp5/software.cfg
URL: http://svn.erp5.org/erp5/trunk/software_release/erp5/software.cfg?rev=45825&r1=45824&r2=45825&view=diff
==============================================================================
--- erp5/trunk/software_release/erp5/software.cfg [utf8] (original)
+++ erp5/trunk/software_release/erp5/software.cfg [utf8] Wed May  4 14:50:13 2011
@@ -94,7 +94,6 @@ parts =
 
 # Zope products
   products-deps
-  products-tidstorage
   products-erp5
   products-erp5-development
 
@@ -112,7 +111,7 @@ name = slapos.recipe.erp5
 [products]
 # XXX: ERP5 related products are not defined as python distributions, so it is
 #      required to configure them in declarative manner
-list = ${products-deps:location} ${products-tidstorage:location} ${products-erp5:location} ${products-erp5-development:location}
+list = ${products-deps:location} ${products-erp5:location} ${products-erp5-development:location}
 
 [bootstrap2.6]
 python = python2.6
@@ -126,7 +125,7 @@ section = python2.7
 # Default template for erp5 instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 856af2e58e7b2cd54a2d611b848adf64
+md5sum = be9076f59a47dba75de64c0ffe3c31e7
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -160,19 +159,6 @@ update-command = ${:command}
 location = ${itools:location}
 stop-on-error = true
 
-[products-tidstorage]
-# 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 = TIDStorage
-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-deps]
 # Recipe minitage.recipe.fetch is disabled, as it uses PATH variable, but it
 # is not possible to change its environment to use localy delivered subversion
@@ -307,6 +293,7 @@ eggs =
   Products.DCWorkflowGraph
   Products.MimetypesRegistry
   Products.ExternalEditor
+  Products.TIDStorage
   Products.Zelenium
 
 # Currently forked in our repository
@@ -322,6 +309,8 @@ scripts =
   repozo
   runzope
   runzeo
+  tidstoraged
+  tidstorage_repozo
 
 extra-paths =
   ${itools:location}/lib