--- a/sf-package/build.xml	Wed May 06 13:16:49 2009 +0100
+++ b/sf-package/build.xml	Wed May 06 15:21:22 2009 +0100
@@ -18,64 +18,15 @@
   
   <target name="sf-package-compile">
     
+    <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
+    <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
+    
+    <!-- OS what -->
     <hlm:argSet id="sbs.main.what.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="WHAT" />
     </hlm:argSet>
-    
-    <hlm:argSet id="sbs.main.check.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="CHECK" />
-    </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="${sf.spec.logs.raptorfilter.enable}" />
-      <hlm:arg name="command" value="CLEAN" />
-    </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="${sf.spec.logs.raptorfilter.enable}" />
-      <hlm:arg name="command" value="CLEAN" />
-    </hlm:argSet>
-    
-    <hlm:argSet id="sbs.tools2.var">
-      <hlm:arg name="config" value="tools2_rel" />
-      <hlm:arg name="singlejob" value="false" />
-      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-    </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="${sf.spec.logs.raptorfilter.enable}" />
-      <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="${sf.spec.logs.raptorfilter.enable}" />
-    </hlm:argSet>
-    
-    <hlm:argSet id="sbs.main.sbs.var">
-      <hlm:arg name="config" value="${sf.spec.sbs.config}" />
-      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-    </hlm:argSet>
-    
-    <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
-    <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
-    
-    <!-- generate baseline dir list to allow delta creation -->
-    <!-- antcall target="sf-list-dir" inheritAll="false">
-      <param name="sf.list.name" value="baseline"/>
-    </antcall -->
-    
-    <!-- OS what -->
     <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}" / -->
@@ -87,6 +38,11 @@
     </antcall>
     
     <!-- OS clean main build -->
+    <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" />
+    </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}" / -->
@@ -97,17 +53,12 @@
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
-    <!--antcall target="sf-list-dir" inheritAll="false">
-      <param name="sf.list.name" value="post-clean"/>
-    </antcall -->
-    
-    <!-- what has been cleaned from baseline PDK by sos model -->
-    <!-- antcall target="sf-delta-dir" inheritAll="false">
-      <param name="sf.list_a.name" value="baseline"/>
-      <param name="sf.list_b.name" value="post-clean"/>
-    </antcall -->
-    
     <!-- OS tools2 build first -->
+    <hlm:argSet id="sbs.tools2.var">
+      <hlm:arg name="config" value="tools2_rel" />
+      <hlm:arg name="singlejob" value="false" />
+      <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}" / -->
@@ -118,12 +69,12 @@
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
-    <!-- antcall target="sf-list-dir" inheritAll="false">
-      <param name="sf.list.name" value="post-build-tools2"/>
-    </antcall -->
-    
-    
     <!-- OS tools build after tools2 -->
+    <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="${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}" / -->
@@ -134,11 +85,12 @@
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
-    <!-- antcall target="sf-list-dir" inheritAll="false">
-      <param name="sf.list.name" value="post-build-tools"/>
-    </antcall -->
-    
     <!-- OS main build -->
+    <hlm:argSet id="sbs.main.sbs.var">
+      <hlm:arg name="config" value="${sf.spec.sbs.config}.whatlog" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+      <hlm:arg name="command" value="BUILD --check" />
+    </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}" / -->
@@ -149,35 +101,6 @@
       <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
     </antcall>
     
-    <!-- OS check -->
-    <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.check.sbs.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>
-    
-    <!-- antcall target="sf-list-dir" inheritAll="false">
-      <param name="sf.list.name" value="post-build-main"/>
-    </antcall -->
-    
-    <!-- what has been built in tools2+tools+main -->
-    <!-- antcall target="sf-delta-dir" inheritAll="false">
-      <param name="sf.list_a.name" value="post-clean"/>
-      <param name="sf.list_b.name" value="post-build-main"/>
-    </antcall -->
-    
-    <!-- what has been cleaned and rebuilt -->
-    <!-- antcall target="sf-intersect-dir" inheritAll="false">
-      <param name="sf.list_a.name" value="post-clean_delta"/>
-      <param name="sf.list_b.name" value="post-build-main_delta"/>
-    </antcall -->
-    
-    <!-- what has been cleaned and not rebuilt -->
-    
   </target>
   
 </project>