[Erp5-report] r40305 romain - /erp5/trunk/buildout/software-profiles/

[nobody at svn.erp5.org]

Author: romain
Date: Tue Nov 16 16:06:11 2010
New Revision: 40305

URL: http://svn.erp5.org?rev=40305&view=rev
Log:
Always uses '&&' to separate multiple commands when using plone.recipe.command,
or the recipe will only check the exit status of the last command.

Modified:
    erp5/trunk/buildout/software-profiles/boost-lib.cfg
    erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
    erp5/trunk/buildout/software-profiles/pysvn-python.cfg

Modified: erp5/trunk/buildout/software-profiles/boost-lib.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/boost-lib.cfg?rev=40305&r1=40304&r2=40305&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/boost-lib.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/boost-lib.cfg [utf8] Tue Nov 16 16:06:11 2010
@@ -15,8 +15,8 @@ destination = ${buildout:parts-directory
 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

Modified: erp5/trunk/buildout/software-profiles/erp5-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/erp5-2.12.cfg?rev=40305&r1=40304&r2=40305&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/erp5-2.12.cfg [utf8] Tue Nov 16 16:06:11 2010
@@ -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-int
 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]

Modified: erp5/trunk/buildout/software-profiles/pysvn-python.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/pysvn-python.cfg?rev=40305&r1=40304&r2=40305&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/pysvn-python.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/pysvn-python.cfg [utf8] Tue Nov 16 16:06:11 2010
@@ -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