# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1256032982 -3600
# Node ID 5411e23378b45baf2d83b5a6ebadd4e2ecabd460
# Parent  ecf2c59629fc391f897854665946b44a266a21d8# Parent  cdfb88270be0d5720e775c6570f9676d002e327e
catchup merge

diff -r ecf2c59629fc -r 5411e23378b4 .hgtags
--- a/.hgtags	Tue Oct 20 10:47:15 2009 +0100
+++ b/.hgtags	Tue Oct 20 11:03:02 2009 +0100
@@ -2,3 +2,5 @@
 36d82a2f1f927cbe91926e19c69fe74d9170b7de PDK_2.0.c
 633b96a83005daab9464a00b8fcbcfa96a247c26 PDK_2.0.d
 cc2965329dd1c545c3cad90c83f2c8cf2bc7e2d6 PDK_2.0.e
+4709730d52260a9c367e784ea56a32f4035a7619 PDK_3.0.a
+7a343c038e7d120d886ec1068c2c10b3c1165acd PDK_2.0.0
diff -r ecf2c59629fc -r 5411e23378b4 build.xml
--- a/build.xml	Tue Oct 20 10:47:15 2009 +0100
+++ b/build.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -6,10 +6,6 @@
   <property name="sf.subproject.path" value=""/>
   <property name="sf.project.location" value="${sf.config.dir}/../build/config/${sf.subproject.path}"/>
   <property name="sf.project.name" value="job"/>
-   
-  <target name="set-arm-version"/>
-  <target name="check-env-arm-license"/>
-  <target name="get-arm-license"/>
   
   <!-- import job properties -->
   <import file="${sf.project.location}/${sf.project.name}_props.ant.xml" optional="yes"/>
diff -r ecf2c59629fc -r 5411e23378b4 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Tue Oct 20 10:47:15 2009 +0100
+++ b/common/build.postbuild.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -2,6 +2,14 @@
 <project name="SF-POSTBUILD" xmlns:hlm="http://www.nokia.com/helium">
     <target name="sf-postbuild">
         <echo>[SF-POSTBUILD]</echo>
+        
+        <if><istrue value="${sf.spec.referenceroms.createimages.enable}"/>
+        <then>
+            <echo message="INFO Building ROMs defined for this project"/>
+            <runtarget target="sf-rombuild"/>
+        </then>
+        </if>
+        
         <parallel>                
             <!-- TAG SOURCE CODE -->
             <if>
@@ -69,12 +77,15 @@
 
         <!-- Zip up all the logs -->
         <runtarget target="sf-zip-logs"/>
-        <runtarget target="sf-brag-to-diamonds"/>
-
-        <!-- Publish logs/reports -->
+        
         <if>
             <istrue value="${sf.spec.publish.enable}" />
             <then>
+                <echo message="Send links to Diamonds"/>
+                <runtarget target="sf-links-to-diamonds"/>
+                <echo message="Send BRAG status information to Diamonds"/>
+                <runtarget target="sf-brag-to-diamonds"/>
+                
                 <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/>
                 <runtarget target="sf-publish"/>
             </then>
@@ -364,6 +375,7 @@
             <arg value="--config=${raptorconfig}"/>
             <arg value="--log=@{raptorlogfile}"/>
             <arg value="--basedir=${build.log.dir}/raptorbits"/>
+            <arg value="--append"/>
           </exec>
         </sequential>
       </for>
@@ -498,11 +510,18 @@
     </target>
 
     <target name="sf-run-analysis-diamonds">      
-      <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis.xml">
+      <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-run-analysis-diamonds.xml.ftl" outputFile="${build.drive}/output/logs/sf-run-analysis-diamonds.xml">
         <data expandProperties="yes">
           ant: antProperties()
           raptor_summary: csv(${build.log.dir}/raptorbits/summary.csv,{separator:',',headers:[category,subcategory,severity,config,component,phase,recipe,file,line]})
-          files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]})
+        </data>
+      </fmpp>
+    </target>
+    
+    <target name="sf-links-to-diamonds">
+      <fmpp sourceFile="${sf.common.config.dir}/diamonds/linksForDiamonds.xml.ftl" outputFile="${build.log.dir}/linksForDiamonds.xml">
+        <data expandProperties="yes">
+          ant: antProperties()
         </data>
       </fmpp>
       <!-- Send the data to the server -->
@@ -513,9 +532,9 @@
 		    <arg value="-u"/>
 		    <arg value="${diamonds.build.id}"/>
 		    <arg value="-f"/>
-		    <arg value="${build.log.dir}/sf-run-analysis.xml"/>
+		    <arg value="${build.log.dir}/linksForDiamonds.xml"/>
 	  </exec>
-    </target>    
+    </target>
 
     <target name="sf-brag-to-diamonds">
         <!-- Merge all our bits of XML together -->
@@ -778,10 +797,15 @@
             </then>
         </if>
         <runtarget target="sf-zip-logs"/>
-        <runtarget target="sf-brag-to-diamonds"/>
+                
         <if>
             <istrue value="${sf.spec.publish.enable}" />
             <then>
+                <echo message="Send links to Diamonds"/>
+                <runtarget target="sf-links-to-diamonds"/>
+                <echo message="Send BRAG status information to Diamonds"/>
+                <runtarget target="sf-brag-to-diamonds"/>
+                
                 <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/>
                 <runtarget target="sf-publish"/>
             </then>
diff -r ecf2c59629fc -r 5411e23378b4 common/build.xml
--- a/common/build.xml	Tue Oct 20 10:47:15 2009 +0100
+++ b/common/build.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -568,6 +568,68 @@
         <!-- And copy the XSL so the output can be transformed by a browser -->
         <copy file="${sf.common.config.dir}/tools/brag/brag.xsl" toDir="${build.log.dir}/summary/"/>
     </target>
-    
+       
+
+    <target name="sf-rombuild">
+      <!-- TODO If ANT gets a better way to do conditions based on value then use it instead! -->
+      <property name="sf.rombuild.dir" value="${build.drive}/sf/os/kernelhwsrv/kernel/eka/rombuild"/>
+      
+      <for list="${sf.spec.sbs.config}" delimiter="," param="sf.spec.sbs.config.variant">
+          <sequential>
+          <propertyregex property="udeb" input="@{sf.spec.sbs.config.variant}" regexp="(armv5$|armv5\.|armv5_udeb)" select="\1"/>
+          <propertyregex property="urel" input="@{sf.spec.sbs.config.variant}" regexp="(armv5$|armv5\.|armv5_urel)" select="\1"/>
+          </sequential>
+      </for> 
+      
+      <condition property="sf.spec.sbs.config.expanded" value="udeb">
+      <and><isset property="udeb"/><not><isset property="urel"/></not></and>
+      </condition>
+      
+      <condition property="sf.spec.sbs.config.expanded" value="urel">
+      <and><isset property="urel"/><not><isset property="udeb"/></not></and>
+      </condition>
+      
+      <condition property="sf.spec.sbs.config.expanded" value="udeb,urel">
+      <and><isset property="udeb"/><isset property="urel"/></and>
+      </condition>
+      
+      <if><isset property="sf.spec.sbs.config.expanded"/>
+      <then>
+          <echo message="INFO Found armv5, building ${sf.spec.sbs.config.expanded}"/>      
+          
+          <for list="${sf.spec.referenceroms.list}" delimiter="," param="sf.spec.referenceroms.variant">
+              <sequential>
+              <for list="${sf.spec.sbs.config.expanded}" delimiter="," param="sf.spec.sbs.config.expanded.i">
+                  <sequential>
+                      <echo message="INFO Building textshell ROM variant @{sf.spec.sbs.config.expanded.i} @{sf.spec.referenceroms.variant}"/>
+                      <exec executable="cmd" dir="${sf.rombuild.dir}" failonerror="false" 
+                      output="${build.log.dir}/ROM_@{sf.spec.referenceroms.variant}_@{sf.spec.sbs.config.expanded.i}_out.log" logError="true">
+                          <arg value="/c"/>
+                          <arg value="rom --variant=@{sf.spec.referenceroms.variant} --inst=armv5 --build=@{sf.spec.sbs.config.expanded.i} --type=tshell"/>
+                      </exec>
+                      
+                      <if><available  file="${sf.rombuild.dir}/ROMBUILD.LOG"/>
+                      <then>
+                          <move file="${sf.rombuild.dir}/ROMBUILD.LOG" tofile="${build.log.dir}/ROMBUILD_@{sf.spec.referenceroms.variant}_@{sf.spec.sbs.config.expanded.i}.log"/>
+                      </then>
+                      <else>
+                          <echo message="ERROR Failed to build @{sf.spec.sbs.config.expanded.i} ROM for @{sf.spec.referenceroms.variant} variant"/>
+                      </else>
+                      </if>
+                  </sequential>
+             </for>
+             </sequential>
+          </for>
+          
+          <move todir="${build.drive}/epoc32/rom/"  verbose="true" failonerror="false">
+            <fileset dir="${sf.rombuild.dir}">
+              <include name="**/*.IMG"/>
+            </fileset>
+          </move>
+      </then>
+      <else><echo message="INFO ROM Build requested but no valid build variants defined by sf.spec.sbs.config. Skipping."/></else>
+      </if>
+    </target>
+
 </project>
 
diff -r ecf2c59629fc -r 5411e23378b4 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Tue Oct 20 10:47:15 2009 +0100
+++ b/common/common_props.ant.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -35,6 +35,8 @@
     
     
     <property name="sf.spec.referenceroms.createimages.enable" value="false"/>
+    <property name="sf.spec.referenceroms.list" value=""/>
+    
     <property name="sf.spec.testroms.createimages.enable" value="false"/>
     
     <property name="sf.spec.sourcesync.enable" value="true"/>
@@ -54,12 +56,12 @@
     <property name="sf.spec.publish.unpackagedartefacts.enable" value="true"/>
     <property name="sf.spec.publish.packagedartefacts.enable" value="true"/>
     <property name="sf.spec.publish.network.freespace" value="10"/>
-    <property name="sf.spec.publish.networkdrive" value="\\v800008\Builds01\SF_builds"/>
-    <property name="sf.spec.publish.rootdir" value="\\v800008\Builds01\SF_builds"/>
+    <property name="sf.spec.publish.networkdrive" value="\\v800020\Publish\SF_builds"/>
+    <property name="sf.spec.publish.rootdir" value="\\v800020\Publish\SF_builds"/>
     <property name="sf.spec.publish.diamonds.server" value="v800002.ad-sfpd.intra"/>
     <property name="sf.spec.publish.diamonds.port" value="80"/>
     <property name="sf.spec.publish.diamonds.path" value="/diamonds/builds/"/>
-    <property name="sf.spec.publish.diamonds.tag" value="test"/>
+    <property name="sf.spec.publish.diamonds.tag" value=""/>
 	<property name="sf.spec.ats_worker.drive" value="C:\apps\ATS3\bin"/>
     
     <property name="sf.spec.tagafterbuild.enable" value="false"/>
diff -r ecf2c59629fc -r 5411e23378b4 common/diamonds/config.xml.ftl
--- a/common/diamonds/config.xml.ftl	Tue Oct 20 10:47:15 2009 +0100
+++ b/common/diamonds/config.xml.ftl	Tue Oct 20 11:03:02 2009 +0100
@@ -42,7 +42,7 @@
         <target name="diamonds" template-file="tool.xml.ftl" 
             logfile="${ant['temp.build.dir']}/build/doc/ivy/tool-dependencies-${ant['build.type']}.xml" ant-properties="true"/>        
         
-        <!-- note: replaced by sf-run-analysis -->
+        <!-- note: replaced by sf-run-analysis-diamonds -->
         <!-- target name="compile-main" template-file="compile.xml.ftl"
             logfile="${ant['diamonds.compile.summary']}" ant-properties="true"/ -->
                     
@@ -73,7 +73,7 @@
         <!-- SF specific -->
         <target name="sf-diamonds-tag-build"/>
         <target name="sf-diamondize-bom"/>
-        <target name="sf-run-analysis"/>
+        <target name="sf-run-analysis-diamonds"/>
     </targets>
 </logger>
 </configuration>
\ No newline at end of file
diff -r ecf2c59629fc -r 5411e23378b4 common/diamonds/linksForDiamonds.xml.ftl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/diamonds/linksForDiamonds.xml.ftl	Tue Oct 20 11:03:02 2009 +0100
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<diamonds-build>
+  <schema>14</schema>
+  <files>
+    <file>
+      <type>log</type>
+      <name>BRAG Summary</name>
+      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\summary\_brag.xml</url>
+    </file>
+    <file>
+      <type>log</type>
+      <name>Build BOM</name>
+      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_BOM.zip</url>
+    </file>
+    <file>
+      <type>log</type>
+      <name>Build Logs</name>
+      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\build_logs.zip</url>
+    </file>
+   </files>
+</diamonds-build>
\ No newline at end of file
diff -r ecf2c59629fc -r 5411e23378b4 common/diamonds/sf-run-analysis-diamonds.xml.ftl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/diamonds/sf-run-analysis-diamonds.xml.ftl	Tue Oct 20 11:03:02 2009 +0100
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<diamonds-build>
+  <schema>14</schema>
+  
+<#assign raptor_errors=0/>
+<#assign raptor_warnings=0/>
+<#list raptor_summary as raptor_item>
+<#if raptor_item.category = "raptor_error">
+  <#assign raptor_errors=raptor_errors+1 />
+<#elseif raptor_item.category = "raptor_warning">
+  <#assign raptor_warnings=raptor_warnings+1 />
+</#if>
+</#list>
+
+  <faults>
+    <total severity="Raptor Errors">${raptor_errors}</total>
+    <total severity="Raptor Warnings">${raptor_warnings}</total>
+    <total severity="Recipes Failed">${ant['sf.job.totalyarperrors']}</total>
+  </faults>
+</diamonds-build>
\ No newline at end of file
diff -r ecf2c59629fc -r 5411e23378b4 common/diamonds/sf-run-analysis.xml.ftl
--- a/common/diamonds/sf-run-analysis.xml.ftl	Tue Oct 20 10:47:15 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<diamonds-build>
-  <schema>10</schema>
-  
-<#assign raptor_errors=0/>
-<#assign raptor_warnings=0/>
-<#list raptor_summary as raptor_item>
-<#if raptor_item.category = "raptor_error">
-  <#assign raptor_errors=raptor_errors+1 />
-<#elseif raptor_item.category = "raptor_warning">
-  <#assign raptor_warnings=raptor_warnings+1 />
-</#if>
-</#list>
-
-  <faults>
-    <total severity="Raptor Errors">${raptor_errors}</total>
-    <total severity="Raptor Warnings">${raptor_warnings}</total>
-    <total severity="Recipes Failed">${ant['sf.job.totalyarperrors']}</total>
-  </faults>
-  
-  <files>
-    <file>
-      <type>log</type>
-      <name>BRAG Summary</name>
-      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\summary\_brag.xml</url>
-    </file>
-    <file>
-      <type>log</type>
-      <name>Raptor summary</name>
-      <url>file:///${ant['sf.spec.publish.networkdrive']}\${ant['sf.spec.job.name']}\builds\${ant['sf.spec.job.codeline']}\${ant['build.id']}\logs\raptorbits\summary.csv</url>
-    </file>
-    <#list files as f>
-    <file>
-      <type>log</type>
-      <name>${f.name}</name>
-      <url>file:///${f.path}</url>
-    </file>
-    </#list>
-   </files>
-  
-</diamonds-build>
\ No newline at end of file
diff -r ecf2c59629fc -r 5411e23378b4 common/tools/ats/bctest/connset/connset.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connset/connset.pl	Tue Oct 20 11:03:02 2009 +0100
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Connection Settings BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "connsettest.zip";
+rmtree "temp";
+mkpath "temp/connsettest/general/testframework";
+mkpath "temp/connsettest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("connset.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BcCMManagerEngineTester.dll",		"temp/connsettest/winscw_udeb/BcCMManagerEngineTester.dll") or die "failed : $!";
+#copy($epoc . "release/winscw/udeb/connset.exe",						"temp/connsettest/winscw_udeb/connset.exe") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_connset.ini",	"temp/connsettest/general/testframework/TestFramework_connset.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/BcCMManagerEngineTester.cfg",	"temp/connsettest/general/testframework/BcCMManagerEngineTester.cfg") or die "failed : $!";
+
+system("7z a -tzip connsettest.zip ./temp/*");
diff -r ecf2c59629fc -r 5411e23378b4 common/tools/ats/bctest/connset/connset.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connset/connset.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Connection Settings BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Connection Settings BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Connection Settings Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="connset" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="connset" harness="ATSINTERFACE" enabled="true" passrate="100">
+                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+                        <command>makedir</command>
+                        <params>
+                            <param dir="c:\spd_logs\xml" /> 
+                        </params>
+                    </step>
+                    <step id="" name="BcCMManagerEngineTester.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="BcCMManagerEngineTester.dll"/>
+							<param dst="c:\sys\bin\BcCMManagerEngineTester.dll"/>
+							<param component-path="connsettest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_connset.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/TestFramework_connset.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="connsettest" />
+						</params>
+					</step>
+					<step id="" name="BcCMManagerEngineTester.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/BcCMManagerEngineTester.cfg"/>
+							<param dst="c:\testframework\BcCMManagerEngineTester.cfg"/>
+							<param component-path="connsettest" />
+						</params>
+					</step>
+					<step id="" name="BcCMManagerEngineTester (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testscripter -config c:\testframework\BcCMManagerEngineTester.cfg"/>
+							<param result-file="c:\spd_logs\xml\testscripter.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="BcCMManagerEngineTester (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>connsettest/winscw_udeb/BcCMManagerEngineTester.dll</file>
+		<file>connsettest/general/testframework/TestFramework_connset.ini</file>
+		<file>connsettest/general/testframework/BcCMManagerEngineTester.cfg</file>
+	</files>
+</test>
diff -r ecf2c59629fc -r 5411e23378b4 common/tools/ats/bctest/connsetui/connsetui.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connsetui/connsetui.pl	Tue Oct 20 11:03:02 2009 +0100
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Maciej Seroka <maciejs@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for Connection Settings UI BC tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "connsetuitest.zip";
+rmtree "temp";
+mkpath "temp/connsetuitest/general/testframework";
+mkpath "temp/connsetuitest/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("connsetui.xml",	"temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BCConnSettingsUITest.dll",		"temp/connsetuitest/winscw_udeb/BCConnSettingsUITest.dll") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/TestFramework_connsetui.ini",	"temp/connsetuitest/general/testframework/TestFramework_connsetui.ini") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/UI_ConnSet.cfg",				"temp/connsetuitest/general/testframework/UI_ConnSet.cfg") or die "failed : $!";
+copy($epoc . "winscw/c/testframework/tcConnSet.cfg",				"temp/connsetuitest/general/testframework/tcConnSet.cfg") or die "failed : $!";
+
+system("7z a -tzip connsetuitest.zip ./temp/*");
diff -r ecf2c59629fc -r 5411e23378b4 common/tools/ats/bctest/connsetui/connsetui.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/connsetui/connsetui.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<test>
+	<id>1</id>
+	<owner>admin</owner>
+	<priority>10</priority>
+	<buildid></buildid>
+	<name>Connection Settings UI BC Tests</name>
+	<target>
+        <device rank="master" alias="emulator_udeb">
+            <property name="HARNESS" value="ATSINTERFACE" />
+        </device>
+	</target>
+	<plan id="" name="Connection Settings UI BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+		<target>
+			<device rank="master" alias="emulator_udeb"/>
+		</target>
+		<session id="" name="Connection Settings UI Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+			<set id="" name="connsetui" harness="ATSINTERFACE" enabled="true" passrate="100">
+				<case id="" name="connsetui" harness="ATSINTERFACE" enabled="true" passrate="100">
+                    <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+                        <command>makedir</command>
+                        <params>
+                            <param dir="c:\spd_logs\xml" /> 
+                        </params>
+                    </step>
+                    <step id="" name="BCConnSettingsUITest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bcconnsettingsuitest.dll"/>
+							<param dst="c:\sys\bin\bcconnsettingsuitest.dll"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="TestFramework_connsetui.ini (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/testframework_connsetui.ini"/>
+							<param dst="c:\testframework\testframework.ini"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="UI_ConnSet.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/ui_connset.cfg"/>
+							<param dst="c:\testframework\ui_connset.cfg"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="tcConnSet.cfg (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="testframework/tcconnset.cfg"/>
+							<param dst="c:\testframework\tcconnset.cfg"/>
+							<param component-path="connsetuitest" />
+						</params>
+					</step>
+					<step id="" name="tcConnSet (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="atsinterface.exe"/>
+							<param parameters="-testmodule testcombiner -config c:\testframework\tcConnSet.cfg"/>
+							<param result-file="c:\spd_logs\xml\testcombiner.xml"/>
+                            <param timeout="1200"/>
+						</params>
+					</step>
+					<step id="" name="tcConnSet (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+						<command>fetch-log</command>
+						<params>
+							<param path="c:\logs\testframework\TestReport.txt" /> 
+						</params>
+					</step>
+				</case>
+			</set>
+		</session>
+	</plan>
+	<files>
+		<file>connsetuitest/winscw_udeb/bcconnsettingsuitest.dll</file>
+		<file>connsetuitest/general/testframework/testframework_connsetui.ini</file>
+		<file>connsetuitest/general/testframework/ui_connset.cfg</file>
+		<file>connsetuitest/general/testframework/tcConnSet.cfg</file>
+	</files>
+</test>
diff -r ecf2c59629fc -r 5411e23378b4 common/tools/generate_diamonds_tags_xml.pl
--- a/common/tools/generate_diamonds_tags_xml.pl	Tue Oct 20 10:47:15 2009 +0100
+++ b/common/tools/generate_diamonds_tags_xml.pl	Tue Oct 20 11:03:02 2009 +0100
@@ -29,6 +29,7 @@
 if ($help or !$outputfile)
 {
 	print "Usage: perl generate_diamonds_tags_xml.pl --tags COMMA_SEPARATED_TAG_LIST --output OUTPUT_FILE\n";
+	exit(0);
 }
 
 open(FILE, ">$outputfile");
diff -r ecf2c59629fc -r 5411e23378b4 common/tools/summary/brag_script.pl
--- a/common/tools/summary/brag_script.pl	Tue Oct 20 10:47:15 2009 +0100
+++ b/common/tools/summary/brag_script.pl	Tue Oct 20 11:03:02 2009 +0100
@@ -613,7 +613,7 @@
 # /E -> Copies directories and subdirectories, including empty ones.
 # /F -> Displays full source and destination file names while copying.
 # /I -> If destination does not exist and copying more than one file, assumes that destination must be a directory.
-my $copy_html = "xcopy $logdir\\html \\\\bishare\\sf_builds\\$project\\builds\\$codeline\\$buildid\\html \/E \/F \/I";
+my $copy_html = "xcopy $logdir\\html \\\\v800020\\Publish\\sf_builds\\$project\\builds\\$codeline\\$buildid\\html \/E \/F \/I";
 print "Exec: $copy_html\n";
 system($copy_html);
 
@@ -668,7 +668,7 @@
 # *****************************************************************************
 
 # Copy html file to bishare
-my $copy_cmd = "copy $logdir\\build_summary.html \\\\bishare\\sf_builds\\$project\\builds\\$codeline\\$buildid";
+my $copy_cmd = "copy $logdir\\build_summary.html \\\\v800020\\Publish\\sf_builds\\$project\\builds\\$codeline\\$buildid";
 print "Exec: $copy_cmd\n";
 system($copy_cmd);
 
diff -r ecf2c59629fc -r 5411e23378b4 sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml	Tue Oct 20 10:47:15 2009 +0100
+++ b/sf-package/symbian3_props.ant.xml	Tue Oct 20 11:03:02 2009 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN3-PROPS">
-  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.a_alpha_FCL.120"/>
+  <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_3.0.a"/>
 </project>