--- a/common/templates/source-spec.ant.xml.ftl	Mon Mar 30 13:05:39 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl	Tue Mar 31 15:06:33 2009 +0100
@@ -2,7 +2,7 @@
 <project name="SF-SOURCESPEC" default="all" xmlns:hlm="http://www.nokia.com/helium">
 
 <#assign fileset = "" />
-<#assign target_depends = "" />
+<#assign sync_list = "" />
 <#assign dollar = "$"/>
 <#assign count = 0 />
 
@@ -25,15 +25,9 @@
             </hlm:scm>
         </sequential>
     </target>
-    <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.pattern}\"/>" />
     
-    <#if (count == 0) >
-    				<#assign target_depends = "${target_depends}" + "sf-prebuild-${count}" />
-    </#if>
-    <#if (count > 0) >
-            <#assign target_depends ="${target_depends}" + ","+"sf-prebuild-${count}"/>
-    </#if>
-    
+    <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.pattern}\"/>" />       
+    <#assign sync_list = "${sync_list}" + "<runtarget target=\"sf-prebuild-${count}\"/>\n"/>    
     <#assign count = count + 1 />
 
 </#list>
@@ -43,6 +37,11 @@
         ${fileset}
     </path>
 
-<target name="all" depends="${target_depends}"/>
+<target name="all">
 
+  <parallel>
+    ${sync_list}
+  </parallel>
+
+</target>
 </project>
\ No newline at end of file

--- a/sf-platform/build.xml	Mon Mar 30 13:05:39 2009 +0100
+++ b/sf-platform/build.xml	Tue Mar 31 15:06:33 2009 +0100
@@ -106,8 +106,14 @@
     -->
   <target name="sf-os-compile">
       
-        <hlm:argSet id="sbs.tools.var">
-                <hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
+        <hlm:argSet id="sbs.tools2.var">
+                <hlm:arg name="config" value="tools2_rel" />
+                <hlm:arg name="singlejob" value="false" />
+                <hlm:arg name="enable-filter" value="true" />
+        </hlm:argSet>
+        
+        <hlm:argSet id="sbs.tools.var"> 
+                <hlm:arg name="config" value="tools_rel" />
                 <hlm:arg name="singlejob" value="true" />
                 <hlm:arg name="enable-filter" value="true" />
         </hlm:argSet>
@@ -120,7 +126,18 @@
         <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
         <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
 
-        <!-- OS tools build -->
+        <!-- OS tools2 build first-->
+        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+                <param name="build.system" value="${sf.spec.build.system}" />
+                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
+                <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
+                <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
+                <reference refid="sbs.tools2.var" torefid="sbs.var" />
+                <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
+                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
+        </antcall>
+
+        <!-- OS tools build after tools2 -->
         <antcall target="compile-main" inheritAll="false" inheritRefs="true">
                 <param name="build.system" value="${sf.spec.build.system}" />
                 <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />