# HG changeset patch
# User MattD <amttd@symbian.org>
# Date 1258227955 0
# Node ID 659588103ddbb8e2ddfdc98ee9655b33580923bd
# Parent  0c10d00e2fee4f32cf4a1657b44c5fd4ec08f4cc# Parent  3482aa86c6ecf889d59508baece2ecf8c038f324
Merge Tags

diff -r 3482aa86c6ec -r 659588103ddb symbian2/micro/job_props.ant.xml
--- a/symbian2/micro/job_props.ant.xml	Thu Nov 12 16:06:26 2009 +0000
+++ b/symbian2/micro/job_props.ant.xml	Sat Nov 14 19:45:55 2009 +0000
@@ -28,13 +28,8 @@
     <!-- 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.clean"          value="false"/>
-    <property name="sf.spec.baseline.select"         value="location" />
     <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.select"         value="location" />
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
diff -r 3482aa86c6ec -r 659588103ddb symbian2/single/job_props.ant.xml
--- a/symbian2/single/job_props.ant.xml	Thu Nov 12 16:06:26 2009 +0000
+++ b/symbian2/single/job_props.ant.xml	Sat Nov 14 19:45:55 2009 +0000
@@ -29,13 +29,8 @@
     <!-- 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.clean"          value="false"/>
-    <property name="sf.spec.baseline.select"         value="location" />
     <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.select"         value="location" />
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
diff -r 3482aa86c6ec -r 659588103ddb symbian2/split/job_props.ant.xml
--- a/symbian2/split/job_props.ant.xml	Thu Nov 12 16:06:26 2009 +0000
+++ b/symbian2/split/job_props.ant.xml	Sat Nov 14 19:45:55 2009 +0000
@@ -27,13 +27,9 @@
     <!-- 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.clean"          value="false"/>
-    <property name="sf.spec.baseline.select"         value="location" />
+    <property name="sf.spec.baseline.getenv_options" value="-I tools -k"/> <!-- Sync the tools... -->
     <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.select"         value="location" />
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.2" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
diff -r 3482aa86c6ec -r 659588103ddb symbian3/micro/job_props.ant.xml
--- a/symbian3/micro/job_props.ant.xml	Thu Nov 12 16:06:26 2009 +0000
+++ b/symbian3/micro/job_props.ant.xml	Sat Nov 14 19:45:55 2009 +0000
@@ -29,13 +29,8 @@
     <!-- 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 -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\${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.2" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
diff -r 3482aa86c6ec -r 659588103ddb symbian3/single/job_props.ant.xml
--- a/symbian3/single/job_props.ant.xml	Thu Nov 12 16:06:26 2009 +0000
+++ b/symbian3/single/job_props.ant.xml	Sat Nov 14 19:45:55 2009 +0000
@@ -29,13 +29,8 @@
     <!-- 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.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_tools_baseline" />
     
-    <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu"/>
-    <property name="sf.spec.toolsbaseline.select"         value="location" />
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_b50" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
diff -r 3482aa86c6ec -r 659588103ddb symbian3/split/job_props.ant.xml
--- a/symbian3/split/job_props.ant.xml	Thu Nov 12 16:06:26 2009 +0000
+++ b/symbian3/split/job_props.ant.xml	Sat Nov 14 19:45:55 2009 +0000
@@ -29,12 +29,7 @@
     <!-- 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 -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\${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 -->
     
     <!-- platform build specific properties -->