Use correct tools model location
authorShabe Razvi <shaber@symbian.org>
Fri, 08 Oct 2010 17:13:31 +0100
changeset 1256 de3bf79206c8
parent 1255 e327203f186d
child 1257 5a13d0332890
Use correct tools model location
sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml	Wed Oct 06 17:01:33 2010 +0100
+++ b/sf-platform/compile.ant.xml	Fri Oct 08 17:13:31 2010 +0100
@@ -13,9 +13,9 @@
 
       <!-- Export model to BOM, as generate-layers target is no longer called from compile-main target -->
       <!-- Name of file in BOM should always be system_model.xml, so that it can be predictably re-used again -->
-      <copy file="${build.drive}/output/build/canonical_system_definition_${sf.spec.os.sysdef.clean.configurations.list}.xml" tofile="${build.log.dir}/BOM/system_model.xml"/>
+      <copy file="${build.drive}/output/build/canonical_system_definition_${sf.spec.os.sysdef.clean.configurations.list}.xml" tofile="${build.log.dir}/BOM/system_model.xml" failonerror="false"/>
 
-    <if><available file="${sf.spec.tools.systemdefinition.location}/tools_model.xml"/>
+    <if><available file="${sf.spec.systemdefinition.location}/tools_model.xml"/>
       <then>
             <antcall target="sf-do-compile" inheritAll="false" inheritRefs="true">
               <param name="sysdef.configurations.list" value="bldmelast" />
@@ -24,7 +24,7 @@
 
             <!-- Export model to BOM, as generate-layers target is no longer called from compile-main target -->
             <!-- Name of file in BOM should always be tools_model.xml, so that it can be predictably re-used again -->
-            <copy file="${build.drive}/output/build/canonical_system_definition_bldmelast.xml" tofile="${build.log.dir}/BOM/tools_model.xml"/>
+            <copy file="${build.drive}/output/build/canonical_system_definition_bldmelast.xml" tofile="${build.log.dir}/BOM/tools_model.xml" failonerror="false"/>
       </then>
     </if>