# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1251108999 -3600
# Node ID 2db82c4a99dadb9a856d886f1b42acc1cb5ee84b
# Parent  65e81f48fe17a4c927b27f317231c0e4cb03280a# Parent  fcb6057a80094beccbc15368f127c04b7f96a143
catchup merge

diff -r 65e81f48fe17 -r 2db82c4a99da common/build.postbuild.xml
--- a/common/build.postbuild.xml	Mon Aug 24 11:04:30 2009 +0100
+++ b/common/build.postbuild.xml	Mon Aug 24 11:16:39 2009 +0100
@@ -350,8 +350,8 @@
             <!-- Now iterate through the generated TSVs to sort them and remove duplicates -->
       <for param="tsv">
         <path>
-          <fileset dir="${build.log.dir}/releaseables">
-            <include name="**/*.tsv"/>
+          <fileset dir="${build.log.dir}">
+            <include name="releaseables/**/*.tsv"/>
           </fileset>
         </path>
         <sequential>
diff -r 65e81f48fe17 -r 2db82c4a99da common/build.xml
--- a/common/build.xml	Mon Aug 24 11:04:30 2009 +0100
+++ b/common/build.xml	Mon Aug 24 11:16:39 2009 +0100
@@ -27,6 +27,12 @@
     <property name="build.system" value="${sf.spec.build.system}"/>
     <property name="base_release.path" value="${sf.spec.baseline.location}"/>
     <property name="base_release.getenv_options" value="${sf.spec.baseline.getenv_options}"/>
+    <if>
+      <isset property="sf.spec.sbs.numberofjobs"/>
+      <then>
+        <property name="number.of.threads" value="${sf.spec.sbs.numberofjobs}"/>
+      </then>
+    </if>
     
     <!-- SF-specific Helium properties not meant to be exposed in the project spec -->
     <property name="diamonds.listener.configuration.file" location="${sf.common.config.dir}/diamonds/config.xml.ftl"/>
diff -r 65e81f48fe17 -r 2db82c4a99da common/common_props.ant.xml
--- a/common/common_props.ant.xml	Mon Aug 24 11:04:30 2009 +0100
+++ b/common/common_props.ant.xml	Mon Aug 24 11:16:39 2009 +0100
@@ -18,6 +18,10 @@
 
     <property name="sf.spec.sbs.config" value="armv5"/>
     
+    <!-- When not set -j option is to: 2 X NUMBER_OF_PROCESSORS
+    <property name="sf.spec.sbs.numberofjobs" value="2"/>
+    -->
+    
     <property name="sf.spec.build.target" value="all"/>
     <property name="sf.spec.build.variant" value=""/>
     <property name="sf.spec.build.productioncode.enable" value="true"/>
diff -r 65e81f48fe17 -r 2db82c4a99da common/templates/truclean.ant.xml.ftl
--- a/common/templates/truclean.ant.xml.ftl	Mon Aug 24 11:04:30 2009 +0100
+++ b/common/templates/truclean.ant.xml.ftl	Mon Aug 24 11:16:39 2009 +0100
@@ -6,6 +6,8 @@
 <#assign dollar="$"/>
 
 <#list data as pkg_detail>
+  <#if pkg_detail.sysdef != "">
+  
 <target name="sf-truclean-${count}">
   <sequential>
     <propertyregex override="yes" property="package"  input="${pkg_detail.dst}" regexp=".*sf[\\\/]([^\\^\/]+)[\\\/]([^\\^\/]+)" replace="\1/\2"/>
@@ -25,6 +27,8 @@
     <#assign target_depends="${target_depends}"+","+"sf-truclean-${count}"/>
   </#if>
   <#assign count=count+1/>
+
+  </#if>
 </#list>
 
 <target name="all" depends="${target_depends}"/>
diff -r 65e81f48fe17 -r 2db82c4a99da sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Mon Aug 24 11:04:30 2009 +0100
+++ b/sf-package/package_props.ant.xml	Mon Aug 24 11:16:39 2009 +0100
@@ -25,6 +25,7 @@
   <property name="sf.spec.sysdef.configurations.list" value="SF"/>
   
   <property name="sf.spec.sbs.config" value="winscw"/>
+  <property name="sf.spec.sbs.numberofjobs" value="2"/>
   
   <property name="sf.spec.logs.raptorfilter.enable" value="false"/>