Commit 84f18800 authored by Romain Courteaud's avatar Romain Courteaud

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
parent c807cdaa
......@@ -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
......@@ -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]
......
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment