# HG changeset patch
# User dariosestito@L063522.prod.ad.symbian.intra
# Date 1237816698 0
# Node ID 40f47d226f76d7da0fa22918f1df9bfa89b7145a
# Parent  19748fd5a5d082591a175e2daaa2fac595f3f3f2
Changes to enable system definition file to be provided and used as is

diff -r 19748fd5a5d0 -r 40f47d226f76 common/build.xml
--- a/common/build.xml	Tue Mar 17 18:28:05 2009 +0000
+++ b/common/build.xml	Mon Mar 23 13:58:18 2009 +0000
@@ -22,6 +22,11 @@
     <property name="base_release.path" value="${sf.spec.baseline.location}"/>
     <property name="base_release.getenv_options" value="${sf.spec.baseline.getenv_options}"/>
     
+    <target name="create-canonical-sysdef-file">
+      <echo message="Copying given system definition file where Helium expects it."/>
+      <copy file="${build.drive}/${sf.spec.systemdefinition.location}" tofile="${build.drive}/output/build/canonical_system_definition.xml" failonerror="true" verbose="true"/>
+    </target>
+    
     <!-- import all core HELIUM targets -->
     <import file="${helium.dir}/helium.ant.xml" />
     
diff -r 19748fd5a5d0 -r 40f47d226f76 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Tue Mar 17 18:28:05 2009 +0000
+++ b/common/common_props.ant.xml	Mon Mar 23 13:58:18 2009 +0000
@@ -13,6 +13,9 @@
     <property name="sf.spec.corebuildversion" value="mycorebuildversion"/>
     <property name="sf.spec.email.from" value="fbf@symbian.org"/> <!-- needs to be defined for S60 platform builds -->
     
+    <property name="sf.spec.systemdefinition.assemble" value="true"/>
+    <!-- property name="sf.spec.systemdefinition.file" value=""/ -->
+    
     <property name="sf.spec.build.target" value="all"/>
     <property name="sf.spec.build.variant" value=""/>
     <property name="sf.spec.build.productioncode.enable" value="true"/>