# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1253529219 -3600
# Node ID fa59cc9be54992f453a76236ce3fbd4cf95cdf95
# Parent  eadcd4405e6ae8a6637de4f21d6d4734d079ffe7
Bug 365 build-info.xml - BOM for config & project in different format to sources

Fixed the part of the discrepancy: the local revision numbers being included in the BOM output.

diff -r eadcd4405e6a -r fa59cc9be549 common/build.xml
--- a/common/build.xml	Fri Sep 18 14:57:48 2009 +0100
+++ b/common/build.xml	Mon Sep 21 11:33:39 2009 +0100
@@ -229,31 +229,21 @@
             <arg value="showconfig"/>
             <arg value="paths.default"/>
         </exec>
-        <exec executable="hg" dir="${sf.config.dir}" outputproperty="sf.job.bom.config.rev">
-            <arg value="identify"/>
-            <arg value="-n"/>
-        </exec>
         <exec executable="hg" dir="${sf.config.dir}" outputproperty="sf.job.bom.config.checksum">
             <arg value="identify"/>
             <arg value="-i"/>
         </exec>
-        <echo message="dir ${sf.config.dir} : revision ${sf.job.bom.config.rev}:${sf.job.bom.config.checksum}"/>
-        <echo message="${sf.job.bom.config.repo},sf-config,${sf.job.bom.config.rev}:${sf.job.bom.config.checksum}" file="${build.drive}/output/logs/BOM/config.csv"/>
+        <echo message="${sf.job.bom.config.repo},sf-config,${sf.job.bom.config.checksum}" file="${build.drive}/output/logs/BOM/config.csv"/>
 
         <exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.repo">
             <arg value="showconfig"/>
             <arg value="paths.default"/>
         </exec>
-        <exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.rev">
-            <arg value="identify"/>
-            <arg value="-n"/>
-        </exec>
         <exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.checksum">
             <arg value="identify"/>
             <arg value="-i"/>
         </exec>
-        <echo message="dir ${sf.project.location} : revision ${sf.job.bom.project.rev}:${sf.job.bom.project.checksum}"/>
-	<echo message="${sf.job.bom.project.repo},build/config,${sf.job.bom.project.rev}:${sf.job.bom.project.checksum}" file="${build.drive}/output/logs/BOM/project.csv"/>
+	<echo message="${sf.job.bom.project.repo},build/config,${sf.job.bom.project.checksum}" file="${build.drive}/output/logs/BOM/project.csv"/>
     </target>
 
     <target name="sf-getenvs">
@@ -419,7 +409,7 @@
         <ant antfile="${sf.common.config.dir}/generated/source-spec.ant.xml" />
     </target>
     
-    <target name="sf-diamondize-bom">
+    <target name="sf-diamondize-bom" depends="sf-record-proj-conf-bom">
         <if>
             <istrue value="${sf.spec.publish.enable}"/>
             <then>