# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1254935039 -3600
# Node ID e463c14c7f733b5367e2f899041e6645a0397072
# Parent  db6643d37adc8379e01c8972e59846108ef4fae3# Parent  5a46e24ea747ecef661a52e081db1a7126e7ecea
catchup merge

diff -r db6643d37adc -r e463c14c7f73 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Wed Oct 07 14:29:43 2009 +0100
+++ b/common/build.postbuild.xml	Wed Oct 07 18:03:59 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>
diff -r db6643d37adc -r e463c14c7f73 sf-platform/build.xml
--- a/sf-platform/build.xml	Wed Oct 07 14:29:43 2009 +0100
+++ b/sf-platform/build.xml	Wed Oct 07 18:03:59 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" />