# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1250702004 -3600
# Node ID 13fa826ea048a590ebd99890b3f66adf422a3e03
# Parent  cb0ec85c881d7032099bff29dffcbfa3dfef5db6# Parent  bed8f6bc974ba1b649f86c0d0ef208f6577c0cb9
Merge

diff -r bed8f6bc974b -r 13fa826ea048 common/build.xml
--- a/common/build.xml	Wed Aug 19 14:19:16 2009 +0100
+++ b/common/build.xml	Wed Aug 19 18:13:24 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 bed8f6bc974b -r 13fa826ea048 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Wed Aug 19 14:19:16 2009 +0100
+++ b/common/common_props.ant.xml	Wed Aug 19 18:13:24 2009 +0100
@@ -20,6 +20,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 bed8f6bc974b -r 13fa826ea048 sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Wed Aug 19 14:19:16 2009 +0100
+++ b/sf-package/package_props.ant.xml	Wed Aug 19 18:13:24 2009 +0100
@@ -23,6 +23,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"/>