# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1282823110 -3600
# Node ID 485d259b2da89c5fb6c9283cbdb8535c2eb479a4
# Parent  e2a18db6b5629242f75a3ab0b13b96971135715a# Parent  32ae1f6f1c358ff43fec813a6c830070254c8fb6
Merge He 9 Fix

diff -r 32ae1f6f1c35 -r 485d259b2da8 common/build.xml
--- a/common/build.xml	Thu Aug 26 12:39:14 2010 +0100
+++ b/common/build.xml	Thu Aug 26 12:45:10 2010 +0100
@@ -126,11 +126,7 @@
           </hlm:signalInput>
 
           <!-- configure stages -->
-          <hlm:stage id="preparation" starttarget="sf-prebuild" endtarget="sf-prebuild"/>
-          <hlm:stage id="compilation" starttarget="sf-compile" endtarget="sf-compile"/>
-          <hlm:stage id="romcreation" starttarget="sf-build-roms" endtarget="sf-build-roms"/>
-          <hlm:stage id="postbuild" starttarget="sf-postbuild" endtarget="sf-postbuild"/>
-          
+          <import file="config/stages_config.ant.xml" />
       </then>
     </if>
     
diff -r 32ae1f6f1c35 -r 485d259b2da8 common/config/stages_config.ant.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/config/stages_config.ant.xml	Thu Aug 26 12:45:10 2010 +0100
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="sf-stages-config" xmlns:hlm="http://www.nokia.com/helium">
+    <description>
+    Defines what build stages to log during an sf build and how each build stage is recorded.
+    </description>
+    
+    <!-- Stages configuration -->
+    <hlm:stage id="preparation" starttarget="sf-prebuild" endtarget="sf-prebuild"/>
+    <hlm:stage id="compilation" starttarget="sf-compile" endtarget="sf-compile"/>
+    <hlm:stage id="romcreation" starttarget="sf-build-roms" endtarget="sf-build-roms"/>
+    <hlm:stage id="postbuild" starttarget="sf-postbuild" endtarget="sf-postbuild"/>
+
+    <!-- helium 9+ compatibility -->
+    <propertyregex property="short.helium.version" input="${helium.version}" regexp="(\d+.?\d*)" select="\1" casesensitive="false" />
+    <if>
+        <isgreaterthan arg1="${short.helium.version}" arg2="8"/>
+    <then>   
+        <!-- Stage record configuration -->
+        <hlm:stagerecord id="stage.preparation" stagerefid="preparation" output="${build.log.dir}/${build.id}_prep.ant.log" />
+        <hlm:stagerecord id="stage.compilation"  stagerefid="compilation" output="${build.log.dir}/${build.id}_compile.ant.log" />
+        <hlm:stagerecord id="stage.romcreation"  stagerefid="romcreation" output="${build.log.dir}/${build.id}_romcreation.ant.log" />
+        <hlm:stagerecord id="stage.postbuild"  stagerefid="postbuild" output="${build.log.dir}/${build.id}_postbuild.ant.log" />
+    </then>
+    </if>
+    
+</project>