Removed code which redundantly checks values of sf.spec.splitbuild, sf.spec.os.skipbuild, and sf.spec.s60.skipbuild.
Removed setting of sf.spec.sysdef.version, as nothing ever reads its value.
Removed sf-check-missing-s60-files, as there's nothing to call it any more.
--- a/common/build.postbuild.xml Mon Jul 12 17:26:59 2010 +0100
+++ b/common/build.postbuild.xml Wed Jul 07 17:26:43 2010 +0100
@@ -922,23 +922,7 @@
<!-- TODO: Make this work for package builds once we have sysmodel story worked out -->
<target name="sf-run-analysis-missing-files" if="sf.spec.checkbuild">
- <!-- splitbuild is only set for Platform builds -->
- <if><istrue value="${sf.spec.splitbuild}"/>
- <then>
- <if><istrue value="${sf.spec.os.skipbuild}" />
- <then><echo message="Skipping OS file check"/></then>
- <else><runtarget target="sf-check-missing-os-files"/></else>
- </if>
-
- <if><istrue value="${sf.spec.s60.skipbuild}" />
- <then><echo message="Skipping S60 file check"/></then>
- <else><runtarget target="sf-check-missing-s60-files"/></else>
- </if>
- </then>
- <else>
- <runtarget target="sf-check-missing-os-files"/>
- </else>
- </if>
+ <runtarget target="sf-check-missing-os-files"/>
</target>
<target name="sf-check-missing-os-files" depends="sf-compile-options">
@@ -954,7 +938,6 @@
<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.os.sysdef.clean.configurations.list}" />
- <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
<param name="build.id" value ="sbs_check"/>
<reference refid="sbs.check.tools.var" torefid="sbs.var" />
<reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
@@ -973,7 +956,6 @@
<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.os.sysdef.clean.configurations.list}" />
- <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
<param name="build.id" value ="sbs_check"/>
<reference refid="sbs.check.iterate.main.var" torefid="sbs.var" />
<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
@@ -986,7 +968,6 @@
<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.os.sysdef.clean.configurations.list}" />
- <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
<param name="build.id" value ="sbs_check"/>
<reference refid="sbs.check.main.var" torefid="sbs.var" />
<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
@@ -996,38 +977,6 @@
</if>
</target>
- <target name="sf-check-missing-s60-files" depends="sf-compile-options">
-
- <hlm:argSet id="sbs.check.tools.var">
- <hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
- <hlm:arg name="run-check" value="true" />
- </hlm:argSet>
-
- <hlm:argSet id="sbs.check.main.var">
- <hlm:arg name="config" value="${sf.spec.sbs.config}" />
- <hlm:arg name="run-check" value="true" />
- </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.s60.sysdef.clean.configurations.list}" />
- <param name="sf.spec.sysdef.version" value ="${sf.spec.s60.sysdef.version}"/>
- <param name="build.id" value ="sbs_check"/>
- <reference refid="sbs.check.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>
- <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.os.sysdef.version}"/>
- <param name="build.id" value ="sbs_check"/>
- <reference refid="sbs.check.main.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>
-
- </target>
-
<target name="sf-create-public-PDK" depends="sf-prebuild,sf-run-sfl-licence-munging" >
<if>
<istrue value="${sf.spec.md5.enable}"/>
--- a/sf-platform/build.xml Mon Jul 12 17:26:59 2010 +0100
+++ b/sf-platform/build.xml Wed Jul 07 17:26:43 2010 +0100
@@ -150,41 +150,21 @@
== Desc: Override of common sf-compile target defined in
== common\build.xml
==
- == os build will be skipped if sf.spec.os.skipbuild=true
- == s60 build will be skipped if sf.spec.s60.skipbuild=true
- ==
-->
<target name="sf-compile">
<stopwatch 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>
-
- <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 -->
- <runtarget target="sf-os-compile"/>
- </else>
- </if>
+ <runtarget target="sf-os-compile"/>
<!-- always run cenrep -->
<if><equals arg1="${sf.spec.job.name}" arg2="symbian2"/>
- <then>
+ <then>
<runtarget target="sf-s60-create-cenrep"/>
- </then>
- <else>
+ </then>
+ <else>
<!-- symbian3+ should use ConE -->
<runtarget target="sf-s60-cone-cenrep"/>
- </else>
+ </else>
</if>
<stopwatch name="sf-compile" action="elapsed"/>
</target>
--- a/sf-platform/compile-hlm-5.ant.xml Mon Jul 12 17:26:59 2010 +0100
+++ b/sf-platform/compile-hlm-5.ant.xml Wed Jul 07 17:26:43 2010 +0100
@@ -36,7 +36,6 @@
<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" />
@@ -85,7 +84,6 @@
<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.os.system.definition.files" torefid="system.definition.files" />
@@ -108,7 +106,6 @@
<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.os.system.definition.files" torefid="system.definition.files" />
@@ -140,7 +137,6 @@
<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.iterate.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" />
@@ -159,7 +155,6 @@
<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.os.system.definition.files" torefid="system.definition.files" />
@@ -246,7 +241,6 @@
<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" />
@@ -258,7 +252,6 @@
<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.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" />
@@ -281,7 +274,6 @@
<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" />
@@ -295,7 +287,6 @@
<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" />