# HG changeset patch
# User royt <tathagatar@symbian.org>
# Date 1253607506 -3600
# Node ID e72afbf7a8c95b21ba281220eb5a9c29d550edfc
# Parent  81211967e594a2c1418aeab5146bcbe03650c253# Parent  8b6d6596f6b75913f00899480a5a72dc0b273240
merge

diff -r 8b6d6596f6b7 -r e72afbf7a8c9 common/tools/ats/STAF/STAF_security.txt
--- a/common/tools/ats/STAF/STAF_security.txt	Mon Sep 21 16:33:07 2009 +0100
+++ b/common/tools/ats/STAF/STAF_security.txt	Tue Sep 22 09:18:26 2009 +0100
@@ -5,5 +5,5 @@
 TRUST LEVEL 5 MACHINE lon-engbuild89.*
 TRUST LEVEL 5 MACHINE C100725
 TRUST LEVEL 5 MACHINE C100726
-TRUST LEVEL 5 MACHINE UK-ARNAUDL.*
+TRUST LEVEL 5 MACHINE UK-BRENDAND.*
 TRUST LEVEL 5 MACHINE V800017.*
\ No newline at end of file
diff -r 8b6d6596f6b7 -r e72afbf7a8c9 common/tools/ats/bctest/package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/package_definition.xml	Tue Sep 22 09:18:26 2009 +0100
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition name="Foundation" schema="2.0.1">
+ <systemModel>
+  <layer name="bc" long-name="Binary Compatability" levels="generic specific">
+   <block long-name="Dynamic BC Tests" level="specific" name="dynamicbctest" levels="fts">
+    <collection name="dynamicbc" long-name="Dynamic BC Test Harnesses">
+      <component id="aspconnection" name="ASP Connection Test">
+        <unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/>
+      </component>
+      <component id="hostconn" name="Hostlet Connection Test">
+        <unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/>
+      </component>
+      <component id="newsoapclasses" name="New SOAP Classes Test">
+        <unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/>
+      </component>
+      <component id="favouritesbctest" name="Browser Favourites BC Test">
+        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/FavouritesBCTest/group"/>
+      </component>
+      <component id="downloadmgrbctest" name="Download Manager BC Test">
+        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/browser/apps/DownloadMgrBCTest/group"/>
+      </component>	  
+      <component id="lmksearch" name="Landmark Search Test">
+        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group"/>
+      </component>
+      <component id="lmkdbmgmt" name="Landmark Database Management Test">
+        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group"/>
+      </component>
+      <component id="landmarks" name="Landmarks API Test">
+        <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_api/group"/>
+      </component>
+      <component id="mmsclientmtm" name="Messaging MMS Client MTM BC Test">
+        <unit bldFile="sf/app/messaging/msg_pub/mms_client_mtm_api/tsrc/bc/group"/>
+      </component>
+      <component id="pluginbio" name="Messaging Plugin BIO BC Test">
+        <unit bldFile="sf/app/messaging/msg_pub/plugin_bio_control_api/tsrc/bc/group"/>
+      </component>
+      <component id="drmcaf" name="DRM CAF BC Test">
+        <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group"/>
+      </component>
+      <component id="pbkdataaddedit" name="Phonebook Data Add Edit BC Test">
+        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group"/>
+      </component>
+      <component id="pbkdatamgmt" name="Phonebook Data Management BC Test">
+        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_data_management_api/tsrc/bc/group"/>
+      </component>
+      <component id="pbkfetchui" name="Phonebook Fetch UI BC Test">
+        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group"/>
+      </component>
+      <component id="pbkuiutil" name="Phonebook UI Utils BC Test">
+        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group"/>
+      </component>
+      <component id="pbkvcard" name="Phonebook vCard Import Export BC Test">
+        <unit bldFile="sf/app/contacts/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group"/>
+      </component>
+      <component id="pbkspeeddial" name="Phonebook Speed Dial BC Test">
+        <unit bldFile="sf/app/contacts/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group"/>
+      </component>
+      <component id="proengwrap" name="Profiles Engine Wrapper Test">
+        <unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group"/>
+      </component>
+	  
+      <component id="basesvs" name="SVS Base API Tests" class="test">
+        <unit bldFile="sf/os/kernelhwsrv/baseapitest/basesvs/group"/>
+      </component>
+	  
+    </collection>
+   </block>
+  </layer>
+ </systemModel>
+</SystemDefinition>
\ No newline at end of file
diff -r 8b6d6596f6b7 -r e72afbf7a8c9 common/tools/ats/devices/c100726/EMULATOR_ATSINTERFACE_c100726.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/c100726/EMULATOR_ATSINTERFACE_c100726.properties	Tue Sep 22 09:18:26 2009 +0100
@@ -0,0 +1,24 @@
+
+NAME=ATSINTERFACE EMULATOR on c100726
+
+CATEGORY=hardware
+
+TYPE=WINSCW
+
+CONNECTION=emulator
+
+TEMPDIR=C:\\apps\\ATS3\\tmp\\emulator
+
+CLASS=RTestableDevice
+
+HARNESS=ATSINTERFACE
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=WINSCW
+BUILD=udeb
+
+IMAGE=winscw_smoketest
+
+
diff -r 8b6d6596f6b7 -r e72afbf7a8c9 sf-platform/build.xml
--- a/sf-platform/build.xml	Mon Sep 21 16:33:07 2009 +0100
+++ b/sf-platform/build.xml	Tue Sep 22 09:18:26 2009 +0100
@@ -22,7 +22,15 @@
     <echo>[SF-BUILD-NOPREP] WARNING: Not generating model from packages</echo>
   </target>
 
-  <target name="sf-platform-bootstrap" depends="sf-platform-bootstrap-gt,sf-platform-bootstrap-s60"/>
+  <target name="sf-platform-bootstrap" depends="sf-gen-buildinfo-txt,sf-platform-bootstrap-gt,sf-platform-bootstrap-s60"/>
+
+  <target name="sf-gen-buildinfo-txt">
+    <mkdir dir="${build.drive}/epoc32/data/"/> 
+    <delete file="${build.drive}/epoc32/data/BuildInfo.txt"/>
+    <echo file="${build.drive}/epoc32/data/BuildInfo.txt" append="true" message="DeviceFamily               100 ${line.separator}"/>
+    <echo file="${build.drive}/epoc32/data/BuildInfo.txt" append="true" message="DeviceFamilyRev            0x900 ${line.separator}"/>
+    <echo file="${build.drive}/epoc32/data/BuildInfo.txt" append="true" message="ManufacturerSoftwareBuild  ${build.id}_Symbian_OS_v${sf.spec.sbs.variant} ${line.separator}"/>
+  </target>
 
   <target name="sf-platform-bootstrap-gt" >
     <echo>[SF-platform-bootstrap-gt]</echo>