Modified sf-check-missing-os-files to deal with 'sf.os.compile.iterate' property. Added new target 'sf-compile-options' for setting the gmake sbs compile option, and added it as a dep for the compile targets.
--- a/common/build.postbuild.xml Thu Oct 08 19:37:59 2009 +0100
+++ b/common/build.postbuild.xml Fri Oct 09 17:01:52 2009 +0100
@@ -651,7 +651,7 @@
</if>
</target>
- <target name="sf-check-missing-os-files">
+ <target name="sf-check-missing-os-files" depends="sf-compile-options">
<hlm:argSet id="sbs.check.tools.var">
<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
<hlm:arg name="run-check" value="true" />
@@ -670,6 +670,29 @@
<reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
<reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
</antcall>
+ <if><istrue value="${sf.os.compile.iterate}"/>
+ <then>
+ <for list="${sf.spec.sbs.config}" delimiter="," param="sf.spec.check.splitconfig">
+ <sequential>
+ <echo message="INFO [Iterative check] @{sf.spec.check.splitconfig}"/>
+ <hlm:argSet id="sbs.check.iterate.main.var">
+ <hlm:arg name="config" value="@{sf.spec.check.splitconfig}" />
+ <hlm:arg name="run-check" value="true" />
+ </hlm:argSet>
+
+ <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+ <param name="build.system" value="${sf.spec.build.system}" />
+ <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
+ <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
+ <param name="build.id" value ="sbs_check"/>
+ <reference refid="sbs.check.iterate.main.var" torefid="sbs.var" />
+ <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+ <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
+ </antcall>
+ </sequential>
+ </for>
+ </then>
+ <else>
<antcall target="compile-main" inheritAll="false" inheritRefs="true">
<param name="build.system" value="${sf.spec.build.system}" />
<param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
@@ -678,10 +701,12 @@
<reference refid="sbs.check.main.var" torefid="sbs.var" />
<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
<reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
- </antcall>
+ </antcall>
+ </else>
+ </if>
</target>
- <target name="sf-check-missing-s60-files">
+ <target name="sf-check-missing-s60-files" depends="sf-compile-options">
<hlm:argSet id="sbs.check.tools.var">
<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
--- a/common/build.xml Thu Oct 08 19:37:59 2009 +0100
+++ b/common/build.xml Fri Oct 09 17:01:52 2009 +0100
@@ -521,6 +521,11 @@
</sequential>
</for>
</target>
+
+ <target name="sf-compile-options">
+ <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
+ <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
+ </target>
</project>
--- a/sf-package/build.xml Thu Oct 08 19:37:59 2009 +0100
+++ b/sf-package/build.xml Fri Oct 09 17:01:52 2009 +0100
@@ -28,11 +28,8 @@
<runtarget target="sf-package-compile"/>
</target>
- <target name="sf-package-compile">
-
- <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
- <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
-
+ <target name="sf-package-compile" depends="sf-compile-options">
+
<!-- BUILD tools2_rel CLEAN -->
<!--
<hlm:argSet id="sbs.tools2_rel.clean.var">
--- a/sf-platform/build.xml Thu Oct 08 19:37:59 2009 +0100
+++ b/sf-platform/build.xml Fri Oct 09 17:01:52 2009 +0100
@@ -159,7 +159,7 @@
== - job_refs.ant.xml
==
-->
- <target name="sf-os-compile">
+ <target name="sf-os-compile" depends="sf-compile-options">
<hlm:argSet id="sbs.tools2.var">
<hlm:arg name="config" value="tools2_rel.whatlog" />
@@ -207,9 +207,6 @@
<hlm:arg name="command" value="WHAT" />
</hlm:argSet>
- <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
- <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
-
<!-- generate baseline dir list to allow delta creation -->
<if><isset property="sf.os.compile.fast"/>
<then>
@@ -375,7 +372,7 @@
== - job_refs.ant.xml
==
-->
- <target name="sf-s60-compile">
+ <target name="sf-s60-compile" depends="sf-compile-options">
<hlm:argSet id="sbs.tools.var">
<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />