Merge of config changes.
authormatt.davies@SYM-BUILD02.ad-sfpd.intra
Fri, 19 Jun 2009 16:12:41 +0100
changeset 95 370f71905b1d
parent 94 d566cd967e5d (current diff)
parent 93 181e3ada7857 (diff)
child 98 4646443c0a61
Merge of config changes.
clean/job_props.ant.xml
--- a/clean/job_props.ant.xml	Fri Jun 19 16:09:43 2009 +0100
+++ b/clean/job_props.ant.xml	Fri Jun 19 16:12:41 2009 +0100
@@ -14,7 +14,7 @@
     <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.sourcesync.usecache" value="true"/>
+    <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  -->
     <!-- check that sf.spec.baseline.getenv_options includes 'tools'                                        -->
--- a/clean/sources_fcl.csv	Fri Jun 19 16:09:43 2009 +0100
+++ b/clean/sources_fcl.csv	Fri Jun 19 16:12:41 2009 +0100
@@ -102,8 +102,8 @@
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/security/,/sf/os/security,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/shortlinksrv_2/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/textandloc,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,tip,tag,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/textandloc/,/sf/os/textandloc,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,tip,tag,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,tip,tag,default,layers.sysdef.xml