# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1246378800 -3600
# Node ID a237fdfca8c5a9bcca0eafefbfa7f757b06223b1
# Parent  060d040866187108063875d91a51a6bf4953dd4a# Parent  8c24efb057becc5cfb84ceb6086d76a4c5e79c27
Merge

diff -r 060d04086618 -r a237fdfca8c5 common/build.xml
--- a/common/build.xml	Tue Jun 30 17:18:18 2009 +0100
+++ b/common/build.xml	Tue Jun 30 17:20:00 2009 +0100
@@ -371,12 +371,12 @@
             <then>
                 <property name="temp.log.zip" value="${env.TEMP}/build_logs_${sf.spec.job.name}_${build.number}.zip"/>
                 <echo message="Zip log requested, zipping logs..."/>
-                <zip destfile="${temp.log.zip}" basedir="${build.log.dir}"/>
+                <zip destfile="${temp.log.zip}" basedir="${build.drive}" includes="output/logs/**"/>
                 <move file="${temp.log.zip}" todir="${build.log.dir}" failonerror="false"/>
             </then>
         </if>
     </target>
-    
+
     <!-- generate dir list using passed location and name 
     if a baseline list is available then generate deltas too -->
 
@@ -814,11 +814,11 @@
         </exec>
         <exec executable="cmd" dir="${build.drive}">
             <arg value="/c"/>
-            <arg value="evalid -x \.sym$ -g epoc32/release/winscw/urel output/md5/epoc32_release_winscw_udeb.md5"/>
+            <arg value="evalid -x \.sym$ -g epoc32/release/winscw/udeb output/md5/epoc32_release_winscw_udeb.md5"/>
         </exec>
         <exec executable="cmd" dir="${build.drive}">
             <arg value="/c"/>
-            <arg value="evalid -x \.sym$ -g epoc32/release/winscw/udeb output/md5/epoc32_release_winscw_urel.md5"/>
+            <arg value="evalid -x \.sym$ -g epoc32/release/winscw/urel output/md5/epoc32_release_winscw_urel.md5"/>
         </exec>
         <exec executable="cmd" dir="${build.drive}">
             <arg value="/c"/>
@@ -885,6 +885,14 @@
             <arg value="evalid -g epoc32/winscw output/md5/epoc32_winscw.md5"/>
         </exec>
         </parallel>
+        
+        <!-- package MD5s directly into epoc32/relinfo location so that its usable out-of-the-box -->
+        <property name="temp.md5.zip" value="${env.TEMP}/MD5_${sf.spec.job.name}_${build.number}.zip"/>
+        <echo message="INFO Packaging MD5s"/>
+        <zip destfile="${temp.md5.zip}">
+            <zipfileset dir="${build.drive}/output/md5/" prefix="epoc32/relinfo"/>
+        </zip>
+        <move file="${temp.md5.zip}" todir="${build.log.dir}" failonerror="false"/>
     </target>
 </project>