# HG changeset patch # User Simon Howkins <simonh@symbian.org> # Date 1247746311 -3600 # Node ID 792dd66af9a1c2cbc1a5aaf974d250195c323587 # Parent d64a45951a43538a12a642363a90d556feb555cd Small speed improvement (fingers crossed) for zipping up binaries. diff -r d64a45951a43 -r 792dd66af9a1 common/build.xml --- a/common/build.xml Thu Jul 16 11:33:56 2009 +0100 +++ b/common/build.xml Thu Jul 16 13:11:51 2009 +0100 @@ -597,37 +597,38 @@ <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/> <param name="zip.target.name" value="bin" /> </antcall--> - - <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log"> - <arg value="a"/> - <arg value="-tzip"/> - <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> - <arg value="-x!epoc32\tools"/> - <arg value="-x!epoc32\build"/> - <arg value="-x!epoc32\release\armv5"/> - <arg value="-x!epoc32\release\winscw"/> - <arg value="-xr!*.sym"/> - <arg value="${build.drive}/output/zips/binaries_epoc.zip"/> - <arg value="epoc32\"/> - </exec> - - <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw.log"> - <arg value="a"/> - <arg value="-tzip"/> - <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> - <arg value="-xr!*.sym"/> - <arg value="${build.drive}/output/zips/binaries_winscw.zip"/> - <arg value="epoc32\release\winscw\"/> - </exec> - - <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5.log"> - <arg value="a"/> - <arg value="-tzip"/> - <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> - <arg value="-xr!*.sym"/> - <arg value="${build.drive}/output/zips/binaries_armv5.zip"/> - <arg value="epoc32\release\armv5\"/> - </exec> + <parallel> + <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log"> + <arg value="a"/> + <arg value="-tzip"/> + <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> + <arg value="-x!epoc32\tools"/> + <arg value="-x!epoc32\build"/> + <arg value="-x!epoc32\release\armv5"/> + <arg value="-x!epoc32\release\winscw"/> + <arg value="-xr!*.sym"/> + <arg value="${build.drive}/output/zips/binaries_epoc.zip"/> + <arg value="epoc32\"/> + </exec> + + <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw.log"> + <arg value="a"/> + <arg value="-tzip"/> + <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> + <arg value="-xr!*.sym"/> + <arg value="${build.drive}/output/zips/binaries_winscw.zip"/> + <arg value="epoc32\release\winscw\"/> + </exec> + + <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5.log"> + <arg value="a"/> + <arg value="-tzip"/> + <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> + <arg value="-xr!*.sym"/> + <arg value="${build.drive}/output/zips/binaries_armv5.zip"/> + <arg value="epoc32\release\armv5\"/> + </exec> + </parallel> </target> <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config">