# HG changeset patch
# User Louis Henry Nayegon <louisn@symbian.org>
# Date 1247560201 -3600
# Node ID 60e228580ee89ec072949b036a5419d9e5b94d06
# Parent  516def754cd84520485b635483237b7e90965eca# Parent  52c893932513e1da0bfac21ca9246f2f2f6c6777
merge

diff -r 516def754cd8 -r 60e228580ee8 common/build.xml
--- a/common/build.xml	Tue Jul 14 09:28:38 2009 +0100
+++ b/common/build.xml	Tue Jul 14 09:30:01 2009 +0100
@@ -506,7 +506,7 @@
                 project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]})
                 baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim})
                 toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim})
-                sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,rev]})              
+                sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]})              
             </data>
         </fmpp>
         <!-- Make a copy in BOM dir -->
@@ -683,7 +683,6 @@
             <arg value="--device-name=ATSINTERFACE 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}"/>
-
         </exec>
         <!-- Now ready to send to ATS3 -->
     </target>   
diff -r 516def754cd8 -r 60e228580ee8 common/templates/build-info.xml.ftl
--- a/common/templates/build-info.xml.ftl	Tue Jul 14 09:28:38 2009 +0100
+++ b/common/templates/build-info.xml.ftl	Tue Jul 14 09:30:01 2009 +0100
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<#assign row = 0 />
+
 <diamonds-build>
   <content>
     <project>
@@ -28,7 +31,10 @@
     <project>
  	  <name>Sources</name>
  	  <#list sources as s>
+	  <#if (row!=0)>
  	  <baseline>${s.loc}#${s.rev}</baseline>
+	  </#if>
+	  <#assign row = row + 1 />
  	  </#list>
     </project>
   </content>
diff -r 516def754cd8 -r 60e228580ee8 common/templates/source-spec.ant.xml.ftl
--- a/common/templates/source-spec.ant.xml.ftl	Tue Jul 14 09:28:38 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl	Tue Jul 14 09:30:01 2009 +0100
@@ -18,18 +18,34 @@
             <#assign fileset = "${fileset}"  />
         </#if>
         <sequential>
+            <!-- create sf\layer dir  -->
             <delete dir="${ant['build.drive']}${pkg_detail.dst}" failonerror="false"/>
             <mkdir dir="${ant['build.drive']}${pkg_detail.dst}"/>
+            <delete dir="${ant['build.drive']}${pkg_detail.dst}" failonerror="false"/>
+
+            <exec executable="hg" dir="${ant['build.drive']}">
+                <arg value="clone"/>
+                <arg value="-U"/>
+                <arg value="${pkg_detail.source}"/>
+                <arg value="${ant['build.drive']}${pkg_detail.dst}"/>
+            </exec>
+
             <hlm:scm verbose="true" scmUrl="scm:hg:${pkg_detail.source}">
-                <hlm:checkout basedir="${ant['build.drive']}${pkg_detail.dst}"/>
+                <!--hlm:checkout basedir="${ant['build.drive']}${pkg_detail.dst}"/-->
+                <#if "${pkg_detail.type}"=="tag" >
                 <hlm:tags basedir="${ant['build.drive']}${pkg_detail.dst}" reference="hg.tags.id${dollar}{refid}"/>
                 <hlm:update basedir="${ant['build.drive']}${pkg_detail.dst}">
-                    <hlm:latestTag pattern="${pkg_detail.tag}">
+                <hlm:latestTag pattern="${pkg_detail.pattern}">
                         <hlm:tagSet refid="hg.tags.id${dollar}{refid}" />
-                    </hlm:latestTag>
+                </hlm:latestTag>
                 </hlm:update>
+                </#if>
+                <#if "${pkg_detail.type}"== "changeset" || "${pkg_detail.type}"=="branch">
+                <hlm:update basedir="${ant['build.drive']}${pkg_detail.dst}">
+                     <hlm:tag name="${pkg_detail.pattern}"/>
+                </hlm:update>
+                </#if>
             </hlm:scm>
-        
         </sequential>
     </target>
 
@@ -38,26 +54,21 @@
         <sequential>
             
             <!-- 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}:${dollar}{sf.sourcesync.${count}.checksum}"/>
+            <echo message="dir ${ant['build.drive']}${pkg_detail.dst} : ${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}:${dollar}{sf.sourcesync.${count}.checksum}"/>
+                <arg value="${pkg_detail.source},${pkg_detail.dst},changeset,${dollar}{sf.sourcesync.${count}.checksum}"/>
             </exec>
-        
         </sequential>
     </target>
 
 
-    <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.pattern}\"/>" />       
+    <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.sysdef}\"/>" />       
     <#assign sync_list = "${sync_list}" + "<runtarget target=\"sf-prebuild-${count}\"/>\n"/>       
     <#assign bom_list = "${bom_list}" + "<runtarget target=\"sf-bom-info-${count}\"/>\n"/>    
     <#assign count = count + 1 />
@@ -75,7 +86,13 @@
     ${sync_list}
   </parallel>
 
-
+  <echo message="Adding BOM header"/>
+      <exec executable="cmd" output="${ant['build.drive']}/output/logs/BOM/sources.csv" append="true">
+      <arg value="/c"/>
+      <arg value="echo"/>
+      <arg value="source,dst,type,pattern,sysdef"/>
+  </exec>
+  
   ${bom_list}
 
 </target>
diff -r 516def754cd8 -r 60e228580ee8 common/tools/analysis/find_collisions.pl
--- a/common/tools/analysis/find_collisions.pl	Tue Jul 14 09:28:38 2009 +0100
+++ b/common/tools/analysis/find_collisions.pl	Tue Jul 14 09:30:01 2009 +0100
@@ -135,30 +135,31 @@
   {
     if(-e $left && -e $right)
     {
-      my $leftdiff = 0;
-      my $rightdiff = 0;
-      open(DIFF,"diff $left $target|") or die "couldn't execute diff";
-      print "diff $left $target\n";
+      my $leftdiff = 1;
+      my $rightdiff = 1;
+      open(DIFF,"fc $left $target|") or die "couldn't execute fc";
+      print "fc $left $target\n";
       
       while(my $line = <DIFF>)
       {
-        if($line =~ m/\S+/)
+        
+        if($line =~ m/FC:\sno\sdifferences\sencountered/i)
         {
-          $leftdiff = 1;
-          print "\t$line";
+          $leftdiff = 0;
         }
+        print "\t$line";
       }
       close DIFF;
 
-      open(DIFF,"diff $right $target|") or die "couldn't execute diff";
-      print "diff $right $target\n";
+      open(DIFF,"fc $right $target|") or die "couldn't execute fc";
+      print "fc $right $target\n";
       while( my $line = <DIFF>)
       {
-        if($line =~ m/\S+/)
+        if($line =~ m/FC:\sno\sdifferences\sencountered/i)
         {
-          $rightdiff = 1;
-         print "\t$line";
+          $rightdiff = 0;
         }
+        print "\t$line";
       }
       close DIFF;