# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1255104209 -3600
# Node ID 84fc7d5ec18f8a39c370f850badd693926de3d1a
# Parent  3effbd6728d46927888a8046f4c9c9abbb1846af# Parent  4709730d52260a9c367e784ea56a32f4035a7619
catchup merge.

diff -r 4709730d5226 -r 84fc7d5ec18f common/build.postbuild.xml
--- a/common/build.postbuild.xml	Fri Oct 09 15:52:33 2009 +0100
+++ b/common/build.postbuild.xml	Fri Oct 09 17:03:29 2009 +0100
@@ -652,7 +652,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" />
@@ -671,6 +671,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}" />
@@ -679,10 +702,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}" />
diff -r 4709730d5226 -r 84fc7d5ec18f common/build.xml
--- a/common/build.xml	Fri Oct 09 15:52:33 2009 +0100
+++ b/common/build.xml	Fri Oct 09 17:03:29 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>
 
diff -r 4709730d5226 -r 84fc7d5ec18f sf-package/build.xml
--- a/sf-package/build.xml	Fri Oct 09 15:52:33 2009 +0100
+++ b/sf-package/build.xml	Fri Oct 09 17:03:29 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">
diff -r 4709730d5226 -r 84fc7d5ec18f sf-platform/build.xml
--- a/sf-platform/build.xml	Fri Oct 09 15:52:33 2009 +0100
+++ b/sf-platform/build.xml	Fri Oct 09 17:03:29 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}" />