# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1255702288 -3600
# Node ID 81550e87fc9195ad04af73f9222a71b30514b1e6
# Parent  7e493c0264f3ac59cfee8a926337c11f0501aa26
Moved the generation of the release metadata entry for the MD5 zip outside of
the parallel section, so it can't co-incide with the zipping of the binaries.

Ensured that any errors generated when merging log files are not just hidden
by putting them in the output file (which will render it not well-formed XML).

diff -r 7e493c0264f3 -r 81550e87fc91 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Fri Oct 16 15:06:40 2009 +0100
+++ b/common/build.postbuild.xml	Fri Oct 16 15:11:28 2009 +0100
@@ -45,7 +45,13 @@
               </then>
             </if>
         </parallel>
-        
+
+        <!-- Generate release_metadata entries for the md5 zips -->
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="bin-just-metadata" />
+        </antcall>
+ 
         <!-- Launch smoketest -->
         <if><istrue value="${sf.spec.test.sendpkg.enable}"/>
             <then>
@@ -194,11 +200,6 @@
         <zip destfile="${build.output.dir}/zips/release/build_md5.zip">
             <zipfileset dir="${build.drive}/output/md5/" prefix="epoc32/relinfo"/>
         </zip>
-        <!-- Generate release_metadata entries for the above zips -->
-        <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
-            <param name="zip.target.name" value="bin-just-metadata" />
-        </antcall>
     </target>    
     
     <target name="sf-package-binary" depends="sf-package-postbuild-rnd">
@@ -518,7 +519,7 @@
 
     <target name="sf-brag-to-diamonds">
         <!-- Merge all our bits of XML together -->
-        <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml">
+        <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml" logError="true">
             <arg value="${sf.common.config.dir}/tools/mergeXML.pl"/>
             <arg value="--xsl=brag.xsl"/>
             <arg value="--merge=buildStatus,phase(name),step(name),failures(level)"/>