# HG changeset patch
# User darios@symbian.org
# Date 1243614047 -3600
# Node ID d5964b46ccafcbecb90e9618e085f3ffa7fcbaaf
# Parent  56e7098e1ace22d3bb5d4cf300db7c31a558afd2# Parent  18300635256d56c60a487776eb6dc33d73b362b0
Catchup from default config

diff -r 18300635256d -r d5964b46ccaf common/build.xml
--- a/common/build.xml	Fri May 29 08:46:24 2009 +0100
+++ b/common/build.xml	Fri May 29 17:20:47 2009 +0100
@@ -131,7 +131,7 @@
                     <arg value="${sf.spec.baseline.location}"/>
                 </exec>
                 
-                <!-- run interal target preparation-getenv -->
+                <!-- run internal target preparation-getenv -->
                 <runtarget target="preparation-getenv"/>
                 
             </then>
@@ -341,6 +341,24 @@
             </data>
         </fmpp>
     </target>
+    
+  <target name="generate-layers">
+    <echo message="canno-file:${canonical.sysdef.file}"/>
+    <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
+
+    <!-- All we want is a sysdef with the config name appended, so just copy it -->
+    <echo message="INFO: Skip GenXML and copy sysdef to sysdef+config name"/>
+    <copy file="${canonical.sysdef.file}" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
+
+    <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml">
+      <filterchain>
+        <linecontainsregexp negate="true">
+          <regexp pattern="^\s*$"/>
+        </linecontainsregexp>
+      </filterchain>
+    </copy>
+    <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
+  </target>
 
     <target name="sf-preprocess-package-config">
         <mkdir dir="${sf.common.config.dir}/generated"/>
diff -r 18300635256d -r d5964b46ccaf common/common_props.ant.xml
diff -r 18300635256d -r d5964b46ccaf sf-package/build.xml
--- a/sf-package/build.xml	Fri May 29 08:46:24 2009 +0100
+++ b/sf-package/build.xml	Fri May 29 17:20:47 2009 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="SF-PACKAGE-CONFIG">
+<project name="SF-PACKAGE-CONFIG" xmlns:hlm="http://www.nokia.com/helium">
   <!-- location of this config -->
   <dirname property="sf.package.config.dir" file="${ant.file.SF-PACKAGE-CONFIG}"/>
   
@@ -12,5 +12,85 @@
   <!-- import package references -->
   <import file="${sf.package.config.dir}/package_refs.ant.xml" />
   
+  <target name="sf-compile">
+    <runtarget target="sf-package-compile"/>
+  </target>
+  
+  <target name="sf-package-compile">
+    
+    <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
+    <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
+    
+    <!-- CLEAN -->
+    <hlm:argSet id="sbs.main.clean.sbs.var">
+      <hlm:arg name="config" value="${sf.spec.sbs.config}" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+      <hlm:arg name="command" value="CLEAN" />
+    </hlm:argSet>
+    <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.sysdef.configurations.list}" />
+      <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ -->
+      <reference refid="sbs.main.clean.sbs.var" torefid="sbs.var" />
+      <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- BUILD tools2 -->
+    <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="${sf.spec.logs.raptorfilter.enable}" />
+    </hlm:argSet>
+    <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.sysdef.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.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- BUILD tools -->
+    <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="${sf.spec.logs.raptorfilter.enable}" />
+    </hlm:argSet>
+    <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.sysdef.configurations.list}" />
+      <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ -->
+      <reference refid="sbs.tools.var" torefid="sbs.var" />
+      <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- BUILD -->
+    <hlm:argSet id="sbs.main.sbs.var">
+      <hlm:arg name="config" value="${sf.spec.sbs.config}.whatlog" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+    </hlm:argSet>
+    <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.sysdef.configurations.list}" />
+      <!-- param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/ -->
+      <reference refid="sbs.main.sbs.var" torefid="sbs.var" />
+      <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+      <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- CHECK -->
+    <exec executable="cmd" dir="${build.drive}/" output="${build.drive}/output\logs\build_check_compile.log">
+      <arg value="/c sbs.bat -s ${build.drive}/output\build\canonical_system_definition_SF.xml -k -c ${sf.spec.sbs.config} -j 32 --check -m ${build.drive}/output\logs\build_check_Makefile"/>
+      <!-- argument of -j option can be parameterized with: ${number.of.threads} -->
+    </exec>
+    
+  </target>
+  
 </project>
 
diff -r 18300635256d -r d5964b46ccaf sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Fri May 29 08:46:24 2009 +0100
+++ b/sf-package/package_props.ant.xml	Fri May 29 17:20:47 2009 +0100
@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
 
-<project name="SF-PACKAGE-PROPS"/>
+<project name="SF-PACKAGE-PROPS">
+  
+  <property name="sf.spec.baseline.enable" value="true"/>
+  <property name="sf.spec.baseline.select" value="location"/>
+  <property name="sf.spec.baseline.location" value="\\lon-engbuild87\d$\PDK\PDK_candidate_1"/>
+  <property name="sf.spec.baseline.getenv_options" value="-i emu -i rnd"/>
+  
+  <property name="sf.spec.systemdefinition.assemble" value="false"/>
+  <property name="sf.spec.sysdef.configurations.list" value="SF"/>
+  
+  <property name="sf.spec.sbs.config" value="winscw"/>
+  
+  <!-- property name="sf.spec.publish.networkdrive" value="\\sym-build01\f$\SF_builds"/ -->
+  <!-- property name="sf.spec.publish.rootdir" value="\\sym-build01\f$\SF_builds"/ -->
+  
+  <property name="sf.spec.publish.networkdrive" value="D:\SF_builds"/>
+  <property name="sf.spec.publish.rootdir" value="D:\SF_builds"/>
 
+</project>
+
diff -r 18300635256d -r d5964b46ccaf sf-package/package_refs.ant.xml
--- a/sf-package/package_refs.ant.xml	Fri May 29 08:46:24 2009 +0100
+++ b/sf-package/package_refs.ant.xml	Fri May 29 17:20:47 2009 +0100
@@ -1,3 +1,11 @@
 <?xml version="1.0"?>
 
-<project name="SF-PACKAGE-REFS"/>
\ No newline at end of file
+<project name="SF-PACKAGE-REFS">
+
+  <path id="sf.spec.system.definition.files">
+    <fileset dir="${sf.spec.job.drive}/" casesensitive="false">
+      <include name="${sf.spec.systemdefinition.location}" />
+    </fileset>
+  </path>
+
+  </project>
\ No newline at end of file
diff -r 18300635256d -r d5964b46ccaf sf-platform/build.xml
--- a/sf-platform/build.xml	Fri May 29 08:46:24 2009 +0100
+++ b/sf-platform/build.xml	Fri May 29 17:20:47 2009 +0100
@@ -88,24 +88,6 @@
         </for>
     </target>
 
-    <target name="generate-layers">
-       <echo message="canno-file:${canonical.sysdef.file}"/>
-       <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
-
-       <!-- All we want is a sysdef with the config name appended, so just copy it -->
-       <echo message="INFO: Skip GenXML and copy sysdef to sysdef+config name"/>
-       <copy file="${canonical.sysdef.file}" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
-
-	<copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml">
-		<filterchain>
-			<linecontainsregexp negate="true">
-			  <regexp pattern="^\s*$"/>
-			</linecontainsregexp>
-		</filterchain>
-	</copy>
-	<delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
-	</target>
-
   <!--
     == Name: SF-COMPILE
     ==