# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1256586923 0
# Node ID 348f4f5159aa0123f7003ccfb1a61b31add2b6be
# Parent  ba11f2d37f1316ce8e974b9fd4dbee60c2a48185# Parent  e61fa733c62f40cd8412b83d173eba7089bbe6f7
merged tags

diff -r e61fa733c62f -r 348f4f5159aa symbian2/single/sources_fcl.csv
--- a/symbian2/single/sources_fcl.csv	Wed Oct 21 13:54:34 2009 +0100
+++ b/symbian2/single/sources_fcl.csv	Mon Oct 26 19:55:23 2009 +0000
@@ -13,7 +13,7 @@
 //v800008/Builds01/mercurial_development/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/MCL/sf/adaptation/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 e61fa733c62f -r 348f4f5159aa symbian2/split/sources_fcl.csv
--- a/symbian2/split/sources_fcl.csv	Wed Oct 21 13:54:34 2009 +0100
+++ b/symbian2/split/sources_fcl.csv	Mon Oct 26 19:55:23 2009 +0000
@@ -13,7 +13,7 @@
 //v800008/Builds01/mercurial_development/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/MCL/sf/adaptation/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 e61fa733c62f -r 348f4f5159aa symbian3/micro/job_props.ant.xml
--- a/symbian3/micro/job_props.ant.xml	Wed Oct 21 13:54:34 2009 +0100
+++ b/symbian3/micro/job_props.ant.xml	Mon Oct 26 19:55:23 2009 +0000
@@ -5,17 +5,18 @@
     <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.b" />
 
-    <property name="sf.spec.corebuildversion" value="week19"/>
+    <property name="sf.spec.corebuildversion" value="week37"/>
     
     <property name="sf.spec.sbs.variant" value="tb92sf"/>
     <property name="sf.spec.sbs.config"  value="winscw_udeb.whatlog"/>
     <property name="sf.spec.sbs.tools.config" value="tools2_rel.whatlog"/>
     
-    <property name="sf.os.compile.iterate"  value="true"/> <!-- New property for iterating though sf.spec.sbs.config instead of all at once -->
 
     <property name="sf.spec.bldmefirst.gt.variant" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_v${sf.spec.sbs.variant}.cfg" />
+    <!-- Location of Symbian_OS.hrh changed for Symbian3 to an inc directory -->
+    <property name="sf.spec.bldmefirst.gt.hrh.os" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/inc/Symbian_OS_${sf.spec.sbs.variant}.hrh" />
     <property name="sf.spec.bldmefirst.gt.hrh" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/" />
 
     <property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
@@ -28,14 +29,14 @@
     <!-- 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_2.0.e\" />
+    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
     
-    <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_b50" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
@@ -51,7 +52,7 @@
     
     <!-- build os and s60 by default -->
     <property name="sf.spec.os.skipbuild"   value="false"/>
-    <property name="sf.spec.s60.skipbuild"  value="false "/>
+    <property name="sf.spec.s60.skipbuild"  value="false"/>
     <property name="sf.spec.splitbuild"     value="true"/> <!-- *this* platform build defines two steps -->
 
     <!-- generate dir list(s) of epoc32 tree -->
diff -r e61fa733c62f -r 348f4f5159aa symbian3/split/job_props.ant.xml
--- a/symbian3/split/job_props.ant.xml	Wed Oct 21 13:54:34 2009 +0100
+++ b/symbian3/split/job_props.ant.xml	Mon Oct 26 19:55:23 2009 +0000
@@ -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_3.0.a" />
+    <property name="sf.previous.pdk.tag" value="PDK_3.0.b" />
 
     <property name="sf.spec.job.name" value="symbian3"/>
     <property name="sf.spec.corebuildversion" value="week37"/>
@@ -32,8 +32,7 @@
     <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_candidate_Public_PDK.26_FCL.129" />
-    
+    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
     <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 e61fa733c62f -r 348f4f5159aa symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Wed Oct 21 13:54:34 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Mon Oct 26 19:55:23 2009 +0000
@@ -53,7 +53,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/gsprofilesrv,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,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/MCL/sf/adaptation/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