--- a/.hgtags Wed Jul 22 11:12:18 2009 +0100
+++ b/.hgtags Wed Jul 22 12:07:18 2009 +0100
@@ -1,2 +1,3 @@
29394d95b3e1a63e73a3f3e31f9bab42cc1437f5 fbf_configs_0.0.a
36d82a2f1f927cbe91926e19c69fe74d9170b7de PDK_2.0.c
+633b96a83005daab9464a00b8fcbcfa96a247c26 PDK_2.0.d
--- a/common/build.xml Wed Jul 22 11:12:18 2009 +0100
+++ b/common/build.xml Wed Jul 22 12:07:18 2009 +0100
@@ -27,7 +27,7 @@
<property name="build.system" value="${sf.spec.build.system}"/>
<property name="base_release.path" value="${sf.spec.baseline.location}"/>
<property name="base_release.getenv_options" value="${sf.spec.baseline.getenv_options}"/>
-
+
<!-- SF-specific Helium properties not meant to be exposed in the project spec -->
<property name="diamonds.listener.configuration.file" location="${sf.common.config.dir}/diamonds/config.xml.ftl"/>
@@ -37,15 +37,15 @@
<!-- import common references -->
<import file="${sf.common.config.dir}/common_refs.ant.xml" />
- <!-- setup conditional Helium internal properties -->
- <if><istrue value="${sf.spec.sourcesync.usecache}"/>
- <then>
- <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.common.config.dir}/generated"/>
- </then>
- <else>
- <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.project.location}"/>
- </else>
- </if>
+ <!-- setup conditional Helium internal properties -->
+ <if><istrue value="${sf.spec.sourcesync.usecache}"/>
+ <then>
+ <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.common.config.dir}/generated"/>
+ </then>
+ <else>
+ <property name="sf.spec.sourcesync.sourcespecdir" value="${sf.project.location}"/>
+ </else>
+ </if>
<!-- conditional import of generated source spec if available -->
<if><available file="${sf.common.config.dir}/generated/source-spec.ant.xml" />
@@ -80,20 +80,20 @@
</target>
<target name="sf-generate-source-spec" depends="sf-parse-project-config">
-
- <!-- Generate the sources.csv if hg cache is activated -->
- <if><istrue value="${sf.spec.sourcesync.usecache}"/>
- <then>
- <echo message="Generating Hg local cache..." />
- <exec executable="perl" dir="${build.log.dir}" failonerror="true" output="${build.log.dir}/${build.id}_hgcache.log">
- <arg value="${sf.common.config.dir}/tools/cachefiles.pl"/>
- <arg value="${sf.spec.sourcesync.cachelocation}"/>
- <arg value="${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}"/>
- <arg value="${sf.common.config.dir}/generated/${sf.spec.sourcesync.sourcespecfile}"/>
- </exec>
- </then>
- </if>
-
+
+ <!-- Generate the sources.csv if hg cache is activated -->
+ <if><istrue value="${sf.spec.sourcesync.usecache}"/>
+ <then>
+ <echo message="Generating Hg local cache..." />
+ <exec executable="perl" dir="${build.log.dir}" failonerror="true" output="${build.log.dir}/${build.id}_hgcache.log">
+ <arg value="${sf.common.config.dir}/tools/cachefiles.pl"/>
+ <arg value="${sf.spec.sourcesync.cachelocation}"/>
+ <arg value="${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}"/>
+ <arg value="${sf.common.config.dir}/generated/${sf.spec.sourcesync.sourcespecfile}"/>
+ </exec>
+ </then>
+ </if>
+
<!-- TODO: 1. Same file name souce-spec.ant.xml is used for all packages
for multiple package builds, this needs to be linked with package name. -->
<!-- TODO: 2. Change fmpp data to be a full property rather than relative path -->
@@ -108,78 +108,86 @@
</target>
<target name="sf-bc-check">
- <!-- create BC dir -->
- <mkdir dir="${build.log.dir}/BC"/>
+
+ <if><isset property="env.PDT_HOME"/>
+ <then>
+ <!-- create BC dir -->
+ <mkdir dir="${build.log.dir}/BC"/>
- <delete file="${build.log.dir}/BC/bc.config" quiet="true"/>
- <delete file="${build.log.dir}/BC/BBCResults.xsl" quiet="true"/>
- <delete file="${build.log.dir}/BC/libraries.txt" quiet="true"/>
- <delete file="${build.log.dir}/BC/libraries_report.xml" quiet="true"/>
- <delete file="${build.log.dir}/BC/headers.txt" quiet="true"/>
- <delete file="${build.log.dir}/BC/headers_report.xml" quiet="true"/>
+ <delete file="${build.log.dir}/BC/bc.config" quiet="true"/>
+ <delete file="${build.log.dir}/BC/BBCResults.xsl" quiet="true"/>
+ <delete file="${build.log.dir}/BC/libraries.txt" quiet="true"/>
+ <delete file="${build.log.dir}/BC/libraries_report.xml" quiet="true"/>
+ <delete file="${build.log.dir}/BC/headers.txt" quiet="true"/>
+ <delete file="${build.log.dir}/BC/headers_report.xml" quiet="true"/>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="BASELINE_NAME=${sf.spec.bccheck.baseline.name}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="BASELINE_SDK_DIR=${sf.spec.bccheck.baseline.skd.dir}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="BASELINE_SDK_S60_VERSION=${sf.spec.bccheck.baseline.s60.version}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="CURRENT_NAME=${build.id}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="CURRENT_SDK_DIR=${build.drive}"/>
- </exec>
- <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
- <arg value="/c"/>
- <arg value="echo"/>
- <arg value="CURRENT_SDK_S60_VERSION=${sf.spec.bccheck.current.s60.version}"/>
- </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="BASELINE_NAME=${sf.spec.bccheck.baseline.name}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="BASELINE_SDK_DIR=${sf.spec.bccheck.baseline.skd.dir}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="BASELINE_SDK_S60_VERSION=${sf.spec.bccheck.baseline.s60.version}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="CURRENT_NAME=${build.id}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="CURRENT_SDK_DIR=${build.drive}"/>
+ </exec>
+ <exec executable="cmd" output="${build.log.dir}/BC/bc.config" append="true">
+ <arg value="/c"/>
+ <arg value="echo"/>
+ <arg value="CURRENT_SDK_S60_VERSION=${sf.spec.bccheck.current.s60.version}"/>
+ </exec>
+
+ <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/BBCResults.xsl" tofile="${build.log.dir}/BC/BBCResults.xsl" failonerror="false" verbose="true"/>
- <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/BBCResults.xsl" tofile="${build.log.dir}/BC/BBCResults.xsl" failonerror="true" verbose="true"/>
-
- <if><istrue value="${sf.spec.bccheck.enable.la}"/>
- <then>
- <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/libraries.txt">
- <arg value="CheckBC.py"/>
- <arg value="${build.log.dir}/BC/bc.config"/>
- <arg value="-la"/>
- <arg value="-f"/>
- <arg value="${sf.spec.bccheck.reportid}${sf.spec.job.number}"/>
- </exec>
- <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Libraries_CompatibilityReport_${sf.spec.bccheck.reportid}${sf.spec.job.number}.xml" tofile="${build.log.dir}/BC/libraries_report.xml" failonerror="true" verbose="true"/>
- </then>
- </if>
+ <if><istrue value="${sf.spec.bccheck.enable.la}"/>
+ <then>
+ <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/libraries.txt">
+ <arg value="CheckBC.py"/>
+ <arg value="${build.log.dir}/BC/bc.config"/>
+ <arg value="-la"/>
+ <arg value="-f"/>
+ <arg value="${sf.spec.bccheck.reportid}"/>
+ </exec>
+ <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Libraries_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/libraries_report.xml" failonerror="false" verbose="true"/>
+ </then>
+ </if>
- <if><istrue value="${sf.spec.bccheck.enable.ha}"/>
- <then>
- <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/headers.txt">
- <arg value="CheckBC.py"/>
- <arg value="${build.log.dir}/BC/bc.config"/>
- <arg value="-ha"/>
- <arg value="-f"/>
- <arg value="${sf.spec.bccheck.reportid}${sf.spec.job.number}"/>
- </exec>
- <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Headers_CompatibilityReport_${sf.spec.bccheck.reportid}${sf.spec.job.number}.xml" tofile="${build.log.dir}/BC/headers_report.xml" failonerror="true" verbose="true"/>
- </then>
- </if>
+ <if><istrue value="${sf.spec.bccheck.enable.ha}"/>
+ <then>
+ <exec executable="python" dir="${sf.spec.pdt.root}/fts/compatibilityanalyser" output="${build.log.dir}/BC/headers.txt">
+ <arg value="CheckBC.py"/>
+ <arg value="${build.log.dir}/BC/bc.config"/>
+ <arg value="-ha"/>
+ <arg value="-f"/>
+ <arg value="${sf.spec.bccheck.reportid}"/>
+ </exec>
+ <copy file="${sf.spec.pdt.root}/fts/compatibilityanalyser/reports/Headers_CompatibilityReport_${sf.spec.bccheck.reportid}.xml" tofile="${build.log.dir}/BC/headers_report.xml" failonerror="false" verbose="true"/>
+ </then>
+ </if>
- <if><istrue value="${sf.spec.bccheck.enable.dynamic}"/>
- <then>
- </then>
+ <if><istrue value="${sf.spec.bccheck.enable.dynamic}"/>
+ <then>
+ </then>
+ </if>
+ </then>
+ <else>
+ <echo message="WARNING: PDT_HOME not set, I dont know where the BC tools are installed so cannot continue"/>
+ </else>
</if>
</target>
@@ -356,6 +364,9 @@
<echo message="INFO Packaging Binaries"/>
<runtarget target="sf-package-binary"/>
<runtarget target="sf-package-tools"/>
+
+ <echo message="INFO Validate Zip files"/>
+ <runtarget target="sf-package-validate"/>
</then>
</if>
</parallel>
@@ -404,8 +415,13 @@
<property name="temp.log.dir" value="${env.TEMP}/${build.id}_output_logs"/>
<echo message="Zip log requested, zipping logs..."/>
<mkdir dir="${temp.log.dir}"/>
- <zip destfile="${temp.log.dir}/${build.id}_build_logs.zip" basedir="${build.drive}" includes="output/logs/**"/>
- <zip destfile="${temp.log.dir}/${build.id}_BOM.zip" basedir="${build.drive}">
+ <zip destfile="${temp.log.dir}/build_logs.zip" basedir="${build.drive}">
+ <include name="output/logs/**"/>
+ <exclude name="output/logs/BOM/**"/>
+ <exclude name="output/logs/deliverables/**"/>
+ <exclude name="output/logs/releaseables/**"/>
+ </zip>
+ <zip destfile="${temp.log.dir}/build_BOM.zip" basedir="${build.drive}">
<include name="output/logs/BOM/**"/>
<include name="output/logs/deliverables/**"/>
<include name="output/logs/releaseables/**"/>
@@ -588,9 +604,6 @@
<param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
<param name="zip.target.name" value="src-by-layer" />
</antcall>
- <!-- Copy the zips that need to have different names when a PDK is released -->
- <copy file="${build.drive}/output/zips/bin_rnd_internal_updated.zip" tofile="${build.drive}/output/zips/binaries_epoc_additional.zip" failonerror="false"/>
- <copy file="${build.drive}/output/zips/bin_rnd_internal_bldmefirst.zip" tofile="${build.drive}/output/zips/binaries_bldmefirst.zip" failonerror="false"/>
</target>
<target name="sf-package-tools" depends="sf-preprocess-package-config">
@@ -600,7 +613,7 @@
<arg value="-tzip"/>
<arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
<!-- <arg value="-x@${build.log.dir}/*_includefile.txt"/> -->
- <arg value="${build.drive}/output/zips/tools_epoc.zip"/>
+ <arg value="${build.drive}/output/zips/release/tools_epoc.zip"/>
<arg value="epoc32/tools"/>
</exec>
</target>
@@ -612,7 +625,7 @@
<param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
<param name="zip.target.name" value="bin" />
</antcall-->
- <parallel>
+ <parallel>
<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log">
<arg value="a"/>
<arg value="-tzip"/>
@@ -622,7 +635,7 @@
<arg value="-x!epoc32\release\armv5"/>
<arg value="-x!epoc32\release\winscw"/>
<arg value="-xr!*.sym"/>
- <arg value="${build.drive}/output/zips/binaries_epoc.zip"/>
+ <arg value="${build.drive}/output/zips/release/binaries_epoc.zip"/>
<arg value="epoc32\"/>
</exec>
@@ -631,7 +644,7 @@
<arg value="-tzip"/>
<arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
<arg value="-xr!*.sym"/>
- <arg value="${build.drive}/output/zips/binaries_winscw.zip"/>
+ <arg value="${build.drive}/output/zips/release/binaries_winscw.zip"/>
<arg value="epoc32\release\winscw\"/>
</exec>
@@ -640,7 +653,7 @@
<arg value="-tzip"/>
<arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
<arg value="-xr!*.sym"/>
- <arg value="${build.drive}/output/zips/binaries_armv5.zip"/>
+ <arg value="${build.drive}/output/zips/release/binaries_armv5.zip"/>
<arg value="epoc32\release\armv5\"/>
</exec>
</parallel>
@@ -652,12 +665,12 @@
<exec executable="perl" dir="${build.drive}/" failonerror="false" output="${build.log.dir}/zip_postbuild.log">
<arg value="${sf.common.config.dir}/tools/zip_includefiles.pl"/>
</exec>
- <!-- cleanup my moving includefiles to logs and zips to zips\postbuild -->
+ <!-- cleanup my moving includefiles to logs and zips to zips\release -->
<move todir="${build.log.dir}">
<fileset dir="${build.drive}"><include name="*_includefile.txt"/></fileset>
</move>
- <move todir="${build.drive}/output/zips/postbuild">
- <fileset dir="${build.drive}"><include name="bin_rnd_*.zip"/></fileset>
+ <move todir="${build.drive}/output/zips/release">
+ <fileset dir="${build.drive}"><include name="bin*.zip"/></fileset>
</move>
<!-- TODO: merge with release_metadata.xml ? -->
</target>
@@ -668,8 +681,7 @@
<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/unzip_${build.id}_binaries_rnd.log">
<arg value="x"/>
<arg value="-y"/> <!-- Need to unpack in overwrite mode, due to TEF -->
- <arg value="-x@${sf.common.config.dir}/tools/lists/rebuiltok.txt"/>
- <arg value="${build.drive}/output/zips/bin_rnd*.zip"/>
+ <arg value="${build.drive}/output/zips/bin*.zip"/>
</exec>
</target>
@@ -736,6 +748,7 @@
<arg value="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/>
<arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/>
<arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>
+ <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${sf.spec.publish.diamonds.path}${diamonds.build.id}"/>
</exec>
<!-- Now ready to send to ATS3 -->
</target>
@@ -767,7 +780,7 @@
<arg value="${sf.common.config.dir}/tools/analysis/merge_csv.pl"/>
<arg value="${build.id}_what_results.csv"/>
<arg value="${build.id}_list_results.log"/>
- <arg value="${build.drive}/output/zips/postbuild/bin_rnd_internal_initial.zip"/>
+ <arg value="${build.drive}/output/zips/release/binaries_epoc_additional.zip"/>
</exec>
<exec executable="perl" dir="${build.log.dir}/analysis" failonerror="false" output="${build.log.dir}/analysis/${build.id}_analysecomponents.log">
@@ -893,7 +906,18 @@
</sequential>
</for>
</target>
-
+
+ <target name="sf-package-validate">
+ <exec executable="7z" dir="${build.drive}/output/zips" failonerror="false" output="${build.drive}/output/zips/validate.log">
+ <arg value="t"/>
+ <arg value="*.zip"/>
+ </exec>
+ <exec executable="7z" dir="${build.drive}/output/zips/release" failonerror="false" output="${build.drive}/output/zips/release/validate.log">
+ <arg value="t"/>
+ <arg value="*.zip"/>
+ </exec>
+ </target>
+
<target name="sf-run-evalid">
<delete dir="${build.drive}/output/md5"/>
<mkdir dir="${build.drive}/output/md5"/>
--- a/common/common_props.ant.xml Wed Jul 22 11:12:18 2009 +0100
+++ b/common/common_props.ant.xml Wed Jul 22 12:07:18 2009 +0100
@@ -15,7 +15,7 @@
<property name="sf.spec.systemdefinition.assemble" value="true"/>
<!-- property name="sf.spec.systemdefinition.file" value=""/ -->
- <property name="sf.spec.pdt.root" value="C:\Symbian\Tools\PDT_1.0"/>
+ <property name="sf.spec.pdt.root" value="${env.PDT_HOME}"/> <!-- e.g. C:\Symbian\Tools\PDT_1.0\ -->
<property name="sf.spec.sbs.config" value="armv5"/>
@@ -94,8 +94,8 @@
<property name="sf.spec.bccheck.enable.la" value="true"/>
<property name="sf.spec.bccheck.enable.ha" value="true"/>
<property name="sf.spec.bccheck.enable.dynamic" value="true"/>
- <property name="sf.spec.bccheck.baseline.name" value="SDK_3rd_Edition"/>
- <property name="sf.spec.bccheck.baseline.skd.dir" value="C:\Symbian\9.1\S60_3rd_MR\"/>
+ <property name="sf.spec.bccheck.baseline.name" value="symbian1"/>
+ <property name="sf.spec.bccheck.baseline.skd.dir" value="\\v800008\builds01\releases\installed\s60_5th_sdk_installed"/>
<property name="sf.spec.bccheck.baseline.s60.version" value="5.1"/>
<property name="sf.spec.bccheck.current.s60.version" value="5.1"/>
<property name="sf.spec.bccheck.reportid" value="report"/>
--- a/common/templates/source-spec.ant.xml.ftl Wed Jul 22 11:12:18 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl Wed Jul 22 12:07:18 2009 +0100
@@ -62,7 +62,7 @@
<exec executable="cmd" output="${ant['build.drive']}/output/logs/BOM/sources.csv" append="true">
<arg value="/c"/>
<arg value="echo"/>
- <arg value="${pkg_detail.source},${pkg_detail.dst},changeset,${dollar}{sf.sourcesync.${count}.checksum}"/>
+ <arg value="${pkg_detail.source},${pkg_detail.dst},changeset,${dollar}{sf.sourcesync.${count}.checksum},${pkg_detail.sysdef}"/>
</exec>
</sequential>
</target>
@@ -87,6 +87,7 @@
</parallel>
<echo message="Adding BOM header"/>
+ <mkdir dir="${ant['build.drive']}/output/logs/BOM/"/>
<exec executable="cmd" output="${ant['build.drive']}/output/logs/BOM/sources.csv" append="true">
<arg value="/c"/>
<arg value="echo"/>
--- a/common/templates/zip.cfg.xml.ftl.template Wed Jul 22 11:12:18 2009 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template Wed Jul 22 12:07:18 2009 +0100
@@ -41,6 +41,7 @@
<config name="src-by-layer" abstract="true">
<set name="grace.metadata" value="false" />
<set name="root.dir" value="${build.output.dir}/zips"/>
+ <set name="archives.dir" value="${build.output.dir}/zips/release" />
<!-- Zips of zips for SFL code -->
<config>
<set name="name" value="src_sfl_adaptation"/>
--- a/common/tools/populateziptemplate.pl Wed Jul 22 11:12:18 2009 +0100
+++ b/common/tools/populateziptemplate.pl Wed Jul 22 12:07:18 2009 +0100
@@ -92,7 +92,9 @@
elsif ($package->{source} =~ m{/rnd/([^/]+)/([^/]+)})
{
# RnD repository
- my $name = "bin_rnd_$1_$2";
+ my $name = "binaries_$2";
+ if ($1 eq "rndonly") { $name="bin_$1_$2";}
+
# Create a zip object
push @{$zipConfig->{config}->{config}->{src}->{config}->{rnd}->{config}},
{