# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1260306632 0
# Node ID a32ecd59008f7cf5b42edc82349c0e577a1c0218
# Parent  290594a8f28cdc01dd9553096498183486857934# Parent  84edfc198c2403b8714a8c0a2d3ff1b4c654a3ca
Catchup merge

diff -r 290594a8f28c -r a32ecd59008f symbian2/micro/job_props.ant.xml
--- a/symbian2/micro/job_props.ant.xml	Tue Dec 08 21:09:58 2009 +0000
+++ b/symbian2/micro/job_props.ant.xml	Tue Dec 08 21:10:32 2009 +0000
@@ -5,6 +5,8 @@
     <dirname property="sf.spec.job.dir" file="${ant.file.SF-JOB-PROPS}"/>
     <property name="sf.project.type" value="platform" />
 
+    <property name="sf.drive.space.needed" value="2G"/>
+
     <property name="sf.previous.pdk.tag" value="PDK_2.0.1" />
 
     <property name="sf.spec.corebuildversion" value="week19"/>
@@ -70,7 +72,6 @@
     <!-- These are certainly specific to the micro build -->
     <property name="sf.spec.job.name" value="micro"/>
     <property name="sf.suppress.buildenv.check"  value="true"/>
-    <property name="sf.suppress.drive.space.check" value="true"/>
     <property name="sf.spec.sourcesync.archive"  value="true"/>
     <property name="sf.spec.test.sendpkg.enable" value="false"/>
     <property name="sf.spec.bccheck.enable"      value="false"/>
diff -r 290594a8f28c -r a32ecd59008f symbian2/micro/sources.csv
--- a/symbian2/micro/sources.csv	Tue Dec 08 21:09:58 2009 +0000
+++ b/symbian2/micro/sources.csv	Tue Dec 08 21:10:32 2009 +0000
@@ -1,11 +1,6 @@
 source,dst,type,pattern,sysdef
 //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,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,
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_1,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_1,layers.sysdef.xml
diff -r 290594a8f28c -r a32ecd59008f symbian2/micro/sysdefs/system_model.xml
--- a/symbian2/micro/sysdefs/system_model.xml	Tue Dec 08 21:09:58 2009 +0000
+++ b/symbian2/micro/sysdefs/system_model.xml	Tue Dec 08 21:10:32 2009 +0000
@@ -26,12 +26,7 @@
       <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/> -->
      </component>
     </collection>
-    <collection name="s60bld">
-     <component unofficial="yes" name="buildplatforms" origin-model="foundation">
-      <unit bldFile="tools/buildplatforms/group"/>
-     </component>
-    </collection>
-   <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+    <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
      <component name="cedarutils" long-name="Cedar Utils" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
      </component>
@@ -313,9 +308,6 @@
       <!-- The following unit is removed as non-contributed -->
       <!-- <unit bldFile="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group" mrp="os/buildtools/toolsandutils/usecasecontroller/BuildScripts/group/testtools_ucc.mrp"/> -->
      </component>
-     <component name="autotest" long-name="Autotest" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-     </component>
      <component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
       <!-- <unit bldFile="os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->
@@ -335,11 +327,6 @@
       <!-- <unit bldFile="os/buildtools/toolsandutils/stlport/group" mrp="os/buildtools/toolsandutils/stlport/group/tools_stlport.mrp"/> -->
      </component>
     </collection>
-   <collection name="n:dist_os" long-name="Redistribution" level="mw">
-     <component name="n:redistributionwinceka2" long-name="Redistribution WINC EKA2" purpose="development" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/buildtools/dist_os/redistributionwinceka2" mrp="os/buildtools/dist_os/redistributionwinceka2/tools_redistribution_cedar.mrp"/>
-     </component>
-    </collection>
     <collection name="n:bintools_os" long-name="Binary Tools" level="fw">
      <component name="n:rcomp" long-name="Resource Compiler" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->