--- a/sf-platform/build.xml Tue Apr 14 17:44:14 2009 +0100
+++ b/sf-platform/build.xml Wed Apr 15 14:15:35 2009 +0100
@@ -142,39 +142,45 @@
<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="true" />
+ <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
</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="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="true" />
+ <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="true" />
+ <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
<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:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
</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="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
<hlm:arg name="command" value="CLEAN" />
</hlm:argSet>
+
+ <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:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
<hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
@@ -184,6 +190,17 @@
<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.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}" />
@@ -198,6 +215,12 @@
<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">
@@ -213,7 +236,8 @@
<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}" />
@@ -243,6 +267,12 @@
<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>
</target>
<!--
@@ -259,33 +289,49 @@
<hlm:argSet id="sbs.tools.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:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
</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: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="true" />
+ <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
</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="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
<hlm:arg name="command" value="CLEAN" />
</hlm:argSet>
+
+ <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:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
<hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
<antcall target="sf-list-dir" inheritAll="false">
- <param name="sf.list.name" value="pre-s60-clean"/>
- </antcall>
+ <param name="sf.list.name" value="s60-baseline"/>
+ </antcall>
+ <!-- s60 what -->
+ <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.what.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 clean main build -->
<antcall target="compile-main" inheritAll="false" inheritRefs="true">
<param name="build.system" value="${sf.spec.build.system}" />
@@ -299,6 +345,13 @@
<antcall target="sf-list-dir" inheritAll="false">
<param name="sf.list.name" value="post-s60-clean"/>
</antcall>
+
+ <!-- what has been cleaned from baseline PDK by s60 model -->
+ <antcall target="sf-delta-dir" inheritAll="false">
+ <param name="sf.list_a.name" value="s60-baseline"/>
+ <param name="sf.list_b.name" value="post-s60-clean"/>
+ </antcall>
+
<!-- s60 tools build -->
<antcall target="compile-main" inheritAll="false" inheritRefs="true">
@@ -328,7 +381,6 @@
<param name="sf.list.name" value="post-s60-build-main"/>
</antcall>
-
<!-- s60 postbuild bldmelast using ebs -->
<antcall target="compile-main" inheritAll="false">
<param name="build.system" value="ebs" />
@@ -340,6 +392,11 @@
<param name="sf.list.name" value="post-s60-bldmelast"/>
</antcall>
+ <!-- what has been built by tools+2+main+bldmelast -->
+ <antcall target="sf-delta-dir" inheritAll="false">
+ <param name="sf.list_a.name" value="s60-baseline"/>
+ <param name="sf.list_b.name" value="post-s60-bldmelast"/>
+ </antcall>
</target>
<!-- import sf-common-config -->