# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1255949133 -3600
# Node ID 590e02565f6e1a7b8be377aa69a962a4693f7ea3
# Parent  a1c334483262685a077894a2bfe3fdcff23879f7# Parent  666c8141baad6bade8236a502c795caa25d1bea1
catchup merge of tags.

diff -r 666c8141baad -r 590e02565f6e symbian2/micro/job_props.ant.xml
--- a/symbian2/micro/job_props.ant.xml	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian2/micro/job_props.ant.xml	Mon Oct 19 11:45:33 2009 +0100
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.e" />
+    <property name="sf.previous.pdk.tag" value="PDK_2.0.0" />
 
     <property name="sf.spec.corebuildversion" value="week19"/>
     
diff -r 666c8141baad -r 590e02565f6e symbian2/single/job_props.ant.xml
--- a/symbian2/single/job_props.ant.xml	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian2/single/job_props.ant.xml	Mon Oct 19 11:45:33 2009 +0100
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.e" />
+    <property name="sf.previous.pdk.tag" value="PDK_2.0.0" />
 
     <property name="sf.spec.job.name" value="symbian2"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
diff -r 666c8141baad -r 590e02565f6e symbian2/single/sources_fcl.csv
--- a/symbian2/single/sources_fcl.csv	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian2/single/sources_fcl.csv	Mon Oct 19 11:45:33 2009 +0100
@@ -13,7 +13,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,RCL_1,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_1,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/adaptation/QEMU,branch,default,
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/adaptation/qemu/,/sf/adaptation/QEMU,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,RCL_1,layers.sysdef.xml
diff -r 666c8141baad -r 590e02565f6e symbian2/split/job_props.ant.xml
--- a/symbian2/split/job_props.ant.xml	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian2/split/job_props.ant.xml	Mon Oct 19 11:45:33 2009 +0100
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
     
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.e" />
+    <property name="sf.previous.pdk.tag" value="PDK_2.0.0" />
     
     <property name="sf.spec.job.name" value="symbian2"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
diff -r 666c8141baad -r 590e02565f6e symbian2/split/sources_fcl.csv
--- a/symbian2/split/sources_fcl.csv	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian2/split/sources_fcl.csv	Mon Oct 19 11:45:33 2009 +0100
@@ -13,7 +13,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,RCL_1,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,RCL_1,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/adaptation/QEMU,branch,default,
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/adaptation/qemu/,/sf/adaptation/QEMU,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/os/security/,/sf/os/security,branch,RCL_1,layers.sysdef.xml
diff -r 666c8141baad -r 590e02565f6e symbian3/micro/job_props.ant.xml
--- a/symbian3/micro/job_props.ant.xml	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian3/micro/job_props.ant.xml	Mon Oct 19 11:45:33 2009 +0100
@@ -38,7 +38,7 @@
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_b50" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
-    <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_1_sf" />
+    <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
     <property name="sf.spec.os.sysdef.clean.configurations.list"   value="GT_${sf.spec.sbs.variant}" />
     
     <!-- provide dtd location as os and s60 layers will be different -->
diff -r 666c8141baad -r 590e02565f6e symbian3/single/job_props.ant.xml
--- a/symbian3/single/job_props.ant.xml	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian3/single/job_props.ant.xml	Mon Oct 19 11:45:33 2009 +0100
@@ -39,7 +39,7 @@
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_b50" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
-    <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_1_sf" />
+    <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
     <property name="sf.spec.os.sysdef.clean.configurations.list"   value="GT_${sf.spec.sbs.variant}" />
     
     <!-- provide dtd location as os and s60 layers will be different -->
diff -r 666c8141baad -r 590e02565f6e symbian3/split/job_props.ant.xml
--- a/symbian3/split/job_props.ant.xml	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian3/split/job_props.ant.xml	Mon Oct 19 11:45:33 2009 +0100
@@ -5,7 +5,7 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
     
-    <property name="sf.previous.pdk.tag" value="PDK_2.0.e" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.a" />
 
     <property name="sf.spec.job.name" value="symbian3"/>
     <property name="sf.spec.corebuildversion" value="week37"/>
@@ -29,12 +29,12 @@
     <!-- and set sf.spec.baseline.enable to 'true'                                                          -->        
 
     <!-- get full source env and binaries from pdk -->
-    <property name="sf.spec.baseline.getenv_options" value="-I tools"/> <!-- Sync the tools... -->
+    <property name="sf.spec.baseline.getenv_options" value="-I tools -k"/> <!-- Sync the tools... -->
     <property name="sf.spec.baseline.clean"          value="false"/>
     <property name="sf.spec.baseline.select"         value="location" />
-    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\PDK_3.0.a_tools_baseline" />
+    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\PDK_3.0.a_candidate_Public_PDK.26_FCL.129" />
     
-    <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu"/>
+    <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu -k"/>
     <property name="sf.spec.toolsbaseline.select"         value="location" />
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.1_patched" /> <!-- for TEF etc -->
     
diff -r 666c8141baad -r 590e02565f6e symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Thu Oct 15 21:26:06 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Mon Oct 19 11:45:33 2009 +0100
@@ -92,16 +92,16 @@
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/mw/web/,/sf/mw/web,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/oss/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
@@ -115,7 +115,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/adaptation/QEMU,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/MCL/sf/adaptation/qemu/,/sf/adaptation/QEMU,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml