# HG changeset patch
# User dario
# Date 1240856873 -3600
# Node ID 8f01eb4a03268e373ec3dbd83471a27c1587ed15
# Parent  e8a4b4b53247827225539e48808a3de4cf8a6ee9# Parent  0d7e72114bf6529435fcf87f7308d57c152878ac
Merge

diff -r 0d7e72114bf6 -r 8f01eb4a0326 common/build.xml
--- a/common/build.xml	Mon Apr 27 19:21:13 2009 +0100
+++ b/common/build.xml	Mon Apr 27 19:27:53 2009 +0100
@@ -293,6 +293,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>
 
 </project>
 
diff -r 0d7e72114bf6 -r 8f01eb4a0326 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Mon Apr 27 19:21:13 2009 +0100
+++ b/common/common_props.ant.xml	Mon Apr 27 19:27:53 2009 +0100
@@ -15,7 +15,8 @@
     <property name="sf.spec.systemdefinition.assemble" value="true"/>
     <!-- property name="sf.spec.systemdefinition.file" value=""/ -->
     
-    <property name="sf.spec.sbs.config" value="armv5"/>
+    <!-- property name="sf.spec.sbs.config" value="armv5"/ -->
+    <property name="sf.spec.sbs.config" value="winscw"/>
     
     <property name="sf.spec.build.target" value="all"/>
     <property name="sf.spec.build.variant" value=""/>
@@ -57,7 +58,7 @@
     <property name="sf.spec.dirdelta.enable" value="false"/>
     
     <!-- prefilter raptor logs -->
-    <property name="sf.spec.logs.raptorfilter.enable" value="true"/>
+    <property name="sf.spec.logs.raptorfilter.enable" value="false"/>
     
     <!-- zip all logs before publish -->
     <property name="sf.spec.logs.zip.enable"  value="true"/>
diff -r 0d7e72114bf6 -r 8f01eb4a0326 sf-package/build.xml
--- a/sf-package/build.xml	Mon Apr 27 19:21:13 2009 +0100
+++ b/sf-package/build.xml	Mon Apr 27 19:27:53 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,156 @@
   <!-- 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:argSet id="sbs.main.what.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="WHAT" />
+    </hlm:argSet>
+    
+    <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>
+    
+    <hlm:argSet id="sbs.tools2.clean.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:arg name="command" value="CLEAN" />
+    </hlm:argSet>
+    
+    <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>
+    
+    <hlm:argSet id="sbs.tools.clean.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:arg name="command" value="CLEAN" />
+    </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="${sf.spec.logs.raptorfilter.enable}" />
+    </hlm:argSet>
+    
+    <hlm:argSet id="sbs.main.sbs.var">
+      <hlm:arg name="config" value="${sf.spec.sbs.config}" />
+      <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+    </hlm:argSet>
+    
+    <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
+    <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
+    
+    <!-- generate baseline dir list to allow delta creation -->
+    <!-- antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="baseline"/>
+    </antcall -->
+    
+    <!-- OS what -->
+    <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.main.what.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>
+    
+    <!-- OS clean main build -->
+    <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.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>
+    
+    <!--antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="post-clean"/>
+    </antcall -->
+    
+    <!-- what has been cleaned from baseline PDK by sos model -->
+    <!-- antcall target="sf-delta-dir" inheritAll="false">
+      <param name="sf.list_a.name" value="baseline"/>
+      <param name="sf.list_b.name" value="post-clean"/>
+    </antcall -->
+    
+    <!-- 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.system.definition.files" torefid="system.definition.files" />
+    </antcall>
+    
+    <!-- antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="post-build-tools2"/>
+    </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}" / -->
+      <!-- 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.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>
+    
+    <!-- antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="post-build-tools"/>
+    </antcall -->
+    
+    <!-- OS main build -->
+    <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.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>
+    
+    <!-- antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.list.name" value="post-build-main"/>
+    </antcall -->
+    
+    <!-- what has been built in tools2+tools+main -->
+    <!-- antcall target="sf-delta-dir" inheritAll="false">
+      <param name="sf.list_a.name" value="post-clean"/>
+      <param name="sf.list_b.name" value="post-build-main"/>
+    </antcall -->
+    
+    <!-- what has been cleaned and rebuilt -->
+    <!-- antcall target="sf-intersect-dir" inheritAll="false">
+      <param name="sf.list_a.name" value="post-clean_delta"/>
+      <param name="sf.list_b.name" value="post-build-main_delta"/>
+    </antcall -->
+    
+    <!-- what has been cleaned and not rebuilt -->
+    
+  </target>
+  
 </project>
 
diff -r 0d7e72114bf6 -r 8f01eb4a0326 sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Mon Apr 27 19:21:13 2009 +0100
+++ b/sf-package/package_props.ant.xml	Mon Apr 27 19:27:53 2009 +0100
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 
 <project name="SF-PACKAGE-PROPS">
-
+  <property name="sf.spec.baseline.getenv_options" value="-i emu -i patch"/>
+  
   <property name="sf.spec.baseline.enable" value="true"/>
   <property name="sf.spec.baseline.select" value="location"/>
   <property name="sf.spec.baseline.location" value="\\lon-engbuild89\d$\GRACE\PDK_20090401"/>
diff -r 0d7e72114bf6 -r 8f01eb4a0326 sf-package/package_refs.ant.xml
--- a/sf-package/package_refs.ant.xml	Mon Apr 27 19:21:13 2009 +0100
+++ b/sf-package/package_refs.ant.xml	Mon Apr 27 19:27:53 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