# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1251108917 -3600
# Node ID 1ade6e71c66bd26883a1921d86b6ec5828f9f693
# Parent  c4ba4a1407d0aaf453bf88cd3fca6bfaf2b3fb14# Parent  825af796aeb9b0c3fef64f51cd0cd354081a82df
Catchup merge with reordered model and repos. Manual merge on sources_fcl.csv...hopefully it'll be ok.

diff -r 825af796aeb9 -r 1ade6e71c66b clean/job_props.ant.xml
--- a/clean/job_props.ant.xml	Fri Aug 21 14:38:17 2009 +0100
+++ b/clean/job_props.ant.xml	Mon Aug 24 11:15:17 2009 +0100
@@ -4,8 +4,6 @@
     
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     
-    <property name="sf.project.type" value="platform" />
-    
     <property name="sf.spec.job.name" value="platform"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
     
@@ -14,6 +12,11 @@
     <property name="sf.spec.sbs.config" value="winscw.whatlog,armv5.whatlog"/> <!-- both _urel and _udeb -->
     <property name="sf.spec.sbs.tools.config" value="tools_rel.whatlog,tools2_rel.whatlog"/>
     
+    <property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
+    <property name="sf.spec.bldmefirst.s60.config.root" value="sf/os/deviceplatformrelease/sf_config/config" />
+    <property name="sf.spec.bldmefirst.s60.sbs.variant.cfg" value="${sf.spec.bldmefirst.s60.config.root}/inc/variant.cfg" /> <!-- currently needed for touching -->
+    <property name="sf.spec.bldmefirst.s60.exports" value="${sf.spec.bldmefirst.s60.config.root}/${sf.spec.bldmefirst.s60.variant}/group,${sf.spec.bldmefirst.s60.config.root}/group,sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group,sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group,sf/os/devicesrv/commonservices/commonengine/group,sf/mw/web/web_plat/browser_platform_api/group,sf/tools/homescreentools/dtdinstaller/group"/>
+    
     <property name="sf.spec.sourcesync.usecache" value="false"/>
     
     <!-- To sync the tools instead of building them, change sf.spec.sbs.tools.config to tools2_rel.whatlog  -->
diff -r 825af796aeb9 -r 1ade6e71c66b clean/sources.csv
--- a/clean/sources.csv	Fri Aug 21 14:38:17 2009 +0100
+++ b/clean/sources.csv	Mon Aug 24 11:15:17 2009 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
diff -r 825af796aeb9 -r 1ade6e71c66b clean/sources_fcl.csv
--- a/clean/sources_fcl.csv	Fri Aug 21 14:38:17 2009 +0100
+++ b/clean/sources_fcl.csv	Mon Aug 24 11:15:17 2009 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
@@ -92,7 +91,7 @@
 //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/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,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_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/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
diff -r 825af796aeb9 -r 1ade6e71c66b ex-nokia/job_props.ant.xml
--- a/ex-nokia/job_props.ant.xml	Fri Aug 21 14:38:17 2009 +0100
+++ b/ex-nokia/job_props.ant.xml	Mon Aug 24 11:15:17 2009 +0100
@@ -4,8 +4,6 @@
     
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     
-    <property name="sf.project.type" value="platform" />
-    
     <property name="sf.spec.job.name" value="platform"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
     
diff -r 825af796aeb9 -r 1ade6e71c66b foundation/job_props.ant.xml
--- a/foundation/job_props.ant.xml	Fri Aug 21 14:38:17 2009 +0100
+++ b/foundation/job_props.ant.xml	Mon Aug 24 11:15:17 2009 +0100
@@ -4,17 +4,20 @@
     
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     
-    <property name="sf.project.type" value="platform" />
-    
     <property name="sf.spec.job.name" value="platform"/>
     <property name="sf.spec.corebuildversion" value="week19"/>
     
     <property name="sf.spec.build.system" value="sbs"/>
     
-    <property name="sf.spec.sbs.config" value="winscw_udeb.whatlog,winscw_urel.whatlog,armv5_udeb.whatlog,armv5_urel.whatlog"/> <!-- both _urel and _udeb -->
+    <property name="sf.spec.sbs.config" value="winscw_urel.whatlog,winscw_udeb.whatlog,armv5_urel.whatlog,armv5_udeb.whatlog"/> <!-- both _urel and _udeb -->
     <property name="sf.spec.sbs.tools.config" value="tools_rel.whatlog,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.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
+    <property name="sf.spec.bldmefirst.s60.config.root" value="sf/os/deviceplatformrelease/sf_config/config" />
+    <property name="sf.spec.bldmefirst.s60.sbs.variant.cfg" value="${sf.spec.bldmefirst.s60.config.root}/inc/variant.cfg" /> <!-- currently needed for touching -->
+    <property name="sf.spec.bldmefirst.s60.exports" value="${sf.spec.bldmefirst.s60.config.root}/${sf.spec.bldmefirst.s60.variant}/group,${sf.spec.bldmefirst.s60.config.root}/group,sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/group,sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/group,sf/os/devicesrv/commonservices/commonengine/group,sf/mw/web/web_plat/browser_platform_api/group,sf/tools/homescreentools/dtdinstaller/group"/>
     
     <property name="sf.spec.sourcesync.usecache" value="false"/>
     
diff -r 825af796aeb9 -r 1ade6e71c66b foundation/sources.csv
--- a/foundation/sources.csv	Fri Aug 21 14:38:17 2009 +0100
+++ b/foundation/sources.csv	Mon Aug 24 11:15:17 2009 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
diff -r 825af796aeb9 -r 1ade6e71c66b foundation/sources_fcl.csv
--- a/foundation/sources_fcl.csv	Fri Aug 21 14:38:17 2009 +0100
+++ b/foundation/sources_fcl.csv	Mon Aug 24 11:15:17 2009 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/bldmefirst/,/rnd/internal/bldmefirst,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
@@ -28,7 +27,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,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/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/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml