# HG changeset patch
# User Brendan Donegan brendand@symbian.org
# Date 1248347078 -3600
# Node ID 47e1ffbb8e5226d990c901d152459ca82814a6a6
# Parent  d1e42f09003cc17ed6352dc6fe61418a8deb1136# Parent  3bfe85cc59e13da84882fe3672b2d9b2166ace7a
Caught up from mercurial_development

diff -r d1e42f09003c -r 47e1ffbb8e52 common/build.xml
--- a/common/build.xml	Thu Jul 23 12:00:46 2009 +0100
+++ b/common/build.xml	Thu Jul 23 12:04:38 2009 +0100
@@ -760,7 +760,7 @@
             <arg value="--test-drop-name=Smoketest-${build.id}"/> 
             <arg value="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/>
             <arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/>
-            <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>
+            <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/>		
         </exec>
         <!-- Now ready to send to ATS3 -->
     </target>   
diff -r d1e42f09003c -r 47e1ffbb8e52 common/tools/ats/STAF/STAF_security.txt
--- a/common/tools/ats/STAF/STAF_security.txt	Thu Jul 23 12:00:46 2009 +0100
+++ b/common/tools/ats/STAF/STAF_security.txt	Thu Jul 23 12:04:38 2009 +0100
@@ -2,4 +2,5 @@
 TRUST LEVEL 5 MACHINE sym-build02.*
 TRUST LEVEL 5 MACHINE lon-engbuild87.*
 TRUST LEVEL 5 MACHINE lon-engbuild89.*
+TRUST LEVEL 5 MACHINE uk-brendand.*
 
diff -r d1e42f09003c -r 47e1ffbb8e52 common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties
--- a/common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties	Thu Jul 23 12:00:46 2009 +0100
+++ b/common/tools/ats/devices/sym-build02/EMULATOR_GENERIC_SYMBUILD02.properties	Thu Jul 23 12:04:38 2009 +0100
@@ -7,7 +7,7 @@
 
 CONNECTION=emulator
 
-TEMPDIR=C:\\ATS3
+TEMPDIR=D:\\ATS3
 
 CLASS=GenericTestableDevice
 
diff -r d1e42f09003c -r 47e1ffbb8e52 common/tools/ats/smoketest/Group/smoketest.xml
diff -r d1e42f09003c -r 47e1ffbb8e52 sf-platform/build.xml
--- a/sf-platform/build.xml	Thu Jul 23 12:00:46 2009 +0100
+++ b/sf-platform/build.xml	Thu Jul 23 12:04:38 2009 +0100
@@ -35,11 +35,9 @@
 	
 	<else>
 	    <!-- TODO use better method to export or wait for GenXML fix?-->
-        <copy file="${build.output.dir}\build\input\0000000000000001_system_model_os.xml"
+        <copy file="${build.output.dir}\build\input\0000000000000001_system_model.xml"
         tofile="${canonical.sysdef.file}" failonerror="false" verbose="true"/>
 
-	    <!-- TODO targets for single sysdef build -->
-	    <runtarget target="sf-os-compile"/>
 	</else>
         </if>