# HG changeset patch
# User ShabeR@UK-SHABER
# Date 1239102732 -3600
# Node ID 9f78d57882293fbb4530a24e4211175708938919
# Parent  c10840c6fcbbf6ca6b786a0bad30c1b55a76f53f
Apply sbs clean before build. TODO add generic clean target next.

diff -r c10840c6fcbb -r 9f78d5788229 sf-platform/build.xml
--- a/sf-platform/build.xml	Tue Mar 31 15:06:33 2009 +0100
+++ b/sf-platform/build.xml	Tue Apr 07 12:12:12 2009 +0100
@@ -84,7 +84,10 @@
     == 
     -->
   <target name="sf-compile">
-
+  
+    <!-- TODO clean up to single target once genxml v2.0.0 merge is fixed -->
+    <if><istrue value="${sf.spec.splitbuild}"/>
+       <then>
        <if><istrue value="${sf.spec.os.skipbuild}" />
             <then><echo message="Skipping OS build"/></then>      
        <else><runtarget target="sf-os-compile"/></else></if>
@@ -92,7 +95,12 @@
        <if><istrue value="${sf.spec.s60.skipbuild}" />
             <then><echo message="Skipping S60 build"/></then>       
        <else><runtarget target="sf-s60-compile"/></else></if>
-       
+	   </then>
+	   <else>
+	        <!-- TODO targets for single sysdef build -->
+	   
+	   </else>
+    </if>
   </target>
 
   <!-- 
@@ -111,21 +119,52 @@
                 <hlm:arg name="singlejob" value="false" />
                 <hlm:arg name="enable-filter" value="true" />
         </hlm:argSet>
+
+		<hlm:argSet id="sbs.tools2.clean.var">
+                <hlm:arg name="config" value="tools2_rel" />
+                <hlm:arg name="singlejob" value="false" />
+                <hlm:arg name="enable-filter" value="true" />
+				<hlm:arg name="command" value="CLEAN" />
+        </hlm:argSet>
         
         <hlm:argSet id="sbs.tools.var"> 
                 <hlm:arg name="config" value="tools_rel" />
                 <hlm:arg name="singlejob" value="true" />
                 <hlm:arg name="enable-filter" value="true" />
         </hlm:argSet>
+		
+		<hlm:argSet id="sbs.tools.clean.var"> 
+                <hlm:arg name="config" value="tools_rel" />
+                <hlm:arg name="singlejob" value="true" />
+                <hlm:arg name="enable-filter" value="true" />
+				<hlm:arg name="command" value="CLEAN" />
+        </hlm:argSet>
 
         <hlm:argSet id="sbs.main.sbs.var">
                 <hlm:arg name="config" value="${sf.spec.sbs.config}" />
                 <hlm:arg name="enable-filter" value="true" />
         </hlm:argSet>
 
+		<hlm:argSet id="sbs.main.clean.sbs.var">
+                <hlm:arg name="config" value="${sf.spec.sbs.config}" />
+                <hlm:arg name="enable-filter" value="true" />
+				<hlm:arg name="command" value="CLEAN" />
+        </hlm:argSet>
+		
         <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
         <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
 
+		<!-- OS clean tools2 build first>
+        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+                <param name="build.system" value="${sf.spec.build.system}" />
+                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
+                <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}"/>
+                <reference refid="sbs.tools2.clean.var" torefid="sbs.var" />
+                <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
+                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
+        </antcall-->
+		
         <!-- OS tools2 build first-->
         <antcall target="compile-main" inheritAll="false" inheritRefs="true">
                 <param name="build.system" value="${sf.spec.build.system}" />
@@ -137,6 +176,17 @@
                 <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
         </antcall>
 
+		<!-- OS clean tools build after tools2>
+        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+                <param name="build.system" value="${sf.spec.build.system}" />
+                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
+                <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}"/>
+                <reference refid="sbs.tools.clean.var" torefid="sbs.var" />
+                <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
+                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
+        </antcall-->
+		
         <!-- OS tools build after tools2 -->
         <antcall target="compile-main" inheritAll="false" inheritRefs="true">
                 <param name="build.system" value="${sf.spec.build.system}" />
@@ -148,6 +198,17 @@
                 <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
         </antcall>
 
+		<!-- OS clean main build -->
+        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+                <param name="build.system" value="${sf.spec.build.system}" />
+                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
+                <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}"/>                    
+                <reference refid="sbs.main.clean.sbs.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> 
+		
         <!-- OS main build -->
         <antcall target="compile-main" inheritAll="false" inheritRefs="true">
                 <param name="build.system" value="${sf.spec.build.system}" />
@@ -176,31 +237,62 @@
           			<hlm:arg name="singlejob" value="true" />
           			<hlm:arg name="enable-filter" value="true" />
     		</hlm:argSet>
+			
+			<hlm:argSet id="sbs.tools.clean.var">
+          			<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
+          			<hlm:arg name="singlejob" value="true" />
+          			<hlm:arg name="enable-filter" value="true" />
+    		</hlm:argSet>
     
     		<hlm:argSet id="sbs.main.sbs.var">
           			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
           			<hlm:arg name="enable-filter" value="true" />
     		</hlm:argSet>
+			
+			<hlm:argSet id="sbs.main.clean.sbs.var">
+          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
+          			<hlm:arg name="enable-filter" value="true" />
+					<hlm:arg name="command" value="CLEAN" />
+    		</hlm:argSet>
         
     		<hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
     		<hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
-    
-        <!-- s60 clean tools build -->
+
+            <!-- s60 clean tools build>
     		<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.s60.sysdef.clean.configurations.list}" />
-                <param name="sf.spec.sysdef.version" value ="${sf.spec.s60.sysdef.version}"/> 
-                                  
+                    <param name="sf.spec.sysdef.version" value ="${sf.spec.s60.sysdef.version}"/>                                   
+          			<reference refid="sbs.tools.clean.var" torefid="sbs.var" />
+          			<reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
+          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
+    		</antcall-->
+			
+            <!-- s60  tools build -->
+    		<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.s60.sysdef.clean.configurations.list}" />
+                <param name="sf.spec.sysdef.version" value ="${sf.spec.s60.sysdef.version}"/>                                   
           			<reference refid="sbs.tools.var" torefid="sbs.var" />
           			<reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
           			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
     		</antcall>
     
-    		<!-- s60 clean main build -->
+	        <!-- s60 clean main build -->
     		<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.s60.sysdef.clean.configurations.list}" />
-                <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/> 
+                    <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/> 
+          			<reference refid="sbs.main.clean.sbs.var" torefid="sbs.var" />
+          			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
+    		</antcall>
+			
+    		<!-- s60 main build -->
+    		<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.s60.sysdef.clean.configurations.list}" />
+                    <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/> 
           			<reference refid="sbs.main.sbs.var" torefid="sbs.var" />
           			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
           			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />