--- a/sf-package/build.xml	Mon Jul 20 18:44:53 2009 +0100
+++ b/sf-package/build.xml	Tue Jul 21 13:32:34 2009 +0100
@@ -31,72 +31,117 @@
     <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
     <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
     
-    <!-- CLEAN -->
-    <hlm:argSet id="sbs.main.clean.sbs.var">
-      <hlm:arg name="config" value="${sf.spec.sbs.config}" />
-      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-      <hlm:arg name="command" value="CLEAN" />
+    <!-- BUILD tools2 CLEAN -->
+    <hlm:argSet id="sbs.tools2.clean.var">
+      <hlm:arg name="config" value="tools2" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}"/>
+      <hlm:arg name="command" value="CLEAN"/>
     </hlm:argSet>
     <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.sysdef.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="sbs.tools2.clean.var" torefid="sbs.var" />
+      <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
     <!-- BUILD tools2 -->
     <hlm:argSet id="sbs.tools2.var">
-      <hlm:arg name="config" value="tools2_rel" />
-      <hlm:arg name="singlejob" value="false" />
+      <hlm:arg name="config" value="tools2.whatlog" />
       <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
     </hlm:argSet>
     <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.sysdef.configurations.list}" />
-      <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ -->
       <reference refid="sbs.tools2.var" torefid="sbs.var" />
       <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
+    <!-- BUILD tools CLEAN -->
+    <hlm:argSet id="sbs.tools.clean.var">
+      <hlm:arg name="config" value="tools"/>
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+      <hlm:arg name="command" value="CLEAN"/>
+    </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.sysdef.configurations.list}" />
+      <reference refid="sbs.tools.clean.var" torefid="sbs.var" />
+      <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
     <!-- BUILD tools -->
     <hlm:argSet id="sbs.tools.var">
-      <hlm:arg name="config" value="tools_rel" />
-      <hlm:arg name="singlejob" value="true" />
+      <hlm:arg name="config" value="tools.whatlog"/>
       <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
     </hlm:argSet>
     <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.sysdef.configurations.list}" />
-      <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ -->
       <reference refid="sbs.tools.var" torefid="sbs.var" />
       <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
-    <!-- BUILD -->
-    <hlm:argSet id="sbs.main.sbs.var">
-      <hlm:arg name="config" value="${sf.spec.sbs.config}.whatlog" />
+    <!-- BUILD winscw CLEAN -->
+    <hlm:argSet id="sbs.winscw.clean.var">
+      <hlm:arg name="config" value="winscw" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+      <hlm:arg name="command" value="CLEAN"/>
+    </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.sysdef.configurations.list}" />
+      <reference refid="sbs.winscw.clean.var" torefid="sbs.var" />
+      <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- BUILD winscw -->
+    <hlm:argSet id="sbs.winscw.var">
+      <hlm:arg name="config" value="winscw.whatlog" />
       <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
     </hlm:argSet>
     <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.sysdef.configurations.list}" />
+      <reference refid="sbs.winscw.var" torefid="sbs.var" />
+      <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- BUILD armv5 CLEAN -->
+    <hlm:argSet id="sbs.armv5.clean.var">
+      <hlm:arg name="config" value="armv5" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+      <hlm:arg name="command" value="CLEAN"/>
+    </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.sysdef.configurations.list}" />
-      <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ -->
-      <reference refid="sbs.main.sbs.var" torefid="sbs.var" />
+      <reference refid="sbs.armv5.clean.var" torefid="sbs.var" />
+      <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- BUILD armv5 -->
+    <hlm:argSet id="sbs.armv5.var">
+      <hlm:arg name="config" value="armv5.whatlog" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+    </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.sysdef.configurations.list}" />
+      <reference refid="sbs.armv5.var" torefid="sbs.var" />
       <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
     <!-- CHECK -->
     <exec executable="cmd" dir="${build.drive}/" output="${build.drive}/output\logs\build_check_compile.log">
-      <arg value="/c sbs.bat -s ${build.drive}/output\build\canonical_system_definition_SF.xml -k -c ${sf.spec.sbs.config} -j 32 --check -m ${build.drive}/output\logs\build_check_Makefile"/>
+      <arg value="/c sbs.bat -s ${build.drive}/output\build\canonical_system_definition_SF.xml -k -c tools -c tools2 -c winscw -c armv5 -j 32 --check -m ${build.drive}/output\logs\build_check_Makefile"/>
       <!-- argument of -j option can be parameterized with: ${number.of.threads} -->
     </exec>