diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index ef7d4ff92de6b4dff6b55d7b3ccbf505f39ac172..cb8aaeeda0c37d2de9145ce6e54b47a2df479fbb 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -8,6 +8,7 @@ versions = versions # Local development develop = ${:parts-directory}/slapos.cookbook-repository + ${:parts-directory}/vifib parts += # Local development slapos.cookbook-repository @@ -16,6 +17,8 @@ parts += slapos.recipe.template-python2.6 # Create instance template template + vifib + check-slapos.core # XXX: Workaround of SlapOS limitation # Unzippig of eggs is required, as SlapOS do not yet provide nicely working @@ -32,6 +35,12 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} command = ${git:location}/bin/git clone --branch ${:branch} --quiet http://git.erp5.org/repos/slapos.git ${:location} && if [ -n "${:revision}" ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi update-command = cd ${:location} && GIT_COMMITTER_EMAIL=nobody@example.com GIT_AUTHOR_NAME=Nobody GIT_AUTHOR_EMAIL=nobody@example.com ${git:location}/bin/git pull --quiet && if [ -n "${:revision}" ]; then echo "Resetting." ; cd ${:location} && ${git:location}/bin/git reset --hard ${:revision} ; fi +[check-slapos.core] +recipe = plone.recipe.command +stop-on-error = true +update-command = ${:command} +command = grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link + [check-recipe] recipe = plone.recipe.command stop-on-error = true diff --git a/software/vifib/software.cfg b/software/vifib/software.cfg deleted file mode 100644 index 310ce84a7490a7b2c7e2d70972e361f296133042..0000000000000000000000000000000000000000 --- a/software/vifib/software.cfg +++ /dev/null @@ -1,56 +0,0 @@ -[buildout] -extends = - ../erp5/software.cfg - -parts += - vifib - check-slapos.core - -develop += - ${:parts-directory}/vifib - -[check-slapos.core] -recipe = plone.recipe.command -stop-on-error = true -update-command = ${:command} -command = grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link - -[eggs] -dummy = - ${vifib:location} -eggs += - suds - slapos.core - -[instance-recipe] -module = vifib - -# Additional Configuration -configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_vifib - -[erp5_repository_list] -repository_id_list += vifib/master - -[erp5] -branch = interaction-drop - -[vifib] -<= erp5 -branch = master -repository = http://git.erp5.org/repos/slapos.core.git -revision = - -[local-bt5-repository] -# XXX: workaround for zc.buildout bug, as list += ends up with adding new entry -# after newline -list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${vifib:location}/master/bt5 - -[products] -# XXX: Lack of eggification workaround -# list of products, possible to extend, it is passed in reversed way -# to allow overriding during extending profile -list = ${products-deps:location} ${erp5:location}/product ${vifib:location}/master/product - -[versions] -suds = 0.4 -slapos.core = diff --git a/stack/erp5.cfg b/stack/erp5.cfg index 5b2f5d6fa1199c20b5997af414c4f7bc3eb4e64a..3337daff4e6f3abb5d346d49239a9b924d535d02 100644 --- a/stack/erp5.cfg +++ b/stack/erp5.cfg @@ -165,7 +165,7 @@ list = ${local-bt5-repository:list} [local-bt5-repository] # Same as bt5-repository, but only local repository. # Used to generate bt5lists. -list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap +list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${vifib:location}/master/bt5 [genbt5list] recipe = plone.recipe.command @@ -227,7 +227,7 @@ command = ${git:location}/bin/git clone --quiet git://git.hforge.org/Localizer.git ${:location}/Localizer && cd ${:location}/Localizer && ${git:location}/bin/git reset --quiet --hard dacb6ba0ae559cd9bdb8822812d24a12a21e9e37 [erp5_repository_list] -repository_id_list = erp5 +repository_id_list = erp5 vifib/master [erp5] # Recipe zerokspot.recipe.git is disabled, as is not possible to change its @@ -238,15 +238,21 @@ recipe = plone.recipe.command location = ${buildout:parts-directory}/${:_buildout_section_name_} stop-on-error = true repository = http://git.erp5.org/repos/erp5.git -branch = master +branch = interaction-drop revision = command = ${git:location}/bin/git clone --quiet --branch ${:branch} ${:repository} ${:location} && if [ -n "${:revision}" ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi update-command = cd ${:location} && GIT_COMMITTER_EMAIL=nobody@example.com GIT_AUTHOR_NAME=Nobody GIT_AUTHOR_EMAIL=nobody@example.com ${git:location}/bin/git pull && if [ -n "${:revision}" ]; then echo "Resetting." ; cd ${:location} && ${git:location}/bin/git reset --hard ${:revision} ; fi +[vifib] +<= erp5 +branch = master +repository = http://git.erp5.org/repos/slapos.core.git +revision = + [products] # XXX: ERP5 related products are not defined as python distributions, so it is # required to configure them in declarative manner -list = +list = ${products-deps:location} ${erp5:location}/product ${vifib:location}/master/product [fix-products-paths] recipe = plone.recipe.command @@ -317,6 +323,8 @@ initialization = [eggs] recipe = zc.recipe.egg python = python2.6 +dummy = + ${vifib:location} eggs = ${mysql-python:egg} ${lxml-python:egg} @@ -384,6 +392,8 @@ eggs = # Products.PortalTransforms # Dependency for our fork of PortalTransforms StructuredText + suds + slapos.core # parameterizing the version of the generated python interpreter name by the # python section version causes dependency between this egg section and the @@ -547,7 +557,7 @@ python-memcached = 1.47 restkit = 4.1.2 rtjp-eventlet = 0.3.2 setuptools = 0.6c12dev-r88846 -slapos.core = 0.24 +slapos.core = slapos.recipe.build = 0.7 slapos.recipe.template = 2.3 slapos.toolbox = 0.23 @@ -561,3 +571,4 @@ uuid = 1.30 validictory = 0.8.3 xml-marshaller = 0.9.7 xupdate-processor = 0.4 +suds = 0.4