# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1272477885 -3600
# Node ID 92dd719cc91b2474259cfc7ce53142b8fbe10982
# Parent  64899060ea4db1e50891176d0cf823e387cc14b4# Parent  6c90564578a6d339ee9982b22b2a6cc130110008
Merge

diff -r 6c90564578a6 -r 92dd719cc91b common/build.postbuild.xml
--- a/common/build.postbuild.xml	Fri Apr 23 17:20:24 2010 +0100
+++ b/common/build.postbuild.xml	Wed Apr 28 19:04:45 2010 +0100
@@ -635,13 +635,18 @@
     <target name="sf-compare-to-baseline" depends="sf-diamondize-bom,sf-check-utilities-dir" if="sf-utilities-available">
         <property name="sf.releasenotes.wiki.txt" value="${build.log.dir}/releaseNotes.wiki.txt"/>
         <delete file="${sf.releasenotes.wiki.txt}"/>
+        <!-- FCL Usage and Changesets -->
+        <exec executable="perl" dir="${build.drive}" output="${sf.releasenotes.wiki.txt}">
+            <arg value="${build.drive}/utilities/releaseAutomation/releaseNotes.pl"/>
+            <arg value="${build.log.dir}/BOM/sources.csv"/>
+        </exec>
         <!-- Package Comparison and FCL Usage -->
-        <exec executable="perl" dir="${sf.spec.sourcesync.sourcespecdir}" output="${sf.releasenotes.wiki.txt}">
+        <exec executable="perl" dir="${sf.spec.sourcesync.sourcespecdir}" output="${sf.releasenotes.wiki.txt}" append="true">
             <arg value="${build.drive}/utilities/releaseAutomation/packageComparison.pl"/>
             <arg value="--sources=${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
-	    <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model.xml"/>
-	    <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_os.xml"/>
-	    <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_s60.xml"/>
+            <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model.xml"/>
+            <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_os.xml"/>
+            <arg value="--sysdef=${sf.spec.sourcesync.sourcespecdir}/sysdefs/system_model_s60.xml"/>
             <arg value="--baseline=${sf.previous.pdk.tag}"/>
         </exec>
         <!-- Mercurial comparison -->
diff -r 6c90564578a6 -r 92dd719cc91b common/build.test.xml
--- a/common/build.test.xml	Fri Apr 23 17:20:24 2010 +0100
+++ b/common/build.test.xml	Wed Apr 28 19:04:45 2010 +0100
@@ -150,26 +150,52 @@
         <echo message="INFO Creating smoketest testpackage"/>
         <exec executable="perl" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
             <arg value="smoketest.pl"/>
+			<arg value="--target=${sf.spec.test.target}"/>
         </exec>
         <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}"  failonerror="false"/>
         
         <echo message="INFO Updating smoketest package with test info"/>
-        <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
-            <arg value="ats_specialise_test_drop.pl"/>
-            <arg value="--test-drop-name=Smoketest-${build.id}"/> 
-            <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
-            <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="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>	
-            <arg value="--publish=${publish.dir}\ats_reports"/>
-			<arg value="--bld-drive=${build.drive}"/>
-        </exec>
+
+        <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
+          <then>
+            <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+              <arg value="ats_specialise_test_drop.pl"/>
+              <arg value="--test-drop-name=Smoketest-${build.id}"/> 
+              <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
+              <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="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>	
+              <arg value="--publish=${publish.dir}\ats_reports"/>
+              <arg value="--bld-drive=${build.drive}"/>
+              <arg value="--test-target=Syborg_stif"/>
+              <arg value="--image-path=${sf.spec.test.imagepath}"/>
+            </exec>
+          </then>
+          <else>		
+            <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log">
+              <arg value="ats_specialise_test_drop.pl"/>
+              <arg value="--test-drop-name=Smoketest-${build.id}"/> 
+              <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/>
+              <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="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/>	
+              <arg value="--publish=${publish.dir}\ats_reports"/>
+              <arg value="--bld-drive=${build.drive}"/>
+            </exec>
+          </else>
+        </if>
         <!-- Now ready to send to ATS3 -->
     </target>   
 
 	<!-- Sending testdrop to ATS3 -->
 	
     <target name="sf-send-testpkg" depends="sf-start-ats,sf-find-ATS-worker-root,sf-make-junction">
+        <if><equals arg1="${sf.spec.test.target}" arg2="syborg"/>
+          <then>
+            <delete file="${sf.spec.test.workerroot}/syborg.dtb" quiet="true"/>
+            <copy file="${build.drive}/epoc32/rom/syborg/syborg.dtb" todir="${sf.spec.test.workerroot}" failonerror="false"/>
+          </then>
+        </if>
         <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
         <echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name} path ${sf.spec.test.host.droppath}"/>
         <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_testdrop.log">
@@ -182,9 +208,14 @@
             <arg value="--host-drop-path=${sf.spec.test.host.droppath}"/>
         </exec>
     </target>
-	<target name="sf-start-ats">        			
-	    <exec executable="start.cmd" dir="${ats.drive}" spawn="true" failonerror="false"/>
-		<echo message="Waiting for 10 seconds to start the ATS Worker......."/>
-		<sleep seconds="10"/>
+    
+	<target name="sf-start-ats">
+    <if><available file="${ats.drive}/start.cmd"/>        
+    <then>
+        <exec executable="start.cmd" dir="${ats.drive}" spawn="true" failonerror="false"/>
+        <echo message="Waiting for 10 seconds to start the ATS Worker......."/>
+        <sleep seconds="10"/>
+    </then>
+    </if>
     </target> 
 </project>
diff -r 6c90564578a6 -r 92dd719cc91b common/build.xml
--- a/common/build.xml	Fri Apr 23 17:20:24 2010 +0100
+++ b/common/build.xml	Wed Apr 28 19:04:45 2010 +0100
@@ -497,7 +497,7 @@
             <istrue value="${sf.spec.dirlist.enable}"/>
             <then>
                 <echo message="Dirlist name: ${sf.currentlist.name} requested for ${sf.dir.location} excluding ${sf.dir.exclude}"/>
-                <exec executable="python" dir="${build.log.dir}/" failonerror="true" output="${build.log.dir}/listdir_${build.id}_${sf.currentlist.name}.log">
+                <exec executable="python" dir="${build.drive}/" failonerror="true" output="${build.log.dir}/listdir_${build.id}_${sf.currentlist.name}.log">
                     <arg value="${sf.common.config.dir}/tools/listdir.py"/>
                     <arg value="${sf.dir.location}"/>
                     <arg value="${sf.dir.exclude}"/>
diff -r 6c90564578a6 -r 92dd719cc91b common/common_props.ant.xml
--- a/common/common_props.ant.xml	Fri Apr 23 17:20:24 2010 +0100
+++ b/common/common_props.ant.xml	Wed Apr 28 19:04:45 2010 +0100
@@ -101,6 +101,8 @@
     <property name="sf.spec.test.host.password"  value="admin"/>
     <property name="sf.spec.test.host.droppath"  value="D:\ats3_testdrop_arrivals\${env.COMPUTERNAME}"/>
     <property name="sf.spec.test.epocroot"       value="winscw_smoketest"/>
+    <property name="sf.spec.test.target"         value="winscw"/> <!-- This specifies the target on which tests will be run -->
+    <property name="sf.spec.test.imagepath"      value="D:\epoc32\rom\syborg_tshell_ARMV5_udeb.img"/> <!-- This specifies the path to the ROM image used for testing -->
 
     <!-- ATS properties -->
     <property name="sf.spec.test.package.location"  value="\\${sf.spec.test.host.name}\ats3_testdrop_arrivals\${env.COMPUTERNAME}"/>
diff -r 6c90564578a6 -r 92dd719cc91b common/tools/ats/ats_specialise_test_drop.pl
--- a/common/tools/ats/ats_specialise_test_drop.pl	Fri Apr 23 17:20:24 2010 +0100
+++ b/common/tools/ats/ats_specialise_test_drop.pl	Wed Apr 28 19:04:45 2010 +0100
@@ -40,6 +40,8 @@
 my $temp_dest_name; # Leafname of temporary output file, if $destfile undefined.
 my $publish;	# Publishing folder for ats reports.
 my $bld_drive;  # Subst'd drive
+my $test_target; # The target which the tests will be run on
+my $image_path; # The path to the ROM image used for testing (not valid for WINSCW target)
 
 sub usage($);
 sub help();
@@ -47,13 +49,15 @@
 sub silent_command($);
 
 my %optmap = (  'test-drop-name' => \$test_drop_name,
-			    'host-name' => \$host_name,
-			    'build-id' => \$build_id,
-			    'src' => \$srcfile,
-			    'dest' => \$destfile,
+                'host-name' => \$host_name,
+                'build-id' => \$build_id,
+                'src' => \$srcfile,
+                'dest' => \$destfile,
                 'help' => \$help,
                 'publish' => \$publish,
-				'bld-drive' => \$bld_drive);
+                'bld-drive' => \$bld_drive,
+                'test-target' => \$test_target,
+                'image-path' => \$image_path);
 
 GetOptions(\%optmap,
           'test-drop-name=s',
@@ -63,7 +67,9 @@
           'dest=s',
           'help!',
           'publish=s', 
-		  'bld-drive=s') 
+          'bld-drive=s',
+          'test-target=s',
+          'image-path=s') 
           or usage_error();
 
 # Check if Tie::File module installed
@@ -126,13 +132,20 @@
 
 # Parse the input XML into hashref.
 my $test_drop = XMLin("./$xml_in", keeproot => 1,
-    forcearray => [ 'name', 'id','owner','priority','buildid','postAction','type','target','device', 'property', 'command', 'param'],#
+    forcearray => [ 'name', 'id', 'owner', 'priority', 'buildid', 'postAction', 'type', 'target', 'device', 'property', 'command', 'param', 'plan'],#
         keyattr => [] );
     
 # Insert the specified test drop name, if any.
 $test_drop->{'test'}->{'name'}->[0] = $test_drop_name, if $test_drop_name;
 # Insert the specified build id, if any.
 $test_drop->{'test'}->{'buildid'}->[0] = $build_id, if $build_id;
+# Insert the path to the ROM image
+if ($image_path) {
+    $test_drop->{'test'}->{'plan'}->[0]->{'flash'}->[0];
+    my $flash_params = $test_drop->{'test'}->{'plan'}->[0]->{'flash'};
+    $flash_params->[0] = { 'target-alias' => $test_target, 'images' => $image_path };
+}
+
 # Insert the FileStoreAction parameter
 my $postaction_params = $test_drop->{'test'}->{'postAction'}->[0]->{'params'}->{'param'}, if $publish;
 $postaction_params->[1] = { 'name' => "to-folder", 'value' => $publish }, if $publish;
diff -r 6c90564578a6 -r 92dd719cc91b common/tools/ats/devices/c100782/SYBORG_ATSINTERFACE_c100782.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/c100782/SYBORG_ATSINTERFACE_c100782.properties	Wed Apr 28 19:04:45 2010 +0100
@@ -0,0 +1,30 @@
+
+NAME=SYBORG on c100782
+
+CATEGORY=hardware
+
+TYPE=Syborg
+
+CONNECTION=HTI
+
+TEMPDIR=G:\\ats3
+
+CLASS=RTestableDevice
+
+HARNESS=ATSINTERFACE
+
+FLASHER=syborgflasher
+
+FLASHING_ENABLED=true
+
+BOOT_TIME = 90
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=armv5
+BUILD=urel
+
+# comms settings
+DGW_PORT=3336
+DGW_COMPORT=COM6
diff -r 6c90564578a6 -r 92dd719cc91b common/tools/ats/devices/c100782/SYBORG_GENERIC_c100782.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/c100782/SYBORG_GENERIC_c100782.properties	Wed Apr 28 19:04:45 2010 +0100
@@ -0,0 +1,30 @@
+
+NAME=SYBORG on c100782
+
+CATEGORY=hardware
+
+TYPE=Syborg
+
+CONNECTION=HTI
+
+TEMPDIR=G:\\ats3
+
+CLASS=GenericTestableDevice
+
+HARNESS=GENERIC
+
+FLASHER=syborgflasher
+
+FLASHING_ENABLED=true
+
+BOOT_TIME = 90
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=armv5
+BUILD=urel
+
+# comms settings
+DGW_PORT=3337
+DGW_COMPORT=COM6
diff -r 6c90564578a6 -r 92dd719cc91b common/tools/listdir.py
--- a/common/tools/listdir.py	Fri Apr 23 17:20:24 2010 +0100
+++ b/common/tools/listdir.py	Wed Apr 28 19:04:45 2010 +0100
@@ -26,9 +26,9 @@
   if(len(sys.argv)>2):
     x_dirs = string.lower(sys.argv[2])
     exclude_dirs = re.split(',', x_dirs)
-  scandir(directory, exclude_dirs,directory)
+  scandir(directory, exclude_dirs)
 
-def scandir(top, exclude_dirs,directory):
+def scandir(top, exclude_dirs):
     fixpath = re.compile('\\\\')    
     fixroot = re.compile('^%s\\\\' % top)
     for root, dirs, files in os.walk(top, topdown=True):
@@ -38,6 +38,6 @@
         for name in files:
             filename = os.path.join(root, name)
             fn = string.lower(fixpath.sub('/',fixroot.sub('',filename)))
-            print fn.strip(directory)
+            print top+"/"+fn
 
 main()
diff -r 6c90564578a6 -r 92dd719cc91b sf-tools/build.xml
--- a/sf-tools/build.xml	Fri Apr 23 17:20:24 2010 +0100
+++ b/sf-tools/build.xml	Wed Apr 28 19:04:45 2010 +0100
@@ -48,8 +48,8 @@
 
     <echo message="INFO Getting bootstrap environment listing"/>
     <antcall target="sf-list-dir" inheritAll="false">
-      <param name="sf.dir.location" value="${build.drive}/"/> 
-      <param name="sf.dir.exclude"  value="${build.drive}/epoc32/build"/>     
+      <param name="sf.dir.location" value="epoc32"/> 
+      <param name="sf.dir.exclude"  value="epoc32/build"/>     
       <param name="sf.list.name" value="bootstrap"/>
     </antcall>    
   </target>