# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1271250763 -3600
# Node ID ac316618673bfe7ad794887b1dfd91c094ffda36
# Parent  6cf4537e2fb58f6bc56591b2bd7ad5ec8e65fde6# Parent  a66215cc2b4abf9d8eb2a3de2be52fbeb3d68c5d
Merged changes from MCL

diff -r 6cf4537e2fb5 -r ac316618673b common/build.test.xml
--- a/common/build.test.xml	Wed Apr 14 14:11:02 2010 +0100
+++ b/common/build.test.xml	Wed Apr 14 14:12:43 2010 +0100
@@ -183,7 +183,7 @@
         </exec>
     </target>
 	<target name="sf-start-ats">        			
-	    <exec executable="${ats.drive}/start.cmd" dir="${ats.drive}" failonerror="false" spawn="true" vmlauncher="false" output="${build.log.dir}/ATS_${build.id}_start.log"/>
+	    <exec executable="${ats.drive}/start.cmd" dir="${ats.drive}" failonerror="false" spawn="true" vmlauncher="false"/>
 		<echo message="Waiting for 10 seconds to start the ATS Worker......."/>
 		<sleep seconds="10"/>
     </target> 
diff -r 6cf4537e2fb5 -r ac316618673b common/tools/brag/bragForDiamonds.xsl
--- a/common/tools/brag/bragForDiamonds.xsl	Wed Apr 14 14:11:02 2010 +0100
+++ b/common/tools/brag/bragForDiamonds.xsl	Wed Apr 14 14:12:43 2010 +0100
@@ -12,10 +12,9 @@
 	<build>
 	<status>
 	<xsl:choose>
-		<xsl:when test="$criticalCount != 0">Black</xsl:when>
-		<xsl:when test="$majorCount != 0">Red</xsl:when>
-		<xsl:when test="$unknownCount != 0">Red</xsl:when>
-		<xsl:when test="$minorCount != 0">Amber</xsl:when>
+		<xsl:when test="$criticalCount != 0">Red</xsl:when>
+		<xsl:when test="$majorCount != 0">Amber</xsl:when>
+		<xsl:when test="$unknownCount != 0">Amber</xsl:when>
 		<xsl:otherwise>Green</xsl:otherwise>
 	</xsl:choose>
 	</status>
diff -r 6cf4537e2fb5 -r ac316618673b common/tools/listdir.py
--- a/common/tools/listdir.py	Wed Apr 14 14:11:02 2010 +0100
+++ b/common/tools/listdir.py	Wed Apr 14 14:12:43 2010 +0100
@@ -26,9 +26,9 @@
   if(len(sys.argv)>2):
     x_dirs = string.lower(sys.argv[2])
     exclude_dirs = re.split(',', x_dirs)
-  scandir(directory, exclude_dirs)
+  scandir(directory, exclude_dirs,directory)
 
-def scandir(top, exclude_dirs):
+def scandir(top, exclude_dirs,directory):
     fixpath = re.compile('\\\\')    
     fixroot = re.compile('^%s\\\\' % top)
     for root, dirs, files in os.walk(top, topdown=True):
@@ -38,6 +38,6 @@
         for name in files:
             filename = os.path.join(root, name)
             fn = string.lower(fixpath.sub('/',fixroot.sub('',filename)))
-            print fn
+            print fn.strip(directory)
 
 main()
diff -r 6cf4537e2fb5 -r ac316618673b sf-tools/build.xml
--- a/sf-tools/build.xml	Wed Apr 14 14:11:02 2010 +0100
+++ b/sf-tools/build.xml	Wed Apr 14 14:12:43 2010 +0100
@@ -48,8 +48,10 @@
 
     <echo message="INFO Getting bootstrap environment listing"/>
     <antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.dir.location" value="${build.drive}/"/> 
+      <param name="sf.dir.exclude"  value="${build.drive}/epoc32/build"/>     
       <param name="sf.list.name" value="bootstrap"/>
-    </antcall>
+    </antcall>    
   </target>
   
   
@@ -89,12 +91,14 @@
 
  <target name="sf-package-binary">
 
-    <exec executable="7z" dir="${build.drive}/epoc32" output="${build.log.dir}/zip_${build.id}_binaries_${sf.spec.job.name}.log">
+    <exec executable="7z" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_${sf.spec.job.name}.log">
         <arg value="a"/>
         <arg value="-t${sf.spec.package.zip.format}"/>
         <arg value="-x@${build.log.dir}/listdir_${build.id}_bootstrap.log"/>
-        <arg value="-x!build\"/>
+        <arg value="-x!epoc32\build"/>
+        <arg value="-x!sf"/>
         <arg value="${build.drive}/output/zips/release/binaries_${sf.spec.job.name}.zip"/>
+        <arg value="epoc32\"/>
     </exec>
 
     <antcall target="sf-zip-content">