From 84f188003fe77b2c48f43ba5786e5e6eee750fd4 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Tue, 16 Nov 2010 15:06:11 +0000 Subject: [PATCH] Always uses '&&' to separate multiple commands when using plone.recipe.command, or the recipe will only check the exit status of the last command. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40305 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/boost-lib.cfg | 8 ++++---- buildout/software-profiles/erp5-2.12.cfg | 10 +++++----- buildout/software-profiles/pysvn-python.cfg | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/buildout/software-profiles/boost-lib.cfg b/buildout/software-profiles/boost-lib.cfg index 40ab6ed1bc..c530e98975 100644 --- a/buildout/software-profiles/boost-lib.cfg +++ b/buildout/software-profiles/boost-lib.cfg @@ -15,8 +15,8 @@ destination = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_} stop-on-error = true command = - rm -fr ${:destination} - mkdir -p ${:destination} - cd ${:source} - ./bootstrap.sh --prefix=${:location} + rm -fr ${:destination} && + mkdir -p ${:destination} && + cd ${:source} && + ./bootstrap.sh --prefix=${:location} && ./bjam install diff --git a/buildout/software-profiles/erp5-2.12.cfg b/buildout/software-profiles/erp5-2.12.cfg index a434b184fa..cd04914966 100644 --- a/buildout/software-profiles/erp5-2.12.cfg +++ b/buildout/software-profiles/erp5-2.12.cfg @@ -32,8 +32,8 @@ recipe = plone.recipe.command # reference itools-download:destination instead of itools:source to trigger its # execution command = - cd ${itools-download:destination} - ${python2.6:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib + cd ${itools-download:destination} && + ${python2.6:executable} setup.py build_ext -L ${glib:location}/lib -I ${glib:location}/include/glib-2.0:${glib:location}/lib/glib-2.0/include -R ${glib:location}/lib && ${python2.6:executable} setup.py install_lib -d ${itools:lib} update-command = ${:command} @@ -50,11 +50,11 @@ svn_param =--trust-server-cert --non-interactive location = ${buildout:parts-directory}/${:_buildout_section_name_} stop-on-error = true command = - ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile + ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile && ${git:location}/bin/git clone git://git.hforge.org/Localizer.git ${:location}/Localizer update-command = - ${subversion:location}/bin/svn up ${:svn_param} ${:location}/ExtFile - cd ${:location}/Localizer + ${subversion:location}/bin/svn checkout ${:svn_param} https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile && + cd ${:location}/Localizer && ${git:location}/bin/git pull [products] diff --git a/buildout/software-profiles/pysvn-python.cfg b/buildout/software-profiles/pysvn-python.cfg index 9c6c555128..319d7434fb 100644 --- a/buildout/software-profiles/pysvn-python.cfg +++ b/buildout/software-profiles/pysvn-python.cfg @@ -18,10 +18,10 @@ recipe = plone.recipe.command stop-on-error = true location = ${buildout:parts-directory}/${:_buildout_section_name_} command = - cd ${pysvn-python-download:location} - ${buildout:executable} setup.py egg_info - cd Source - ${buildout:executable} setup.py configure --svn-inc-dir=${subversion:location}/include/subversion-1/ --apr-inc-dir=${apache:location}/include/ --svn-lib-dir=${subversion:location}/lib/ --apr-lib-dir=${apache:location}/lib/ - make clean - make LDLIBS="-L${subversion:location}/lib -Wl,--rpath -Wl,${subversion:location}/lib -L${openssl:location}/lib -L/lib64 -Wl,--rpath -Wl,${openssl:location}/lib -L${libexpat:location}/lib -Wl,--rpath -Wl,${libexpat:location}/lib -lsvn_client-1 -lsvn_diff-1 -lsvn_repos-1 -lcom_err -lresolv -lexpat -lneon -lssl" + cd ${pysvn-python-download:location} && + ${buildout:executable} setup.py egg_info && + cd Source && + ${buildout:executable} setup.py configure --svn-inc-dir=${subversion:location}/include/subversion-1/ --apr-inc-dir=${apache:location}/include/ --svn-lib-dir=${subversion:location}/lib/ --apr-lib-dir=${apache:location}/lib/ && + make clean && + make LDLIBS="-L${subversion:location}/lib -Wl,--rpath -Wl,${subversion:location}/lib -L${openssl:location}/lib -L/lib64 -Wl,--rpath -Wl,${openssl:location}/lib -L${libexpat:location}/lib -Wl,--rpath -Wl,${libexpat:location}/lib -lsvn_client-1 -lsvn_diff-1 -lsvn_repos-1 -lcom_err -lresolv -lexpat -lneon -lssl" && exit 1 -- 2.30.9