# HG changeset patch
# User dario
# Date 1240851260 -3600
# Node ID 31922c5222d7f08c300911673f61af3847608dcc
# Parent  6e35d3992e680926e3abd83ca697dbf2cb1c6d8c
Changes to support clean check and avoid filtering the logs

diff -r 6e35d3992e68 -r 31922c5222d7 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Wed Apr 22 12:48:50 2009 +0100
+++ b/common/common_props.ant.xml	Mon Apr 27 17:54:20 2009 +0100
@@ -15,7 +15,8 @@
     <property name="sf.spec.systemdefinition.assemble" value="true"/>
     <!-- property name="sf.spec.systemdefinition.file" value=""/ -->
     
-    <property name="sf.spec.sbs.config" value="armv5"/>
+    <!-- property name="sf.spec.sbs.config" value="armv5"/ -->
+    <property name="sf.spec.sbs.config" value="winscw"/>
     
     <property name="sf.spec.build.target" value="all"/>
     <property name="sf.spec.build.variant" value=""/>
@@ -57,7 +58,7 @@
     <property name="sf.spec.dirdelta.enable" value="false"/>
     
     <!-- prefilter raptor logs -->
-    <property name="sf.spec.logs.raptorfilter.enable" value="true"/>
+    <property name="sf.spec.logs.raptorfilter.enable" value="false"/>
     
     <!-- zip all logs before publish -->
     <property name="sf.spec.logs.zip.enable"  value="true"/>
diff -r 6e35d3992e68 -r 31922c5222d7 sf-package/build.xml
--- a/sf-package/build.xml	Wed Apr 22 12:48:50 2009 +0100
+++ b/sf-package/build.xml	Mon Apr 27 17:54:20 2009 +0100
@@ -12,5 +12,156 @@
   <!-- import package references -->
   <import file="${sf.package.config.dir}/package_refs.ant.xml" />
   
+  <target name="sf-compile">
+    <runtarget target="sf-package-compile"/>
+  </target>
+  
+  <target name="sf-package-compile">
+    
+    <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.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}" / -->
+      <!-- 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.what.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>
+    
+    <!-- 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.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 -->
+    <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.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>
+    
+    <!-- antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="post-build-tools2"/>
+    </antcall -->
+    
+    
+    <!-- OS 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.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>
+    
+    <!-- antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="post-build-tools"/>
+    </antcall -->
+    
+    <!-- OS 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.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>
 
diff -r 6e35d3992e68 -r 31922c5222d7 sf-package/package_refs.ant.xml
--- a/sf-package/package_refs.ant.xml	Wed Apr 22 12:48:50 2009 +0100
+++ b/sf-package/package_refs.ant.xml	Mon Apr 27 17:54:20 2009 +0100
@@ -1,3 +1,11 @@
 <?xml version="1.0"?>
 
-<project name="SF-PACKAGE-REFS"/>
\ No newline at end of file
+<project name="SF-PACKAGE-REFS">
+
+  <path id="sf.spec.system.definition.files">
+    <fileset dir="${sf.spec.job.drive}/" casesensitive="false">
+      <include name="${sf.spec.systemdefinition.location}" />
+    </fileset>
+  </path>
+
+  </project>
\ No newline at end of file