# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1245681898 -3600
# Node ID ab3b43adbb0fabb6dd08f9a8e7daf254874bcefa
# Parent  29424d1bc56ba0e07693eaaaed60b22a7b3b7de1# Parent  64274d0f53a7b4d10ddd5a8f071a4ccc5b014f0c
Merge commit

diff -r 64274d0f53a7 -r ab3b43adbb0f sf-platform/build.xml
--- a/sf-platform/build.xml	Mon Jun 22 14:06:50 2009 +0100
+++ b/sf-platform/build.xml	Mon Jun 22 15:44:58 2009 +0100
@@ -88,6 +88,24 @@
         </for>
     </target>
 
+    <target name="generate-layers">
+       <echo message="canno-file:${canonical.sysdef.file}"/>
+       <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
+
+       <!-- All we want is a sysdef with the config name appended, so just copy it -->
+       <echo message="INFO: Skip GenXML and copy sysdef to sysdef+config name"/>
+       <copy file="${canonical.sysdef.file}" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
+
+	<copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml">
+		<filterchain>
+			<linecontainsregexp negate="true">
+			  <regexp pattern="^\s*$"/>
+			</linecontainsregexp>
+		</filterchain>
+	</copy>
+	<delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
+	</target>
+
   <!--
     == Name: SF-COMPILE
     ==