# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1279103999 -3600
# Node ID 332c5195337ad56ec048238f7eb260a1246296f0
# Parent  9d79e98a47e4babbe525868ed6ddc17628c3553b# Parent  10860abeede68e91a60570198555c0eb1c2cdd91
Merge

diff -r 10860abeede6 -r 332c5195337a common/build.postbuild.xml
--- a/common/build.postbuild.xml	Tue Jul 13 18:21:15 2010 +0100
+++ b/common/build.postbuild.xml	Wed Jul 14 11:39:59 2010 +0100
@@ -762,7 +762,7 @@
             <arg value="-XSL"/>
             <arg value="${sf.common.config.dir}/tools/brag/bragForDiamonds.xsl"/>
             <arg value="-OUT"/>
-            <arg value="${temp.build.dir}/bragForDiamonds.xml"/>
+            <arg value="${build.log.dir}/diamonds-status.xml"/>
         </java>
         <if>
             <istrue value="${sf.spec.publish.enable}"/>
@@ -789,7 +789,7 @@
                             <arg value="-u"/>
                             <arg value="http://${diamonds.host}${diamonds.build.id}"/>
                             <arg value="-f"/>
-                            <arg value="${temp.build.dir}/bragForDiamonds.xml"/>
+                            <arg value="${build.log.dir}/diamonds-status.xml"/>
                         </exec>
                     </then>
                     <else>
diff -r 10860abeede6 -r 332c5195337a sf-package/build.xml
--- a/sf-package/build.xml	Tue Jul 13 18:21:15 2010 +0100
+++ b/sf-package/build.xml	Wed Jul 14 11:39:59 2010 +0100
@@ -58,7 +58,7 @@
             <arg line="-t ${sf.spec.sbs.retry.limit}"/>
             <arg line="${sf.spec.sbs.options}"/>
             <arg name="--filters" value="&quot;${sf.spec.sbs.filter.list}&quot;"/>
-            <arg name="--logfile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_compile.log" />
+            <arg name="--logfile" value="${build.log.dir}/${build.id}_@{item.sbs.splitconfig}_compile.log" />
             <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_Makefile" />
         </sbsOptions>
       </hlm:sbsinput>