# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1247758418 -3600
# Node ID 13596dc42a476c49647cf6b4f3df6ae6402d3e02
# Parent  97419fef4b8f39c5ec356746255658df910ee2c8# Parent  6beec83e40d89c2da74dff26c9151123bdcf500b
Merge

diff -r 97419fef4b8f -r 13596dc42a47 common/build.xml
--- a/common/build.xml	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/build.xml	Thu Jul 16 16:33:38 2009 +0100
@@ -87,7 +87,7 @@
 				<echo message="Generating Hg local cache..." />
 				<exec executable="perl" dir="${build.log.dir}" failonerror="true" output="${build.log.dir}/${build.id}_hgcache.log">
 					<arg value="${sf.common.config.dir}/tools/cachefiles.pl"/>
-					<arg value="${sf.spec.job.rootdir}/hgcache"/>
+					<arg value="${sf.spec.sourcesync.cachelocation}"/>
 					<arg value="${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}"/>
 					<arg value="${sf.common.config.dir}/generated/${sf.spec.sourcesync.sourcespecfile}"/>
 				</exec>
@@ -259,6 +259,15 @@
         <if>
             <istrue value="${sf.spec.toolsbaseline.enable}" />
             <then>
+
+                <!-- record toolsbaseline information in BOM file -->
+                <delete file="${build.drive}/output/logs/BOM/toolsbaseline.txt" quiet="true"/>
+                <exec executable="cmd" output="${build.drive}/output/logs/BOM/toolsbaseline.txt">
+                    <arg value="/c"/>
+                    <arg value="echo"/>
+                    <arg value="${sf.spec.toolsbaseline.location}"/>
+                </exec>
+
                 <!-- wrapper around preparation-getenv but with diff params -->
                 <runtarget target="sf-getenv-tools"/>
                 
@@ -268,6 +277,10 @@
                     <arg value="${build.drive}/epoc32"/>
                 </exec>
             </then>
+            <else>
+                <!-- record fact that no tools baseline used. required by diamondize-bom  -->
+                <touch file="${build.drive}/output/logs/BOM/toolsbaseline.txt"/>
+            </else>
         </if>        
         <if>
             <istrue value="${sf.spec.baseline.enable}" />
@@ -539,7 +552,8 @@
                 config: csv(${build.drive}/output/logs/BOM/config.csv,{separator:',',headers:[loc,dst,rev]})
                 project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]})
                 baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim})
-                sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,rev]})              
+                toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim})
+                sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]})              
             </data>
         </fmpp>
         <!-- Make a copy in BOM dir -->
@@ -719,10 +733,9 @@
         <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="--device-name=ATSINTERFACE EMULATOR on ${env.COMPUTERNAME}"/>
+            <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}"/>
-
         </exec>
         <!-- Now ready to send to ATS3 -->
     </target>   
@@ -761,8 +774,7 @@
             <arg value="${sf.common.config.dir}/tools/analysis/analyse_components.pl"/>
             <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
             <arg value="${build.id}_what_results.csv_results.csv"/>
-            <arg value="${sf.project.location}/sysdefs/system_model_os_contributed.xml"/>
-            <arg value="${sf.project.location}/sysdefs/system_model_s60_contributed.xml"/>
+            <arg value="${sf.project.location}/sysdefs/system_model_os.xml"/>
         </exec>
 
         <echo message="Running collision analysis"/>
diff -r 97419fef4b8f -r 13596dc42a47 common/common_props.ant.xml
--- a/common/common_props.ant.xml	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/common_props.ant.xml	Thu Jul 16 16:33:38 2009 +0100
@@ -36,6 +36,7 @@
     <property name="sf.spec.sourcesync.enable" value="true"/>
     <property name="sf.spec.sourcesync.usecache" value="false"/>
     <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv"/>
+    <property name="sf.spec.sourcesync.cachelocation" value="${sf.spec.job.rootdir}/hgcache"/>
     
     <property name="sf.spec.baseline.enable" value="true"/>
     <property name="sf.spec.baseline.select" value="auto"/> <!-- auto|explicit|location -->
@@ -85,7 +86,7 @@
 
     <!-- ATS local properties -->
     <property name="sf.spec.test.package.location"  value="T:\${env.COMPUTERNAME}"/>
-    <property name="sf.spec.test.package.name"      value="Smoketest-${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}.zip"/> <!-- build.id not available at this point, so construct it from component parts -->
+    <property name="sf.spec.test.package.name"      value="${env.COMPUTERNAME}-Smoketest-${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}.zip"/> <!-- build.id not available at this point, so construct it from component parts -->
     <property name="sf.spec.test.package.droppath"  value="D:\ATS3\TestDrops"/>
 
     <!-- BC check properties -->
diff -r 97419fef4b8f -r 13596dc42a47 common/templates/build-info.xml.ftl
--- a/common/templates/build-info.xml.ftl	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/templates/build-info.xml.ftl	Thu Jul 16 16:33:38 2009 +0100
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<#assign row = 0 />
+
 <diamonds-build>
   <content>
     <project>
@@ -20,9 +23,18 @@
       </#list>
     </project>
     <project>
+      <name>Tools Baseline</name>
+      <#list toolsbaseline as b>
+      <baseline>${b}</baseline>
+      </#list>
+    </project>
+    <project>
  	  <name>Sources</name>
  	  <#list sources as s>
+	  <#if (row!=0)>
  	  <baseline>${s.loc}#${s.rev}</baseline>
+	  </#if>
+	  <#assign row = row + 1 />
  	  </#list>
     </project>
   </content>
diff -r 97419fef4b8f -r 13596dc42a47 common/templates/source-spec.ant.xml.ftl
--- a/common/templates/source-spec.ant.xml.ftl	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl	Thu Jul 16 16:33:38 2009 +0100
@@ -18,18 +18,34 @@
             <#assign fileset = "${fileset}"  />
         </#if>
         <sequential>
+            <!-- create sf\layer dir  -->
             <delete dir="${ant['build.drive']}${pkg_detail.dst}" failonerror="false"/>
             <mkdir dir="${ant['build.drive']}${pkg_detail.dst}"/>
+            <delete dir="${ant['build.drive']}${pkg_detail.dst}" failonerror="false"/>
+
+            <exec executable="hg" dir="${ant['build.drive']}">
+                <arg value="clone"/>
+                <arg value="-U"/>
+                <arg value="${pkg_detail.source}"/>
+                <arg value="${ant['build.drive']}${pkg_detail.dst}"/>
+            </exec>
+
             <hlm:scm verbose="true" scmUrl="scm:hg:${pkg_detail.source}">
-                <hlm:checkout basedir="${ant['build.drive']}${pkg_detail.dst}"/>
+                <!--hlm:checkout basedir="${ant['build.drive']}${pkg_detail.dst}"/-->
+                <#if "${pkg_detail.type}"=="tag" >
                 <hlm:tags basedir="${ant['build.drive']}${pkg_detail.dst}" reference="hg.tags.id${dollar}{refid}"/>
                 <hlm:update basedir="${ant['build.drive']}${pkg_detail.dst}">
-                    <hlm:latestTag pattern="${pkg_detail.tag}">
+                <hlm:latestTag pattern="${pkg_detail.pattern}">
                         <hlm:tagSet refid="hg.tags.id${dollar}{refid}" />
-                    </hlm:latestTag>
+                </hlm:latestTag>
                 </hlm:update>
+                </#if>
+                <#if "${pkg_detail.type}"== "changeset" || "${pkg_detail.type}"=="branch">
+                <hlm:update basedir="${ant['build.drive']}${pkg_detail.dst}">
+                     <hlm:tag name="${pkg_detail.pattern}"/>
+                </hlm:update>
+                </#if>
             </hlm:scm>
-        
         </sequential>
     </target>
 
@@ -38,26 +54,21 @@
         <sequential>
             
             <!-- record info on source code repo/rev in BOM file  -->
-            <exec executable="hg" dir="${ant['build.drive']}${pkg_detail.dst}" outputproperty="sf.sourcesync.${count}.rev">
-                <arg value="identify"/>
-                <arg value="-n"/>
-            </exec>
             <exec executable="hg" dir="${ant['build.drive']}${pkg_detail.dst}" outputproperty="sf.sourcesync.${count}.checksum">
                 <arg value="identify"/>
                 <arg value="-i"/>
             </exec>
-            <echo message="dir ${ant['build.drive']}${pkg_detail.dst} : revision ${dollar}{sf.sourcesync.${count}.rev}:${dollar}{sf.sourcesync.${count}.checksum}"/>
+            <echo message="dir ${ant['build.drive']}${pkg_detail.dst} : ${dollar}{sf.sourcesync.${count}.checksum}"/>
             <exec executable="cmd" output="${ant['build.drive']}/output/logs/BOM/sources.csv" append="true">
                 <arg value="/c"/>
                 <arg value="echo"/>
-                <arg value="${pkg_detail.source},${pkg_detail.dst},${dollar}{sf.sourcesync.${count}.rev}:${dollar}{sf.sourcesync.${count}.checksum}"/>
+                <arg value="${pkg_detail.source},${pkg_detail.dst},changeset,${dollar}{sf.sourcesync.${count}.checksum}"/>
             </exec>
-        
         </sequential>
     </target>
 
 
-    <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.pattern}\"/>" />       
+    <#assign fileset = "${fileset}" + "<fileset dir=\"${ant['build.drive']}${pkg_detail.dst}\" includes=\"${pkg_detail.sysdef}\"/>" />       
     <#assign sync_list = "${sync_list}" + "<runtarget target=\"sf-prebuild-${count}\"/>\n"/>       
     <#assign bom_list = "${bom_list}" + "<runtarget target=\"sf-bom-info-${count}\"/>\n"/>    
     <#assign count = count + 1 />
@@ -75,7 +86,13 @@
     ${sync_list}
   </parallel>
 
-
+  <echo message="Adding BOM header"/>
+      <exec executable="cmd" output="${ant['build.drive']}/output/logs/BOM/sources.csv" append="true">
+      <arg value="/c"/>
+      <arg value="echo"/>
+      <arg value="source,dst,type,pattern,sysdef"/>
+  </exec>
+  
   ${bom_list}
 
 </target>
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/analysis/find_collisions.pl
--- a/common/tools/analysis/find_collisions.pl	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/tools/analysis/find_collisions.pl	Thu Jul 16 16:33:38 2009 +0100
@@ -135,30 +135,31 @@
   {
     if(-e $left && -e $right)
     {
-      my $leftdiff = 0;
-      my $rightdiff = 0;
-      open(DIFF,"diff $left $target|") or die "couldn't execute diff";
-      print "diff $left $target\n";
+      my $leftdiff = 1;
+      my $rightdiff = 1;
+      open(DIFF,"fc $left $target|") or die "couldn't execute fc";
+      print "fc $left $target\n";
       
       while(my $line = <DIFF>)
       {
-        if($line =~ m/\S+/)
+        
+        if($line =~ m/FC:\sno\sdifferences\sencountered/i)
         {
-          $leftdiff = 1;
-          print "\t$line";
+          $leftdiff = 0;
         }
+        print "\t$line";
       }
       close DIFF;
 
-      open(DIFF,"diff $right $target|") or die "couldn't execute diff";
-      print "diff $right $target\n";
+      open(DIFF,"fc $right $target|") or die "couldn't execute fc";
+      print "fc $right $target\n";
       while( my $line = <DIFF>)
       {
-        if($line =~ m/\S+/)
+        if($line =~ m/FC:\sno\sdifferences\sencountered/i)
         {
-          $rightdiff = 1;
-         print "\t$line";
+          $rightdiff = 0;
         }
+        print "\t$line";
       }
       close DIFF;
 
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/ats/bctest/BC_PLAT.h
--- a/common/tools/ats/bctest/BC_PLAT.h	Thu Jul 16 14:35:54 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#define __SERIES60_30__
-#define __SERIES60_31__
-#define __S60_32__
-#define __S60_50__
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/ats/bctest/bctest.pl
--- a/common/tools/ats/bctest/bctest.pl	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/tools/ats/bctest/bctest.pl	Thu Jul 16 16:33:38 2009 +0100
@@ -15,6 +15,7 @@
 copy("bctest.xml",																"temp/test.xml");
 copy($epoc . "winscw/c/UIFW.bat",												"temp/bctest/general/UIFW.bat");
 copy($epoc . "winscw/c/BCTestLog/config.xml",									"temp/bctest/BCTestLog/general/config.xml");
+copy($epoc . "winscw/c/BCTestLog/sdkversion.log",								"temp/bctest/BCTestLog/general/sdkversion.log");
 copy($epoc . "winscw/c/BCTestLog/release_note.txt",								"temp/bctest/BCTestLog/general/release_note.txt");
 
 copy($epoc . "data/z/resource/apps/bctestlauncher_aif.mbm",						"temp/bctest/winscw_udeb/z/resource/apps/bctestlauncher_aif.mbm");
@@ -78,6 +79,8 @@
 
 copy($epoc . "data/z/resource/apps/bctestlist_aif.mbm",							"temp/bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm");
 copy($epoc . "data/z/resource/apps/bctestlist.rsc",								"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.rsc");
+copy($epoc . "release/winscw/udeb/z/resource/apps/bctestlist.mbm",				"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.mbm");
+copy($epoc . "release/winscw/udeb/z/resource/apps/bctestlist.mif",				"temp/bctest/winscw_udeb/z/resource/apps/bctestlist.mif");
 copy($epoc . "data/z/private/10003a3f/apps/bctestlist_reg.rsc",					"temp/bctest/winscw_udeb/z/private/10003a3f/apps/bctestlist_reg.rsc");
 
 copy($epoc . "data/z/resource/apps/bctestmenu.rsc",								"temp/bctest/winscw_udeb/z/resource/apps/bctestmenu.rsc");
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/ats/bctest/bctest.xml
--- a/common/tools/ats/bctest/bctest.xml	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/tools/ats/bctest/bctest.xml	Thu Jul 16 16:33:38 2009 +0100
@@ -31,8 +31,26 @@
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="*"/>
-							<param dst="c:\BCTestLog"/>
+							<param src="config.xml"/>
+							<param dst="c:\BCTestLog\config.xml"/>
+							<param component-path="bctest\BCTestLog" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="sdkversion.log"/>
+							<param dst="c:\BCTestLog\sdkversion.log"/>
+							<param component-path="bctest\BCTestLog" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="data"/>
+							<param src="release_note.txt"/>
+							<param dst="c:\BCTestLog\release_note.txt"/>
 							<param component-path="bctest\BCTestLog" />
 						</params>
 					</step>
@@ -40,8 +58,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestlauncher_aif.mbm"/>
-							<param dst="z:\resource\apps\bctestlauncher_aif.mbm"/>
+							<param src="bctestutil.dll"/>
+							<param dst="c:\sys\bin\bctestutil.dll"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestlauncher.exe"/>
+							<param dst="c:\sys\bin\bctestlauncher.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlauncher_reg.r01"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlauncher_reg.r01"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -58,8 +94,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlauncher_reg.r01"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlauncher_reg.r01"/>
+							<param src="z/resource/apps/bctestlauncher_aif.mbm"/>
+							<param dst="z:\resource\apps\bctestlauncher_aif.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestbuttons_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestbuttons_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -85,17 +130,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestbuttons_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestbuttons_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestsliderandicons.rsc"/>
-							<param dst="z:\resource\apps\bctestsliderandicons.rsc"/>
+							<param src="bctestbuttons.exe"/>
+							<param dst="c:\sys\bin\bctestbuttons.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -112,6 +148,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestsliderandicons.rsc"/>
+							<param dst="z:\resource\apps\bctestsliderandicons.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestsliderandicons.exe"/>
+							<param dst="c:\sys\bin\bctestsliderandicons.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestaknsound_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestaknsound_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestaknsound.mbm"/>
 							<param dst="z:\resource\apps\bctestaknsound.mbm"/>
 							<param component-path="bctest" />
@@ -121,6 +184,15 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestaknsound.rsc"/>
+							<param dst="z:\resource\apps\bctestaknsound.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestaknsound_aif.mbm"/>
 							<param dst="z:\resource\apps\bctestaknsound_aif.mbm"/>
 							<param component-path="bctest" />
@@ -130,26 +202,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestaknsound.rsc"/>
-							<param dst="z:\resource\apps\bctestaknsound.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestaknsound_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestaknsound_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestappfrm.rsc"/>
-							<param dst="z:\resource\apps\bctestappfrm.rsc"/>
+							<param src="bctestaknsound.exe"/>
+							<param dst="c:\sys\bin\bctestaknsound.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -166,8 +220,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestcmdlg.rsc"/>
-							<param dst="z:\resource\apps\bctestcmdlg.rsc"/>
+							<param src="z/resource/apps/bctestappfrm.rsc"/>
+							<param dst="z:\resource\apps\bctestappfrm.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestappfrm.exe"/>
+							<param dst="c:\sys\bin\bctestappfrm.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -184,8 +247,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestdocandinit.rsc"/>
-							<param dst="z:\resource\apps\bctestdocandinit.rsc"/>
+							<param src="z/resource/apps/bctestcmdlg.rsc"/>
+							<param dst="z:\resource\apps\bctestcmdlg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestcmdlg.exe"/>
+							<param dst="c:\sys\bin\bctestcmdlg.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -202,8 +274,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteditor.rsc"/>
-							<param dst="z:\resource\apps\bctesteditor.rsc"/>
+							<param src="z/resource/apps/bctestdocandinit.rsc"/>
+							<param dst="z:\resource\apps\bctestdocandinit.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestdocandinit.exe"/>
+							<param dst="c:\sys\bin\bctestdocandinit.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -220,8 +301,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteh.rsc"/>
-							<param dst="z:\resource\apps\bctesteh.rsc"/>
+							<param src="z/resource/apps/bctesteditor.rsc"/>
+							<param dst="z:\resource\apps\bctesteditor.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctesteditor.exe"/>
+							<param dst="c:\sys\bin\bctesteditor.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -238,8 +328,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteikbctrl_aif.mbm"/>
-							<param dst="z:\resource\apps\bctesteikbctrl_aif.mbm"/>
+							<param src="z/resource/apps/bctesteh.rsc"/>
+							<param dst="z:\resource\apps\bctesteh.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -247,8 +337,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteikbctrl.rsc"/>
-							<param dst="z:\resource\apps\bctesteikbctrl.rsc"/>
+							<param src="bctesteh.exe"/>
+							<param dst="c:\sys\bin\bctesteh.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -265,8 +355,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctesteikfrm.r01"/>
-							<param dst="z:\resource\apps\bctesteikfrm.r01"/>
+							<param src="z/resource/apps/bctesteikbctrl.rsc"/>
+							<param dst="z:\resource\apps\bctesteikbctrl.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctesteikbctrl_aif.mbm"/>
+							<param dst="z:\resource\apps\bctesteikbctrl_aif.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctesteikbctrl.exe"/>
+							<param dst="c:\sys\bin\bctesteikbctrl.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -283,6 +391,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctesteikfrm.r01"/>
+							<param dst="z:\resource\apps\bctesteikfrm.r01"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctesteikfrm.exe"/>
+							<param dst="c:\sys\bin\bctesteikfrm.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestfontinput_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestfontinput_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestfontinput.mbm"/>
 							<param dst="z:\resource\apps\bctestfontinput.mbm"/>
 							<param component-path="bctest" />
@@ -292,6 +427,15 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestfontinput.rsc"/>
+							<param dst="z:\resource\apps\bctestfontinput.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestfontinput_aif.mbm"/>
 							<param dst="z:\resource\apps\bctestfontinput_aif.mbm"/>
 							<param component-path="bctest" />
@@ -301,8 +445,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestfontinput.rsc"/>
-							<param dst="z:\resource\apps\bctestfontinput.rsc"/>
+							<param src="bctestfontinput.exe"/>
+							<param dst="c:\sys\bin\bctestfontinput.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -310,8 +454,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestfontinput_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestfontinput_reg.rsc"/>
+							<param src="z/private/10003a3f/apps/bctestform_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestform_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -328,17 +472,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestform_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestform_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestgrids.rsc"/>
-							<param dst="z:\resource\apps\bctestgrids.rsc"/>
+							<param src="bctestform.exe"/>
+							<param dst="c:\sys\bin\bctestform.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -355,8 +490,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestimage_aif.mbm"/>
-							<param dst="z:\resource\apps\bctestimage_aif.mbm"/>
+							<param src="z/resource/apps/bctestgrids.rsc"/>
+							<param dst="z:\resource\apps\bctestgrids.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestgrids.exe"/>
+							<param dst="c:\sys\bin\bctestgrids.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestimage_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestimage_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -373,8 +526,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestimage_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestimage_reg.rsc"/>
+							<param src="z/resource/apps/bctestimage_aif.mbm"/>
+							<param dst="z:\resource\apps\bctestimage_aif.mbm"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -382,8 +535,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestkeylock.rsc"/>
-							<param dst="z:\resource\apps\bctestkeylock.rsc"/>
+							<param src="bctestimage.exe"/>
+							<param dst="c:\sys\bin\bctestimage.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -400,6 +553,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestkeylock.rsc"/>
+							<param dst="z:\resource\apps\bctestkeylock.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestkeylock.exe"/>
+							<param dst="c:\sys\bin\bctestkeylock.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlabelinfoindicators_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlabelinfoindicators_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestlabelinfoindicators.rsc"/>
 							<param dst="z:\resource\apps\bctestlabelinfoindicators.rsc"/>
 							<param component-path="bctest" />
@@ -409,8 +589,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlabelinfoindicators_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlabelinfoindicators_reg.rsc"/>
+							<param src="bctestlabelinfoindicators.exe"/>
+							<param dst="c:\sys\bin\bctestlabelinfoindicators.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlist_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlist_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestlist.rsc"/>
+							<param dst="z:\resource\apps\bctestlist.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -427,8 +625,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestlist.rsc"/>
-							<param dst="z:\resource\apps\bctestlist.rsc"/>
+							<param src="z/resource/apps/bctestlist.mbm"/>
+							<param dst="z:\resource\apps\bctestlist.mbm"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -436,8 +634,26 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlist_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlist_reg.rsc"/>
+							<param src="z/resource/apps/bctestlist.mif"/>
+							<param dst="z:\resource\apps\bctestlist.mif"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestlist.exe"/>
+							<param dst="c:\sys\bin\bctestlist.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestmenu_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmenu_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -454,8 +670,53 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmenu_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmenu_reg.rsc"/>
+							<param src="bctestmenu.exe"/>
+							<param dst="c:\sys\bin\bctestmenu.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestmisccontrol_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmisccontrol_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestmisccontrol.mbm"/>
+							<param dst="z:\resource\apps\bctestmisccontrol.mbm"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestmisccontrol.rsc"/>
+							<param dst="z:\resource\apps\bctestmisccontrol.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestmisccontrol.exe"/>
+							<param dst="c:\sys\bin\bctestmisccontrol.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestnote_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestnote_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -481,8 +742,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestnote_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestnote_reg.rsc"/>
+							<param src="bctestnote.exe"/>
+							<param dst="c:\sys\bin\bctestnote.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestnotifier_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestnotifier_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -499,8 +769,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestnotifier_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestnotifier_reg.rsc"/>
+							<param src="bctestnotifier.exe"/>
+							<param dst="c:\sys\bin\bctestnotifier.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestpane_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestpane_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -517,8 +796,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestpane_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestpane_reg.rsc"/>
+							<param src="bctestpane.exe"/>
+							<param dst="c:\sys\bin\bctestpane.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestpopups_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestpopups_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -544,8 +832,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestpopups_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestpopups_reg.rsc"/>
+							<param src="bctestpopups.exe"/>
+							<param dst="c:\sys\bin\bctestpopups.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestprivateuifrm_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestprivateuifrm_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -562,17 +859,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestprivateuifrm_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestprivateuifrm_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestptieng.rsc"/>
-							<param dst="z:\resource\apps\bctestptieng.rsc"/>
+							<param src="bctestprivateuifrm.exe"/>
+							<param dst="c:\sys\bin\bctestprivateuifrm.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -589,8 +877,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestquery.rsc"/>
-							<param dst="z:\resource\apps\bctestquery.rsc"/>
+							<param src="z/resource/apps/bctestptieng.rsc"/>
+							<param dst="z:\resource\apps\bctestptieng.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestptieng.exe"/>
+							<param dst="c:\sys\bin\bctestptieng.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -607,6 +904,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestquery.rsc"/>
+							<param dst="z:\resource\apps\bctestquery.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestquery.exe"/>
+							<param dst="c:\sys\bin\bctestquery.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestscreenclearer_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestscreenclearer_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestscreenclearer.mbm"/>
 							<param dst="z:\resource\apps\bctestscreenclearer.mbm"/>
 							<param component-path="bctest" />
@@ -616,6 +940,15 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestscreenclearer.rsc"/>
+							<param dst="z:\resource\apps\bctestscreenclearer.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestscreenclearer_aif.mbm"/>
 							<param dst="z:\resource\apps\bctestscreenclearer_aif.mbm"/>
 							<param component-path="bctest" />
@@ -625,8 +958,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestscreenclearer.rsc"/>
-							<param dst="z:\resource\apps\bctestscreenclearer.rsc"/>
+							<param src="bctestscreenclearer.exe"/>
+							<param dst="c:\sys\bin\bctestscreenclearer.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -634,8 +967,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestscreenclearer_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestscreenclearer_reg.rsc"/>
+							<param src="z/private/10003a3f/apps/bctestscroller_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestscroller_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -652,8 +985,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestscroller_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestscroller_reg.rsc"/>
+							<param src="bctestscroller.exe"/>
+							<param dst="c:\sys\bin\bctestscroller.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestsearchfield_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestsearchfield_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -670,8 +1012,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestsearchfield_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestsearchfield_reg.rsc"/>
+							<param src="bctestsearchfield.exe"/>
+							<param dst="c:\sys\bin\bctestsearchfield.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestserverapp_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestserverapp_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -688,8 +1039,35 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestserverapp_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestserverapp_reg.rsc"/>
+							<param src="bctestserverapp.exe"/>
+							<param dst="c:\sys\bin\bctestserverapp.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestsettingpage_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestsettingpage_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestsettingpage.rsc"/>
+							<param dst="z:\resource\apps\bctestsettingpage.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctestsettingpage_aif.mbm"/>
+							<param dst="z:\resource\apps\bctestsettingpage_aif.mbm"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -706,8 +1084,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestsettingpage_aif.mbm"/>
-							<param dst="z:\resource\apps\bctestsettingpage_aif.mbm"/>
+							<param src="bctestsettingpage.exe"/>
+							<param dst="c:\sys\bin\bctestsettingpage.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -715,17 +1093,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestsettingpage.rsc"/>
-							<param dst="z:\resource\apps\bctestsettingpage.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestsettingpage_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestsettingpage_reg.rsc"/>
+							<param src="z/private/10003a3f/apps/bctestskins_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestskins_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -742,8 +1111,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestskins_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestskins_reg.rsc"/>
+							<param src="bctestskins.exe"/>
+							<param dst="c:\sys\bin\bctestskins.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestutilities_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestutilities_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -760,8 +1138,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestutilities_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestutilities_reg.rsc"/>
+							<param src="bctestutilities.exe"/>
+							<param dst="c:\sys\bin\bctestutilities.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestvolume_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestvolume_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -787,17 +1174,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestvolume_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestvolume_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestocr.rsc"/>
-							<param dst="z:\resource\apps\bctestocr.rsc"/>
+							<param src="bctestvolume.exe"/>
+							<param dst="c:\sys\bin\bctestvolume.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -814,8 +1192,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestmisc.rsc"/>
-							<param dst="z:\resource\apps\bctestmisc.rsc"/>
+							<param src="z/resource/apps/bctestocr.rsc"/>
+							<param dst="z:\resource\apps\bctestocr.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestocr.exe"/>
+							<param dst="c:\sys\bin\bctestocr.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -832,6 +1219,33 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/resource/apps/bctestmisc.rsc"/>
+							<param dst="z:\resource\apps\bctestmisc.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="bctestmisc.exe"/>
+							<param dst="c:\sys\bin\bctestmisc.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlocation_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlocation_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="z/resource/apps/bctestlocation.rsc"/>
 							<param dst="z:\resource\apps\bctestlocation.rsc"/>
 							<param component-path="bctest" />
@@ -841,8 +1255,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlocation_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlocation_reg.rsc"/>
+							<param src="bctestlocation.exe"/>
+							<param dst="c:\sys\bin\bctestlocation.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestuniteditor_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestuniteditor_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -859,8 +1282,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestuniteditor_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestuniteditor_reg.rsc"/>
+							<param src="bctestuniteditor.exe"/>
+							<param dst="c:\sys\bin\bctestuniteditor.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestmisc32_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmisc32_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -877,8 +1309,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmisc32_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmisc32_reg.rsc"/>
+							<param src="bctestmisc32.exe"/>
+							<param dst="c:\sys\bin\bctestmisc32.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestlocalizer_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestlocalizer_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -895,8 +1336,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestlocalizer_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestlocalizer_reg.rsc"/>
+							<param src="bctestlocalizer.exe"/>
+							<param dst="c:\sys\bin\bctestlocalizer.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestpreviewpopup_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -913,8 +1363,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestpreviewpopup_reg.rsc"/>
+							<param src="bctestpreviewpopup.exe"/>
+							<param dst="c:\sys\bin\bctestpreviewpopup.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestservicehandler_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestservicehandler_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -931,8 +1390,17 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestservicehandler_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestservicehandler_reg.rsc"/>
+							<param src="bctestservicehandler.exe"/>
+							<param dst="c:\sys\bin\bctestservicehandler.exe"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctestbutton_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestbutton_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -949,17 +1417,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestbutton_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestbutton_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestchoicelist.rsc"/>
-							<param dst="z:\resource\apps\bctestchoicelist.rsc"/>
+							<param src="bctestbutton.exe"/>
+							<param dst="c:\sys\bin\bctestbutton.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -976,152 +1435,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="z/resource/apps/bctestmix50.rsc"/>
-							<param dst="z:\resource\apps\bctestmix50.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmix50_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmix50_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctesttoolbar.rsc"/>
-							<param dst="z:\resource\apps\bctesttoolbar.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctesttoolbar_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctesttoolbar_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctesttouchpane.rsc"/>
-							<param dst="z:\resource\apps\bctesttouchpane.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctesttouchpane_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctesttouchpane_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctesttreelist.rsc"/>
-							<param dst="z:\resource\apps\bctesttreelist.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctesttreelist_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctesttreelist_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestmisccontrol.mbm"/>
-							<param dst="z:\resource\apps\bctestmisccontrol.mbm"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/resource/apps/bctestmisccontrol.rsc"/>
-							<param dst="z:\resource\apps\bctestmisccontrol.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="z/private/10003a3f/apps/bctestmisccontrol_reg.rsc"/>
-							<param dst="z:\private\10003a3f\import\apps\bctestmisccontrol_reg.rsc"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestutil.dll"/>
-							<param dst="c:\sys\bin\bctestutil.dll"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlauncher.exe"/>
-							<param dst="c:\sys\bin\bctestlauncher.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestaknsound.exe"/>
-							<param dst="c:\sys\bin\bctestaknsound.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestappfrm.exe"/>
-							<param dst="c:\sys\bin\bctestappfrm.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestbutton.exe"/>
-							<param dst="c:\sys\bin\bctestbutton.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestbuttons.exe"/>
-							<param dst="c:\sys\bin\bctestbuttons.exe"/>
+							<param src="z/resource/apps/bctestchoicelist.rsc"/>
+							<param dst="z:\resource\apps\bctestchoicelist.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1138,80 +1453,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestcmdlg.exe"/>
-							<param dst="c:\sys\bin\bctestcmdlg.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestdocandinit.exe"/>
-							<param dst="c:\sys\bin\bctestdocandinit.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteditor.exe"/>
-							<param dst="c:\sys\bin\bctesteditor.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteh.exe"/>
-							<param dst="c:\sys\bin\bctesteh.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteikbctrl.exe"/>
-							<param dst="c:\sys\bin\bctesteikbctrl.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctesteikfrm.exe"/>
-							<param dst="c:\sys\bin\bctesteikfrm.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestfontinput.exe"/>
-							<param dst="c:\sys\bin\bctestfontinput.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestform.exe"/>
-							<param dst="c:\sys\bin\bctestform.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestgrids.exe"/>
-							<param dst="c:\sys\bin\bctestgrids.exe"/>
+							<param src="z/private/10003a3f/apps/bctestmix50_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctestmix50_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1219,89 +1462,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestimage.exe"/>
-							<param dst="c:\sys\bin\bctestimage.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestkeylock.exe"/>
-							<param dst="c:\sys\bin\bctestkeylock.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlabelinfoindicators.exe"/>
-							<param dst="c:\sys\bin\bctestlabelinfoindicators.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlist.exe"/>
-							<param dst="c:\sys\bin\bctestlist.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlocalizer.exe"/>
-							<param dst="c:\sys\bin\bctestlocalizer.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestlocation.exe"/>
-							<param dst="c:\sys\bin\bctestlocation.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmenu.exe"/>
-							<param dst="c:\sys\bin\bctestmenu.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmisc.exe"/>
-							<param dst="c:\sys\bin\bctestmisc.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmisc32.exe"/>
-							<param dst="c:\sys\bin\bctestmisc32.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestmisccontrol.exe"/>
-							<param dst="c:\sys\bin\bctestmisccontrol.exe"/>
+							<param src="z/resource/apps/bctestmix50.rsc"/>
+							<param dst="z:\resource\apps\bctestmix50.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1318,71 +1480,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestnote.exe"/>
-							<param dst="c:\sys\bin\bctestnote.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestnotifier.exe"/>
-							<param dst="c:\sys\bin\bctestnotifier.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestocr.exe"/>
-							<param dst="c:\sys\bin\bctestocr.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestpane.exe"/>
-							<param dst="c:\sys\bin\bctestpane.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestpopups.exe"/>
-							<param dst="c:\sys\bin\bctestpopups.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestpreviewpopup.exe"/>
-							<param dst="c:\sys\bin\bctestpreviewpopup.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestprivateuifrm.exe"/>
-							<param dst="c:\sys\bin\bctestprivateuifrm.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestptieng.exe"/>
-							<param dst="c:\sys\bin\bctestptieng.exe"/>
+							<param src="z/private/10003a3f/apps/bctesttoolbar_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctesttoolbar_reg.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1390,80 +1489,8 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
-							<param src="bctestquery.exe"/>
-							<param dst="c:\sys\bin\bctestquery.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestscreenclearer.exe"/>
-							<param dst="c:\sys\bin\bctestscreenclearer.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestscroller.exe"/>
-							<param dst="c:\sys\bin\bctestscroller.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestsearchfield.exe"/>
-							<param dst="c:\sys\bin\bctestsearchfield.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestserverapp.exe"/>
-							<param dst="c:\sys\bin\bctestserverapp.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestservicehandler.exe"/>
-							<param dst="c:\sys\bin\bctestservicehandler.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestsettingpage.exe"/>
-							<param dst="c:\sys\bin\bctestsettingpage.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestskins.exe"/>
-							<param dst="c:\sys\bin\bctestskins.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestsliderandicons.exe"/>
-							<param dst="c:\sys\bin\bctestsliderandicons.exe"/>
+							<param src="z/resource/apps/bctesttoolbar.rsc"/>
+							<param dst="z:\resource\apps\bctesttoolbar.rsc"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
@@ -1480,6 +1507,24 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctesttouchpane_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctesttouchpane_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctesttouchpane.rsc"/>
+							<param dst="z:\resource\apps\bctesttouchpane.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="bctesttouchpane.exe"/>
 							<param dst="c:\sys\bin\bctesttouchpane.exe"/>
 							<param component-path="bctest" />
@@ -1489,38 +1534,29 @@
 						<command>install</command>
 						<params>
 							<param type="binary"/>
+							<param src="z/private/10003a3f/apps/bctesttreelist_reg.rsc"/>
+							<param dst="z:\private\10003a3f\import\apps\bctesttreelist_reg.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
+							<param src="z/resource/apps/bctesttreelist.rsc"/>
+							<param dst="z:\resource\apps\bctesttreelist.rsc"/>
+							<param component-path="bctest" />
+						</params>
+					</step>
+					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+						<command>install</command>
+						<params>
+							<param type="binary"/>
 							<param src="bctesttreelist.exe"/>
 							<param dst="c:\sys\bin\bctesttreelist.exe"/>
 							<param component-path="bctest" />
 						</params>
 					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestuniteditor.exe"/>
-							<param dst="c:\sys\bin\bctestuniteditor.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestutilities.exe"/>
-							<param dst="c:\sys\bin\bctestutilities.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
-					<step id="" name="Test Step 1 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="binary"/>
-							<param src="bctestvolume.exe"/>
-							<param dst="c:\sys\bin\bctestvolume.exe"/>
-							<param component-path="bctest" />
-						</params>
-					</step>
 					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
 						<command>execute</command>
 						<params>
@@ -1675,16 +1711,6 @@
 						<command>execute</command>
 						<params>
 							<param file="bctestlauncher.exe"/>
-							<param parameters="bctestkeylock"/>
-							<param result-file="c:\BCTestLog\bctestkeylock_TestLog.txt"/>
-							<param parser="BCTestResultParser"/>
-							<param timeout="1000"/>
-						</params>
-					</step>
-					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
-						<command>execute</command>
-						<params>
-							<param file="bctestlauncher.exe"/>
 							<param parameters="bctestlabelinfoindicators"/>
 							<param result-file="c:\BCTestLog\bctestlabelinfoindicators_TestLog.txt"/>
 							<param parser="BCTestResultParser"/>
@@ -2001,6 +2027,16 @@
 							<param timeout="1000"/>
 						</params>
 					</step>
+					<step id="" name="Test Step 2 (execute)" harness="GENERIC" enabled="true" passrate="100">
+						<command>execute</command>
+						<params>
+							<param file="bctestlauncher.exe"/>
+							<param parameters="bctestkeylock"/>
+							<param result-file="c:\BCTestLog\bctestkeylock_TestLog.txt"/>
+							<param parser="BCTestResultParser"/>
+							<param timeout="1000"/>
+						</params>
+					</step>
 				</case>
 			</set>
 		</session>
@@ -2009,170 +2045,173 @@
 		<file>bctest/general/UIFW.bat</file>
 		<file>bctest/BCTestLog/general/release_note.txt</file>
 		<file>bctest/BCTestLog/general/config.xml</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestlauncher_aif.mbm</file>
+		<file>bctest/BCTestLog/general/sdkversion.log</file>
+		<file>bctest/winscw_udeb/bctestutil.dll</file>
+		<file>bctest/winscw_udeb/bctestlauncher.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlauncher_reg.r01</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlauncher.r01</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlauncher_reg.r01</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlauncher_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestbuttons_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestbuttons.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestbuttons.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestbuttons_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestbuttons.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsliderandicons_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestsliderandicons.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsliderandicons_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestsliderandicons.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestaknsound_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestaknsound.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestaknsound_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestaknsound.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestappfrm_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestappfrm.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestappfrm_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestappfrm.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestcmdlg_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestcmdlg.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestcmdlg_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestcmdlg.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestdocandinit_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestdocandinit.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestdocandinit_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctestdocandinit.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteditor_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctesteditor.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteh_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctesteh.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteh_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctesteh.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikbctrl_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesteikbctrl.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctesteikbctrl_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesteikbctrl.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikbctrl_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctesteikbctrl.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikfrm_reg.r01</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctesteikfrm.r01</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesteikfrm_reg.r01</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.rsc</file>
+		<file>bctest/winscw_udeb/bctesteikfrm.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestfontinput_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestfontinput_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestfontinput.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestform_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestform.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestform_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestform.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestgrids_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestgrids.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestgrids_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestimage_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestgrids.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestimage_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestimage.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestimage_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestimage_aif.mbm</file>
+		<file>bctest/winscw_udeb/bctestimage.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestkeylock_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestkeylock.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestkeylock_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestlabelinfoindicators.rsc</file>
+		<file>bctest/winscw_udeb/bctestkeylock.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlabelinfoindicators_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlabelinfoindicators.rsc</file>
+		<file>bctest/winscw_udeb/bctestlabelinfoindicators.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlist_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestist_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist_aif.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestlist.mif</file>
+		<file>bctest/winscw_udeb/bctestlist.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmenu_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestmenu.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmenu_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestmenu.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisccontrol_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.rsc</file>
+		<file>bctest/winscw_udeb/bctestmisccontrol.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestnote_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestnote.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestnote.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestnote_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestnotifier.rsc</file>
+		<file>bctest/winscw_udeb/bctestnote.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestnotifier_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestnotifier.rsc</file>
+		<file>bctest/winscw_udeb/bctestnotifier.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpane_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpane.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpane_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestpane.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpopups_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpopups.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpopups.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpopups_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestprivateuifrm.rsc</file>
+		<file>bctest/winscw_udeb/bctestpopups.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestprivateuifrm_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestprivateuifrm.rsc</file>
+		<file>bctest/winscw_udeb/bctestprivateuifrm.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestptieng_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestptieng.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestptieng_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestptieng.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestquery_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestquery.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestquery_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestquery.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestscreenclearer_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer.mbm</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestscreenclearer.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestscreenclearer_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestscroller.rsc</file>
+		<file>bctest/winscw_udeb/bctestscreenclearer.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestscroller_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestscroller.rsc</file>
+		<file>bctest/winscw_udeb/bctestscroller.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsearchfield_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestsearchfield.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsearchfield_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestsearchfield.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestserverapp_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestserverapp.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestserverapp_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.mbm</file>
+		<file>bctest/winscw_udeb/bctestserverapp.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsettingpage_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage_aif.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestsettingpage_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestsettingpage.mbm</file>
+		<file>bctest/winscw_udeb/bctestsettingpage.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestskins_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestskins.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestskins_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestskins.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestutilities_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestutilities.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestutilities_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestutilities.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestvolume_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestvolume.mbm</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestvolume.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestvolume_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestvolume.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestocr_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestocr.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestocr_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestocr.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisc_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestmisc.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisc_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestmisc.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocation_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlocation.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocation_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestuniteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctestlocation.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestuniteditor_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmisc32.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestuniteditor.rsc</file>
+		<file>bctest/winscw_udeb/bctestuniteditor.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisc32_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmisc32.rsc</file>
+		<file>bctest/winscw_udeb/bctestmisc32.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocalizer_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestlocalizer.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestlocalizer_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestlocalizer.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestpreviewpopup.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestpreviewpopup_reg.rsc</file>
+		<file>bctest/winscw_udeb/bctestpreviewpopup.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestservicehandler_reg.rsc</file>
 		<file>bctest/winscw_udeb/z/resource/apps/bctestservicehandler.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestservicehandler_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestbutton.rsc</file>
+		<file>bctest/winscw_udeb/bctestservicehandler.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestbutton_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestchoicelist.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestbutton.rsc</file>
+		<file>bctest/winscw_udeb/bctestbutton.exe</file>
 		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestchoicelist_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmix50.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmix50_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesttoolbar.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttoolbar_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesttouchpane.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttouchpane_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctesttreelist.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttreelist_reg.rsc</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.mbm</file>
-		<file>bctest/winscw_udeb/z/resource/apps/bctestmisccontrol.rsc</file>
-		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmisccontrol_reg.rsc</file>
-		<file>bctest/winscw_udeb/bctestutil.dll</file>
-		<file>bctest/winscw_udeb/bctestlauncher.exe</file>
-		<file>bctest/winscw_udeb/bctestaknsound.exe</file>
-		<file>bctest/winscw_udeb/bctestappfrm.exe</file>
-		<file>bctest/winscw_udeb/bctestbutton.exe</file>
-		<file>bctest/winscw_udeb/bctestbuttons.exe</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestchoicelist.rsc</file>
 		<file>bctest/winscw_udeb/bctestchoicelist.exe</file>
-		<file>bctest/winscw_udeb/bctestcmdlg.exe</file>
-		<file>bctest/winscw_udeb/bctestdocandinit.exe</file>
-		<file>bctest/winscw_udeb/bctesteditor.exe</file>
-		<file>bctest/winscw_udeb/bctesteh.exe</file>
-		<file>bctest/winscw_udeb/bcteikbctrl.exe</file>
-		<file>bctest/winscw_udeb/bctesteikfrm.exe"</file>
-		<file>bctest/winscw_udeb/bctestfontinput.exe"</file>
-		<file>bctest/winscw_udeb/bctestform.exe"</file>
-		<file>bctest/winscw_udeb/bctestgrids.exe"</file>
-		<file>bctest/winscw_udeb/bctestimage.exe"</file>
-		<file>bctest/winscw_udeb/bctestkeylock.exe"</file>
-		<file>bctest/winscw_udeb/bctestlabelinfoindicators.exe"</file>
-		<file>bctest/winscw_udeb/bctestlist.exe"</file>
-		<file>bctest/winscw_udeb/bctestlocalizer.exe"</file>
-		<file>bctest/winscw_udeb/bctestlocation.exe"</file>
-		<file>bctest/winscw_udeb/bctestmenu.exe"</file>
-		<file>bctest/winscw_udeb/bctestmisc.exe"</file>
-		<file>bctest/winscw_udeb/bctestmisc32.exe"</file>
-		<file>bctest/winscw_udeb/bctestmisccontrol.exe"</file>
-		<file>bctest/winscw_udeb/bctestmix50.exe"</file>
-		<file>bctest/winscw_udeb/bctestnote.exe"</file>
-		<file>bctest/winscw_udeb/bctestnotifier.exe"</file>
-		<file>bctest/winscw_udeb/bctestocr.exe"</file>
-		<file>bctest/winscw_udeb/bctestpane.exe"</file>
-		<file>bctest/winscw_udeb/bctestpopups.exe"</file>
-		<file>bctest/winscw_udeb/bctestpreviewpopup.exe"</file>
-		<file>bctest/winscw_udeb/bctestprivateuifrm.exe"</file>
-		<file>bctest/winscw_udeb/bctestptieng.exe"</file>
-		<file>bctest/winscw_udeb/bctestquery.exe"</file>
-		<file>bctest/winscw_udeb/bctestscreenclearer.exe"</file>
-		<file>bctest/winscw_udeb/bctestscroller.exe"</file>
-		<file>bctest/winscw_udeb/bctestsearchfield.exe"</file>
-		<file>bctest/winscw_udeb/bctestserverapp.exe"</file>
-		<file>bctest/winscw_udeb/bctestservicehandler.exe"</file>
-		<file>bctest/winscw_udeb/bctestsettingpage.exe"</file>
-		<file>bctest/winscw_udeb/bctestskins.exe"</file>
-		<file>bctest/winscw_udeb/bctestsliderandicons.exe"</file>
-		<file>bctest/winscw_udeb/bctesttoolbar.exe"</file>
-		<file>bctest/winscw_udeb/bctesttouchpane.exe"</file>
-		<file>bctest/winscw_udeb/bctesttreelist.exe"</file>
-		<file>bctest/winscw_udeb/bctestuniteditor.exe"</file>
-		<file>bctest/winscw_udeb/bctestutilities.exe"</file>
-		<file>bctest/winscw_udeb/bctestvolume.exe"</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctestmix50_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctestmix50.rsc</file>
+		<file>bctest/winscw_udeb/bctestmix50.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttoolbar_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesttoolbar.rsc</file>
+		<file>bctest/winscw_udeb/bctesttoolbar.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttouchpane_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesttouchpane.rsc</file>
+		<file>bctest/winscw_udeb/bctesttouchpane.exe</file>
+		<file>bctest/winscw_udeb/z/private/10003a3f/apps/bctesttreelist_reg.rsc</file>
+		<file>bctest/winscw_udeb/z/resource/apps/bctesttreelist.rsc</file>
+		<file>bctest/winscw_udeb/bctesttreelist.exe</file>
 	</files>
 </test>
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/ats/bctest/bctestprebuild.pl
--- a/common/tools/ats/bctest/bctestprebuild.pl	Thu Jul 16 14:35:54 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use File::Copy;
-use File::Path;
-
-my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("BC_PLAT.h",	$epoc . "include");
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/ats/smoketest/apploader/scripts/smoketest_apploader.script
--- a/common/tools/ats/smoketest/apploader/scripts/smoketest_apploader.script	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/tools/ats/smoketest/apploader/scripts/smoketest_apploader.script	Thu Jul 16 16:33:38 2009 +0100
@@ -15,6 +15,7 @@
 //
 
 LOAD_SUITE smoketest_apploader -SharedData
+DELAY 30000
 
 START_TESTCASE			SMOKE_APP_LAUNCH_0001
 //! @SYMTestCaseID		SMOKE_APP_LAUNCH_0001
diff -r 97419fef4b8f -r 13596dc42a47 common/tools/cachefiles.pl
--- a/common/tools/cachefiles.pl	Thu Jul 16 14:35:54 2009 +0100
+++ b/common/tools/cachefiles.pl	Thu Jul 16 16:33:38 2009 +0100
@@ -31,7 +31,7 @@
     my @args = split(',',$line);
     my $repo = shift @args;
 	my $master = "";
-	if ( $repo =~ m/^(.*\/)((oss|rnd|sfl)\/.*\/)$/i )
+	if ( $repo =~ m/^(.*\/)(.*\/(oss|rnd|sfl)\/.*\/)$/i )
 	{
 		$master = $1;
 		$repo = $2;
diff -r 97419fef4b8f -r 13596dc42a47 sf-platform/build.xml
--- a/sf-platform/build.xml	Thu Jul 16 14:35:54 2009 +0100
+++ b/sf-platform/build.xml	Thu Jul 16 16:33:38 2009 +0100
@@ -114,6 +114,9 @@
 	        <runtarget target="sf-os-compile"/>
 	   </else>
     </if>
+       <!-- always run cenrep -->
+       <runtarget target="sf-s60-create-cenrep"/>
+
   </target>
 
   <!--
@@ -385,7 +388,6 @@
           			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
     		</antcall>
 			
-			<runtarget target="sf-s60-create-cenrep"/>
 			
 			<antcall target="sf-list-dir" inheritAll="false">
 				<param name="sf.list.name" value="post-s60-build-main"/>