--- a/common/build.xml Tue Jul 13 11:43:21 2010 +0100
+++ b/common/build.xml Tue Jul 13 14:22:34 2010 +0100
@@ -368,6 +368,8 @@
<arg value="-i"/>
</exec>
<echo message="${sf.job.bom.config.repo},sf-config,${sf.job.bom.config.checksum}" file="${build.drive}/output/logs/BOM/config.csv"/>
+ <!-- Record revision of config repository into BIT file -->
+ <echo message="content	config,${sf.job.bom.config.repo},${sf.job.bom.config.checksum}${line.separator}" file="${build.log.dir}/bitinfo.txt" append="true"/>
<exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.repo">
<arg value="showconfig"/>
@@ -379,6 +381,8 @@
<arg value="-i"/>
</exec>
<echo message="${sf.job.bom.project.repo},build/config,${sf.job.bom.project.checksum}" file="${build.drive}/output/logs/BOM/project.csv"/>
+ <!-- Record revision of project repository into BIT file -->
+ <echo message="content	project,${sf.job.bom.project.repo},${sf.job.bom.project.checksum}${line.separator}" file="${build.log.dir}/bitinfo.txt" append="true"/>
</target>
<target name="sf-get-utils">
@@ -391,6 +395,12 @@
<arg value="http://developer.symbian.org/oss/MCL/sftools/fbf/utilities"/>
<arg value="${build.drive}/utilities"/>
</exec>
+ <exec executable="hg" dir="${build.drive}/utilities" outputproperty="sf.job.bom.utilities.checksum">
+ <arg value="identify"/>
+ <arg value="-i"/>
+ </exec>
+ <!-- Record revision of utilities repository into BIT file -->
+ <echo message="content	utilities,http://developer.symbian.org/oss/MCL/sftools/fbf/utilities,${sf.job.bom.utilities.checksum}${line.separator}" file="${build.log.dir}/bitinfo.txt" append="true"/>
<stopwatch name="sf-get-utils" action="elapsed"/>
</target>
@@ -406,8 +416,9 @@
<then>
<stopwatch name="sf-getenvs (tools)"/>
- <!-- record toolsbaseline information in BOM file -->
+ <!-- record toolsbaseline information in BOM file and in BIT file -->
<echo message="${sf.spec.toolsbaseline.location}" file="${build.drive}/output/logs/BOM/toolsbaseline.txt"/>
+ <echo message="content	toolsbaseline,toolsbaseline,${sf.spec.toolsbaseline.location}${line.separator}" file="${build.log.dir}/bitinfo.txt" append="true"/>
<!-- wrapper around preparation-getenv but with diff params -->
<runtarget target="sf-getenv-tools"/>
@@ -426,8 +437,9 @@
<istrue value="${sf.spec.baseline.enable}" />
<then>
<stopwatch name="sf-getenvs (baseline)"/>
- <!-- record baseline information in BOM file -->
+ <!-- record baseline information in BOM file and in BIT file -->
<echo message="${sf.spec.baseline.location}" file="${build.drive}/output/logs/BOM/baseline.txt"/>
+ <echo message="content	baseline,baseline,${sf.spec.baseline.location}${line.separator}" file="${build.log.dir}/bitinfo.txt" append="true"/>
<!-- run internal target preparation-getenv -->
<delete file="${build.drive}/currentRelease.xml"/>
--- a/common/templates/source-spec.ant.xml.ftl Tue Jul 13 11:43:21 2010 +0100
+++ b/common/templates/source-spec.ant.xml.ftl Tue Jul 13 14:22:34 2010 +0100
@@ -184,8 +184,9 @@
</target>
<target name="sf-bom-info-${count}">
- <!-- record info on source code repo/rev in BOM file -->
+ <!-- record info on source code repo/rev in BOM file and in BIT file -->
<echo file="${ant['build.drive']}/output/logs/BOM/sources.csv" append="true" message="${dollar}{sources.${count}.URL},${pkg_detail.dst},changeset,${dollar}{sf.sourcesync.${count}.checksum},${pkg_detail.sysdef}${dollar}{line.separator}"/>
+ <echo message="content	sources,${dollar}{sources.${count}.URL},${dollar}{sf.sourcesync.${count}.checksum}
" file="${ant['build.log.dir']}/bitinfo.txt" append="true"/>
</target>
<target name="sf-bom-change-info-${count}">