--- a/sf-platform/compile.ant.xml Fri Oct 01 14:21:02 2010 +0100
+++ b/sf-platform/compile.ant.xml Tue Oct 05 17:41:52 2010 +0100
@@ -10,11 +10,22 @@
<param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
<reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
</antcall>
- <antcall target="sf-do-compile" inheritAll="false" inheritRefs="true">
- <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
+
+ <!-- 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"/>
+
+ <antcall target="sf-do-compile" inheritAll="false" inheritRefs="true">
+ <param name="sysdef.configurations.list" value="bldmelast" />
<reference refid="sf.spec.tools.system.definition.files" torefid="system.definition.files" />
</antcall>
+
+ <!-- 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_bldmelast.xml" tofile="${build.log.dir}/BOM/tools_model.xml"/>
+
</target>
+
<!-- compile sbs.tools.config and sbs.config. tools built only if its not being unpacked first.
note: must be called from sf-os/s60-compile targets, as sys model input needed -->
@@ -30,6 +41,7 @@
<!-- perform initial exports -->
<antcall target="sf-do-full-export" inheritAll="false" inheritRefs="true">
<param name="sf.export.stage.name" value="full_export"/>
+ <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
</antcall>
<!-- explicitly run qmake second time to allow -configure options to be applied -->
@@ -48,7 +60,8 @@
<!-- sf.spec.sbs.tools.config param used. do-target-build will decide to build sequentially/together -->
<antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true">
- <param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.tools.config}" />
+ <param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.tools.config}" />
+ <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
</antcall>
</then>
<else>
@@ -59,11 +72,10 @@
<!-- sf.spec.sbs.config param used. do-target-build will decide to build sequentially/together -->
<antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true">
<param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.config}" />
+ <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
</antcall>
- <!-- 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_${sysdef.configurations.list}.xml" tofile="${build.log.dir}/BOM/system_model.xml"/>
+
</target>
<!-- perform export only first to assist when parallel makefile parsing -->
@@ -79,8 +91,8 @@
<arg line="-k" />
<arg line="-j ${sf.spec.sbs.numberofjobs}"/>
<arg line="-t ${sf.spec.sbs.retry.limit}"/>
- <arg name="--logfile" value="${build.drive}/output/logs/${build.id}_${sf.spec.os.sysdef.clean.configurations.list}_compile_${sf.export.stage.name}.log" />
- <arg name="--makefile" value="${compile.log.dir}/${build.id}_${sf.spec.os.sysdef.clean.configurations.list}_compile_${sf.export.stage.name}_Makefile" />
+ <arg name="--logfile" value="${build.drive}/output/logs/${build.id}_${sysdef.configuration}_compile_${sf.export.stage.name}.log" />
+ <arg name="--makefile" value="${compile.log.dir}/${build.id}_${sysdef.configuration}_compile_${sf.export.stage.name}_Makefile" />
<arg line="--export-only"/>
</sbsOptions>
</hlm:sbsinput>
@@ -89,6 +101,7 @@
<echo message="INFO Full export for all targets"/>
<antcall target="compile-main" inheritAll="false" inheritRefs="true">
<param name="build.system" value="${sf.spec.build.system}" />
+ <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
<param name="sbs.inputs.list" value="sf.export"/>
</antcall>
</target>
@@ -111,8 +124,8 @@
<arg line="-t ${sf.spec.sbs.retry.limit}"/>
<arg line="${sf.spec.sbs.options}"/>
<arg name="--filters" value=""${sf.spec.sbs.filter.list}""/>
- <arg name="--logfile" value="${build.drive}/output/logs/${build.id}_@{item.sbs.splitconfig}_${sf.spec.os.sysdef.clean.configurations.list}_compile.log" />
- <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_${sf.spec.os.sysdef.clean.configurations.list}_Makefile" />
+ <arg name="--logfile" value="${build.drive}/output/logs/${build.id}_@{item.sbs.splitconfig}_${sysdef.configuration}_compile.log" />
+ <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_${sysdef.configuration}_Makefile" />
<arg line="--noexport"/>
</sbsOptions>
</hlm:sbsinput>
@@ -121,6 +134,7 @@
<echo message="INFO Iterative compile building target: @{item.sbs.splitconfig}"/>
<antcall target="compile-main" inheritAll="false" inheritRefs="true">
<param name="build.system" value="${sf.spec.build.system}" />
+ <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
<param name="sbs.inputs.list" value="sf.build"/>
</antcall>
@@ -132,7 +146,7 @@
<propertyregex property="i.sf.spec.sbs.config.expanded" override="true" input="${i.sf.spec.sbs.config}" regexp="(,)" replace=" -c " defaultValue="${i.sf.spec.sbs.config}" global="true" casesensitive="false"/>
<propertyregex property="i.sf.spec.sbs.config.expanded.logname" override="true" input="${i.sf.spec.sbs.config}" regexp="(,)" replace="_" defaultValue="${i.sf.spec.sbs.config}" global="true" casesensitive="false"/>
<echo message="INFO Target : ${i.sf.spec.sbs.config.expanded}"/>
- <echo message="INFO Logname: ${i.sf.spec.sbs.config.expanded.logname} + Config: ${sf.spec.os.sysdef.clean.configurations.list}"/>
+ <echo message="INFO Logname: ${i.sf.spec.sbs.config.expanded.logname} + Config: ${sysdef.configuration}"/>
<!-- TODO: Make this use above compile-main call? -->
@@ -145,8 +159,8 @@
<arg line="-t ${sf.spec.sbs.retry.limit}"/>
<arg line="${sf.spec.sbs.options}"/>
<arg name="--filters" value=""${sf.spec.sbs.filter.list}""/>
- <arg name="--logfile" value="${build.drive}/output/logs/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sf.spec.os.sysdef.clean.configurations.list}_compile.log" />
- <arg name="--makefile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sf.spec.os.sysdef.clean.configurations.list}_Makefile" />
+ <arg name="--logfile" value="${build.drive}/output/logs/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sysdef.configuration}_compile.log" />
+ <arg name="--makefile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sysdef.configuration}_Makefile" />
<arg line="--noexport"/>
</sbsOptions>
</hlm:sbsinput>
@@ -155,6 +169,7 @@
<echo message="INFO Building target(s): ${i.sf.spec.sbs.config.expanded}"/>
<antcall target="compile-main" inheritAll="false" inheritRefs="true">
<param name="build.system" value="${sf.spec.build.system}" />
+ <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
<param name="sbs.inputs.list" value="sf.build"/>
</antcall>
@@ -162,5 +177,4 @@
</if>
</target>
-</project>
-
+</project>
\ No newline at end of file