--- a/clean/job_props.ant.xml	Fri May 22 17:21:02 2009 +0100
+++ b/clean/job_props.ant.xml	Tue May 26 16:48:26 2009 +0100
@@ -12,7 +12,7 @@
     <property name="sf.spec.build.system" value="sbs"/>
     
     <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,tools2_rel"/>
+    <property name="sf.spec.sbs.tools.config" value="tools_rel.whatlog,tools2_rel.whatlog"/>
     
     <property name="sf.spec.sourcesync.usecache" value="true"/>
             

--- a/clean/sources_fcl.csv	Fri May 22 17:21:02 2009 +0100
+++ b/clean/sources_fcl.csv	Tue May 26 16:48:26 2009 +0100
@@ -59,7 +59,7 @@
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/mds/,/sf/mw/mds,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/mw/messagingmw/,/sf/mw/messagingmw,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/mmmw/,/sf/mw/mmmw,tip,tag,default,layers.sysdef.xml
@@ -78,7 +78,7 @@
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/svgt/,/sf/mw/svgt,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,tip,tag,default,layers.sysdef.xml
@@ -90,18 +90,18 @@
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/mm/,/sf/os/mm,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/security/,/sf/os/security,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
-//lon-engbuild87/d$/mercurial/temp/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial_development/sfl/FCL/sf/os/shortlinksrv_2/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
+//lon-engbuild87/d$/mercurial/Temp/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,tip,tag,default,layers.sysdef.xml
 //lon-engbuild87/d$/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tip,tag,default,layers.sysdef.xml