# HG changeset patch
# User Louis Henry Nayegon <louisn@symbian.org>
# Date 1255005336 -3600
# Node ID f720f325a269adb6187a6850f7816f8cc59d442b
# Parent  2cbd1812261fcb936dd5c13073aa9067f3fa5dd8# Parent  327e5b81f1d5ad9386362a919b378a0661f8f1c3
Merge

diff -r 2cbd1812261f -r f720f325a269 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Thu Oct 08 13:33:44 2009 +0100
+++ b/common/build.postbuild.xml	Thu Oct 08 13:35:36 2009 +0100
@@ -185,6 +185,7 @@
         </parallel>
         
         <!-- package MD5s directly into epoc32/relinfo location so that its usable out-of-the-box -->
+		<mkdir dir="${build.output.dir}/zips/release"/> <!-- Hack to prevent non-existing release dir -->
         <zip destfile="${build.output.dir}/zips/release/build_md5.zip">
             <zipfileset dir="${build.drive}/output/md5/" prefix="epoc32/relinfo"/>
         </zip>
@@ -282,9 +283,9 @@
           <istrue value="${sf.spec.publish.enable}"/>
             <then>
             <runtarget target="sf-run-analysis-diamonds"/>
+          	<runtarget target="sf-brag-to-diamonds"/>
             </then>
         </if>
-	<runtarget target="sf-brag-to-diamonds"/>
     </target>
 
     <target name="sf-run-analysis-ant">    
diff -r 2cbd1812261f -r f720f325a269 sf-platform/build.xml
--- a/sf-platform/build.xml	Thu Oct 08 13:33:44 2009 +0100
+++ b/sf-platform/build.xml	Thu Oct 08 13:35:36 2009 +0100
@@ -38,7 +38,7 @@
     <copy todir="${build.drive}/epoc32/include/variant/" failonerror="true" verbose="true">
         <fileset dir="${build.drive}/${sf.spec.bldmefirst.gt.hrh}" includes="*.hrh"/>
     </copy>
-    <copy file="${build.drive}/${sf.spec.bldmefirst.gt.variant}" tofile="${build.drive}/epoc32/tools/variant/variant.cfg" failonerror="true" verbose="true" preservelastmodified="true" />
+    <copy file="${build.drive}/${sf.spec.bldmefirst.gt.variant}" tofile="${build.drive}/epoc32/tools/variant/variant.cfg" failonerror="true" verbose="true" overwrite="true" preservelastmodified="true" />
 	<if><isset property="sf.spec.bldmefirst.gt.hrh.os"/>
 	 <then>
 	  <copy file="${build.drive}/${sf.spec.bldmefirst.gt.hrh.os}" tofile="${build.drive}/epoc32/include/variant/Symbian_OS.hrh" failonerror="false" overwrite="true" verbose="true" preservelastmodified="true" />