# HG changeset patch # User Brendan Donegan <brendand@symbian.org> # Date 1272457168 -3600 # Node ID a0358d9ffc076a30e7499fd5728d119cf6451347 # Parent 95924ae2e0d6fbbf6d861324bb0a5b7258fe40b6# Parent 8d8beff1fb8c175af02912873d605513ec4d97ab Merge diff -r 95924ae2e0d6 -r a0358d9ffc07 common/build.postbuild.xml --- a/common/build.postbuild.xml Wed Apr 28 13:18:29 2010 +0100 +++ b/common/build.postbuild.xml Wed Apr 28 13:19:28 2010 +0100 @@ -635,13 +635,18 @@ <target name="sf-compare-to-baseline" depends="sf-diamondize-bom,sf-check-utilities-dir" if="sf-utilities-available"> <property name="sf.releasenotes.wiki.txt" value="${build.log.dir}/releaseNotes.wiki.txt"/> <delete file="${sf.releasenotes.wiki.txt}"/> + <!-- FCL Usage and Changesets --> + <exec executable="perl" dir="${build.drive}" output="${sf.releasenotes.wiki.txt}"> + <arg value="${build.drive}/utilities/releaseAutomation/releaseNotes.pl"/> + <arg value="${build.log.dir}/BOM/sources.csv"/> + </exec> <!-- Package Comparison and FCL Usage --> - <exec executable="perl" dir="${sf.spec.sourcesync.sourcespecdir}" output="${sf.releasenotes.wiki.txt}"> + <exec executable="perl" dir="${sf.spec.sourcesync.sourcespecdir}" output="${sf.releasenotes.wiki.txt}" append="true"> <arg value="${build.drive}/utilities/releaseAutomation/packageComparison.pl"/> <arg value="--sources=${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/> - <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model.xml"/> - <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_os.xml"/> - <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_s60.xml"/> + <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model.xml"/> + <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_os.xml"/> + <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_s60.xml"/> <arg value="--baseline=${sf.previous.pdk.tag}"/> </exec> <!-- Mercurial comparison --> diff -r 95924ae2e0d6 -r a0358d9ffc07 common/build.test.xml --- a/common/build.test.xml Wed Apr 28 13:18:29 2010 +0100 +++ b/common/build.test.xml Wed Apr 28 13:19:28 2010 +0100 @@ -150,7 +150,7 @@ <echo message="INFO Creating smoketest testpackage"/> <exec executable="perl" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log"> <arg value="smoketest.pl"/> - <arg value="--target=${sf.spec.test.target}"/> + <arg value="--target=${sf.spec.test.target}"/> </exec> <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}" failonerror="false"/> @@ -171,6 +171,12 @@ <!-- Sending testdrop to ATS3 --> <target name="sf-send-testpkg" depends="sf-start-ats,sf-find-ATS-worker-root,sf-make-junction"> + <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/> + <then> + <delete file="${sf.spec.test.workerroot}/syborg.dtb" quiet="true"/> + <copy file="${build.drive}/epoc32/rom/syborg/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/> + </then> + </if> <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/> <echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name} path ${sf.spec.test.host.droppath}"/> <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_testdrop.log">