# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1268078446 0
# Node ID 3118cfa874e0053ca8507365cf5c5c6590ab0c98
# Parent  3f238c62727456163b7347fdf82b0fb0b3bd7982# Parent  a93d4e0357e58567676301ca6ee798fd55b087a2
catchup merge.

diff -r 3f238c627274 -r 3118cfa874e0 common/build.xml
--- a/common/build.xml	Mon Mar 08 20:00:04 2010 +0000
+++ b/common/build.xml	Mon Mar 08 20:00:46 2010 +0000
@@ -209,6 +209,7 @@
         <delete dir="${prep.build.dir}"/>
     </target>
     
+    <!-- Note: Not used from Helium 7 onwards -->
     <target name="generate-layers">
        <echo message="canno-file:${canonical.sysdef.file}"/>
        <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
diff -r 3f238c627274 -r 3118cfa874e0 sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml	Mon Mar 08 20:00:04 2010 +0000
+++ b/sf-platform/compile.ant.xml	Mon Mar 08 20:00:46 2010 +0000
@@ -24,6 +24,10 @@
        note: must be called from sf-os/s60-compile targets, as sys model input needed -->
   <target name="sf-do-compile">
     <echo message="INFO Using Helium 7+ for sf-do-compile"/>
+    
+    <!-- Export model to BOM, as generate-layers target is no longer called from compile-main target -->
+    <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configurations.list}.xml" todir="${build.log.dir}/BOM/"/>
+    
     <propertyregex property="sf.unpack.tools" override="true" input="${sf.spec.baseline.getenv_options}" regexp="-i tools" select="true" defaultValue="false" casesensitive="false"/>
   
     <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them -->