--- a/common/build.xml	Thu Apr 09 12:44:31 2009 +0100
+++ b/common/build.xml	Thu Apr 09 13:39:43 2009 +0100
@@ -80,15 +80,15 @@
         <echo>[SF-PREBUILD]</echo>
         
         <!-- create BOM dir -->
-        <mkdir dir="${build.drive}/output/BOM"/>
+        <mkdir dir="${build.drive}/output/logs/BOM"/>
         
         <if>
             <istrue value="${sf.spec.baseline.enable}" />
             <then>
             
                 <!-- record baseline information in BOM file -->
-                <delete file="${build.drive}/output/BOM/baseline.txt" quiet="true"/>
-                <exec executable="cmd" output="${build.drive}/output/BOM/baseline.txt">
+                <delete file="${build.drive}/output/logs/BOM/baseline.txt" quiet="true"/>
+                <exec executable="cmd" output="${build.drive}/output/logs/BOM/baseline.txt">
                     <arg value="/c"/>
                     <arg value="echo"/>
                     <arg value="${sf.spec.baseline.location}"/>

--- a/common/templates/source-spec.ant.xml.ftl	Thu Apr 09 12:44:31 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl	Thu Apr 09 13:39:43 2009 +0100
@@ -8,7 +8,7 @@
 
     <!-- remove previous version of BOM file (if exists)  -->
     <target name="reset-bom-sources-csv">
-        <delete file="${ant['build.drive']}/output/BOM/sources.csv" quiet="true"/>
+        <delete file="${ant['build.drive']}/output/logs/BOM/sources.csv" quiet="true"/>
     </target>
 
 <#list data as pkg_detail>
@@ -32,13 +32,17 @@
             <!-- record info on source code repo/rev in BOM file  -->
             <exec executable="hg" dir="${ant['build.drive']}${pkg_detail.dst}" outputproperty="sf.sourcesync.${count}.rev">
                 <arg value="identify"/>
+                <arg value="-n"/>
+            </exec>
+            <exec executable="hg" dir="${ant['build.drive']}${pkg_detail.dst}" outputproperty="sf.sourcesync.${count}.checksum">
+                <arg value="identify"/>
                 <arg value="-i"/>
             </exec>
-            <echo message="dir ${ant['build.drive']}${pkg_detail.dst} : revision ${dollar}{sf.sourcesync.${count}.rev}"/>
-            <exec executable="cmd" output="${ant['build.drive']}/output/BOM/sources.csv" append="true">
+            <echo message="dir ${ant['build.drive']}${pkg_detail.dst} : revision ${dollar}{sf.sourcesync.${count}.rev}:${dollar}{sf.sourcesync.${count}.checksum}"/>
+            <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},${dollar}{sf.sourcesync.${count}.rev}"/>
+                <arg value="${pkg_detail.source},${pkg_detail.dst},${dollar}{sf.sourcesync.${count}.rev}:${dollar}{sf.sourcesync.${count}.checksum}"/>
             </exec>
         
         </sequential>