# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1270067273 -10800
# Node ID 0c8964472bc7b7806aefacadaf988ca41431c2b9
# Parent  c2412f4ab2b5a81a05f887b86e6e9ec012f7e9b1
Revision: 201012
Kit: 201013

diff -r c2412f4ab2b5 -r 0c8964472bc7 Version/data/sw.txt
Binary file Version/data/sw.txt has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/01.zip
Binary file locfiles/data/01.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/02.zip
Binary file locfiles/data/02.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/03.zip
Binary file locfiles/data/03.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/04.zip
Binary file locfiles/data/04.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/05.zip
Binary file locfiles/data/05.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/06.zip
Binary file locfiles/data/06.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/07.zip
Binary file locfiles/data/07.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/08.zip
Binary file locfiles/data/08.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/09.zip
Binary file locfiles/data/09.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/10.zip
Binary file locfiles/data/10.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/102.zip
Binary file locfiles/data/102.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/103.zip
Binary file locfiles/data/103.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/129.zip
Binary file locfiles/data/129.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/13.zip
Binary file locfiles/data/13.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/14.zip
Binary file locfiles/data/14.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/14346.zip
Binary file locfiles/data/14346.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/14387.zip
Binary file locfiles/data/14387.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/14412.zip
Binary file locfiles/data/14412.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/14419.zip
Binary file locfiles/data/14419.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/15.zip
Binary file locfiles/data/15.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/157.zip
Binary file locfiles/data/157.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/158.zip
Binary file locfiles/data/158.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/159.zip
Binary file locfiles/data/159.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/16.zip
Binary file locfiles/data/16.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/160.zip
Binary file locfiles/data/160.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/161.zip
Binary file locfiles/data/161.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/17.zip
Binary file locfiles/data/17.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/18.zip
Binary file locfiles/data/18.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/230.zip
Binary file locfiles/data/230.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/25.zip
Binary file locfiles/data/25.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/26.zip
Binary file locfiles/data/26.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/27.zip
Binary file locfiles/data/27.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/28.zip
Binary file locfiles/data/28.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/29.zip
Binary file locfiles/data/29.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/30.zip
Binary file locfiles/data/30.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/31.zip
Binary file locfiles/data/31.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/32.zip
Binary file locfiles/data/32.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/326.zip
Binary file locfiles/data/326.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/327.zip
Binary file locfiles/data/327.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/33.zip
Binary file locfiles/data/33.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/37.zip
Binary file locfiles/data/37.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/39.zip
Binary file locfiles/data/39.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/42.zip
Binary file locfiles/data/42.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/44.zip
Binary file locfiles/data/44.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/45.zip
Binary file locfiles/data/45.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/49.zip
Binary file locfiles/data/49.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/50.zip
Binary file locfiles/data/50.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/51.zip
Binary file locfiles/data/51.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/54.zip
Binary file locfiles/data/54.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/57.zip
Binary file locfiles/data/57.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/58.zip
Binary file locfiles/data/58.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/59.zip
Binary file locfiles/data/59.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/65.zip
Binary file locfiles/data/65.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/67.zip
Binary file locfiles/data/67.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/68.zip
Binary file locfiles/data/68.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/70.zip
Binary file locfiles/data/70.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/76.zip
Binary file locfiles/data/76.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/78.zip
Binary file locfiles/data/78.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/79.zip
Binary file locfiles/data/79.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/83.zip
Binary file locfiles/data/83.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/93.zip
Binary file locfiles/data/93.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/94.zip
Binary file locfiles/data/94.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/data/96.zip
Binary file locfiles/data/96.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 locfiles/group/switch_loc.zip
Binary file locfiles/group/switch_loc.zip has changed
diff -r c2412f4ab2b5 -r 0c8964472bc7 package_definition.xml
--- a/package_definition.xml	Mon Mar 15 12:45:32 2010 +0200
+++ b/package_definition.xml	Wed Mar 31 23:27:53 2010 +0300
@@ -2,27 +2,81 @@
 <SystemDefinition schema="3.0.0">
   <package id="deviceplatformrelease" name="Device Platform Release" levels="bld mid top">
     <collection id="s60extras" name="S60 Extras" level="mid">
+    	<!-- collection is really a component. Need to move down a directory -->
       <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
         <unit bldFile="s60extras/group"/>
       </component>
     </collection>
     <collection id="s60locfiles" name="S60 Locale Files" level="mid">
       <component id="s60locfiles_build" filter="s60" name="S60 Locale Files Build" class="config" purpose="development">
+      	<!-- need to move component down a directory -->
         <unit bldFile="s60locfiles/group"/>
       </component>
+	<component id="locfiles_set1" name="Locale Files Set 1" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set1"/>
+	</component>
+	<component id="locfiles_set2" name="Locale Files Set 2" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set2"/>
+	</component>
+	<component id="locfiles_set3" name="Locale Files Set 3" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set3"/>
+	</component>
+	<component id="locfiles_set4" name="Locale Files Set 4" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set4"/>
+	</component>
+	<component id="locfiles_set5" name="Locale Files Set 5" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set5"/>
+	</component>
+	<component id="locfiles_set6" name="Locale Files Set 6" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set6"/>
+	</component>
+	<!-- is there a problem with SF builds with the following? -->
+	<component id="locfiles_set7" name="Locale Files Set 7" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set7"/>
+	</component>
+	<component id="locfiles_set8" name="Locale Files Set 8" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set8"/>
+	</component>
+	<component id="locfiles_set9" name="Locale Files Set 9" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set9"/>
+	</component>
+	<component id="locfiles_set10" name="Locale Files Set 10" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set10"/>
+	</component>
+	<component id="locfiles_set11" name="Locale Files Set 11" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set11"/>
+	</component>
+	<component id="locfiles_set12" name="Locale Files Set 12" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set12"/>
+	</component>
+	<component id="locfiles_set13" name="Locale Files Set 13" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set13"/>
+	</component>
+	<component id="locfiles_set14" name="Locale Files Set 14" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set14"/>
+	</component>
+	<component id="locfiles_set15" name="Locale Files Set 15" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set15"/>
+	</component>
+	<component id="locfiles_set16" name="Locale Files Set 16" class="config" filter="s60">
+		<unit bldFile="locfiles/group/set16"/>
+	</component>      
     </collection>
     <collection id="version" name="Version" level="top">
+    	<!-- collection is really a component. Need to move down a directory -->    
       <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
         <unit bldFile="version/group"/>
       </component>
     </collection>
+   <collection id="helps_loc2" name="Helps Locale 2" level="top">
+    	<!-- collection is really a component. Need to move down a directory -->    
+      <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
+        <unit bldFile="helps_loc2/group"/>
+      </component>
+     </collection>
     <collection id="sf_config" name="SF Config" level="mid">
       <component id="config" filter="s60" name="Config" class="config" purpose="development">
-         <!-- there should only be one unit. Can any of these be uncommented? -->
-        <!-- <unit bldFile="sf_config/config/apac/group"/> -->
-        <!-- <unit bldFile="sf_config/config/group"/> -->
-        <!-- <unit bldFile="sf_config/config/japan/group"/> -->
-        <!-- <unit bldFile="sf_config/config/western/group"/> -->
+        <unit base="sf_config/config"/>
       </component>
     </collection>
     <collection id="s60bld" name="S60 Build">
@@ -38,9 +92,6 @@
       <component id="productionbldcbrconfig" name="Production Build CBR Config" filter="gt" purpose="development" class="config">
         <unit mrp="symbianosbld/productionbldcbrconfig/product_cbr_config.mrp"/>
       </component>
-      <component id="foundation_s60_packages" name="Foundation S60 Packages" class="config" introduced="^3" purpose="development" target="desktop">
-        <unit mrp="symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp"/>
-      </component>
     </collection>
     <collection id="foundation_system" name="Foundation System" level="top">
       <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
diff -r c2412f4ab2b5 -r 0c8964472bc7 sf_build/sf_prebuild/makefile
--- a/sf_build/sf_prebuild/makefile	Mon Mar 15 12:45:32 2010 +0200
+++ b/sf_build/sf_prebuild/makefile	Wed Mar 31 23:27:53 2010 +0300
@@ -8,6 +8,7 @@
 include /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile
 include /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile
 include /sf/mw/qt/src/s60installs/deviceconfiguration/cmaker/makefile
+include /sf/mw/qtextensions/group/cmaker/makefile
 
 ifeq (S60,$(BUILD))
 include /sf/mw/uiresources/uigraphics/icons/makefile
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Wed Mar 31 23:27:53 2010 +0300
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#63 $" >
+	DocVersion="$Change: 1767343 $ $DateTime: 2010/03/18 17:18:27 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#90 $" >
 <OR name="Alarm Server">
 	Maintains a queue of all system-wide alarms and provides APIs to manage alarms
 	<system_model entry="Alarm Server"/>
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Wed Mar 31 23:27:53 2010 +0300
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#63 $" >
+	DocVersion="$Change: 1767343 $ $DateTime: 2010/03/18 17:18:27 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#90 $" >
 <OR name="Alarm Server">
 	Maintains a queue of all system-wide alarms and provides APIs to manage alarms
 	<system_model entry="Alarm Server"/>
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Wed Mar 31 23:27:53 2010 +0300
@@ -26,9 +26,9 @@
     <SetEnv Order="6" Name="RVCT22BIN" Value="%ARMROOT%\RVCT\Programs\2.2\349\win_32-pentium"/>
     <SetEnv Order="7" Name="RVCT22INC" Value="%ARMROOT%\RVCT\Data\2.2\349\include\windows"/>
     <SetEnv Order="8" Name="RVCT22LIB" Value="%ARMROOT%\RVCT\Data\2.2\349\lib"/>
-    <SetEnv Order="9" Name="RVCT22_CCOPT" Value="--licretry"/>
-    <SetEnv Order="10" Name="RVCT22_ASMOPT" Value="--licretry"/>
-    <SetEnv Order="11" Name="RVCT22_LINKOPT" Value="--licretry"/>
+    <SetEnv Order="9" Name="RVCT22_CCOPT" Value="--licretry --fastlicense --sitelicense"/>
+    <SetEnv Order="10" Name="RVCT22_ASMOPT" Value="--licretry --fastlicense --sitelicense"/>
+    <SetEnv Order="11" Name="RVCT22_LINKOPT" Value="--licretry --fastlicense --sitelicense"/>
     <SetEnv Order="12" Name="PATH" Value="%RVCT22BIN%;%PATH%"/>
 
     <SetEnv Order="13" Name="MWVER" Value="3.2.5"/>
@@ -52,6 +52,7 @@
 	<!-- Set Diamnods server and Schema-->
 	<SetEnv Order="30" Name="DiamondsServer" Value="diamonds.nmp.nokia.com:9003"/>
 	<SetEnv Order="31" Name="DiamondsSchemaNum" Value="16"/> 
+	<SetEnv Order="32" Name="SYSDEF_TOOLS" Value="os\buildtools\bldsystemtools\sysdeftools"/> 
  
     <!-- Dumping environment -->
     <Execute Component="Dumping all environment variables" Cwd="%BuildDir%" CommandLine="SET"/>
@@ -77,10 +78,10 @@
 	<Execute Component="Remove epoc32 directory" Cwd="%BuildDir%" CommandLine="rd %EPOCROOT%epoc32 /s /q"/>
 	
  	<!-- Combine system definitions -->
-    <Execute Component="Join Foundation System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\devlib\devlibhelp\tools\doc_tree\lib\apache\xalan.jar -in %CleanSourceDir%\os\deviceplatformrelease\foundation_system\system_model\system_definition.xml -xsl ..\sysdeftools\joinsysdef.xsl  -out variability\vp_data\templates\System_Definition_Template.SF.xml"/>
-    <Execute Component="Join Nokia System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\devlib\devlibhelp\tools\doc_tree\lib\apache\xalan.jar -in %CleanSourceDir%\os\deviceplatformrelease\nokia_system\nokia_model\system_definition.xml -param path /os/deviceplatformrelease/nokia_system/nokia_model/system_definition.xml -xsl ..\sysdeftools\joinsysdef.xsl -out variability\vp_data\templates\System_Definition_Template.Nokia.xml"/>
-    <Execute Component="Merge System Definitions" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\devlib\devlibhelp\tools\doc_tree\lib\apache\xalan.jar -in variability\vp_data\templates\System_Definition_Template.SF.xml -param Downstream System_Definition_Template.Nokia.xml -xsl ..\sysdeftools\mergesysdef.xsl  -out variability\vp_data\templates\System_Definition_Template.Full.xml"/>
-    <Execute Component="Create 2.0.1 format System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\toolsandutils\productionbldtools\java\xalan.jar -in variability\vp_data\templates\System_Definition_Template.Full.xml -xsl ..\sysdeftools\sysdefdowngrade.xsl -out variability\vp_data\templates\System_Definition_Template.xml"/>
+    <Execute Component="Join Foundation System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in %CleanSourceDir%\os\deviceplatformrelease\foundation_system\system_model\system_definition.xml -xsl ..\sysdeftools\joinsysdef.xsl  -out variability\vp_data\templates\System_Definition_Template.SF.xml"/>
+    <Execute Component="Join Nokia System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in %CleanSourceDir%\os\deviceplatformrelease\nokia_system\nokia_model\system_definition.xml -param path /os/deviceplatformrelease/nokia_system/nokia_model/system_definition.xml -xsl ..\sysdeftools\joinsysdef.xsl  -out variability\vp_data\templates\System_Definition_Template.Nokia.xml"/>
+    <Execute Component="Merge System Definitions" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in variability\vp_data\templates\System_Definition_Template.SF.xml -param Downstream System_Definition_Template.Nokia.xml -xsl ..\sysdeftools\mergesysdef.xsl  -out variability\vp_data\templates\System_Definition_Template.Full.xml"/>
+    <Execute Component="Create 2.0.1 format System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in variability\vp_data\templates\System_Definition_Template.Full.xml -xsl ..\sysdeftools\sysdefdowngrade.xsl -out variability\vp_data\templates\System_Definition_Template.xml"/>
     <Execute Component="Copy *intermediate* System Definition Files to Local Logs Dir" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="copy variability\vp_data\templates\System_Definition*.xml %LogsDir%\"/>
 
     <!-- Run Variability Tools -->
@@ -96,9 +97,9 @@
      
 
     <!-- Create component lists for CBR from System_definition_template.xml -->
-    <Execute Component="Create Intermediate GT System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\devlib\devlibhelp\tools\doc_tree\lib\apache\xalan.jar -in %LogsDir%\System_Definition_Template.xml -xsl ..\sysdeftools\filtering.xsl -param filter-type has -param filter &quot;!systemtest,!techview,!s60&quot; -param addbuild 1 -out variability\vp_data\templates\system_definition_GT.xml"/>
-    <Execute Component="Create Intermediate TV System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\devlib\devlibhelp\tools\doc_tree\lib\apache\xalan.jar -in %LogsDir%\System_Definition_Template.xml -xsl ..\sysdeftools\filtering.xsl -param filter-type has -param filter &quot;techview&quot; -param addbuild 1 -out variability\vp_data\templates\system_definition_TV.xml"/>
-    <Execute Component="Create Intermediate System Test System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\os\buildtools\devlib\devlibhelp\tools\doc_tree\lib\apache\xalan.jar -in %LogsDir%\System_Definition_Template.xml -xsl ..\sysdeftools\filtering.xsl -param filter-type has -param filter &quot;systemtest&quot; -param addbuild 1 -out variability\vp_data\templates\system_definition_SystemTest.xml"/>
+    <Execute Component="Create Intermediate GT System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in %LogsDir%\System_Definition_Template.xml -xsl ..\sysdeftools\filtering.xsl -param filter-type has -param filter &quot;!systemtest,!techview,!s60&quot; -param addbuild 1 -out variability\vp_data\templates\system_definition_GT.xml"/>
+    <Execute Component="Create Intermediate TV System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in %LogsDir%\System_Definition_Template.xml -xsl ..\sysdeftools\filtering.xsl -param filter-type has -param filter &quot;techview&quot; -param addbuild 1 -out variability\vp_data\templates\system_definition_TV.xml"/>
+    <Execute Component="Create Intermediate System Test System Definition" Cwd="%CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools" CommandLine="java -jar %CleanSourceDir%\%SYSDEF_TOOLS%\xalan.jar -in %LogsDir%\System_Definition_Template.xml -xsl ..\sysdeftools\filtering.xsl -param filter-type has -param filter &quot;systemtest&quot; -param addbuild 1 -out variability\vp_data\templates\system_definition_SystemTest.xml"/>
     <Execute Component="Create GTcomponents.txt" Cwd="%LogsDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools\genxml.pl -x %CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools\variability\vp_data\templates\system_definition_GT.xml -s %CleanSourceDir% -e \sf -n any -c %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\%BuildShortName%\GTcomponents.txt"/>
     <Execute Component="Create TechviewComponents.txt" Cwd="%LogsDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools\genxml.pl -x %CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools\variability\vp_data\templates\system_definition_TV.xml -s %CleanSourceDir% -e \sf -n any -c %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\%BuildShortName%\TechViewComponents.txt"/>
     <Execute Component="Create SystemTestComponents.txt" Cwd="%LogsDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools\genxml.pl -x %CleanSourceDir%\os\buildtools\bldsystemtools\buildsystemtools\variability\vp_data\templates\system_definition_SystemTest.xml  -f systemtest -s %CleanSourceDir% -e \sf -n any -c %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\productionbldcbrconfig\%BuildShortName%\SystemTestComponents.txt"/>
@@ -222,7 +223,7 @@
     <!-- Setup BuildInfo.txt -->
     <Execute Component="BuildInfo" Cwd="%BuildDir%" CommandLine="echo DeviceFamily               100 >%EPOCROOT%epoc32\data\BuildInfo.txt"/>
     <Execute Component="BuildInfo" Cwd="%BuildDir%" CommandLine="echo DeviceFamilyRev            0x900 >>%EPOCROOT%epoc32\data\BuildInfo.txt"/>
-    <Execute Component="BuildInfo" Cwd="%BuildDir%" CommandLine="echo ManufacturerSoftwareBuild  %BuildNumber% >>%EPOCROOT%epoc32\data\BuildInfo.txt"/>
+    <Execute Component="BuildInfo" Cwd="%BuildDir%" CommandLine="echo ManufacturerSoftwareBuild  %SnapshotNumber% >>%EPOCROOT%epoc32\data\BuildInfo.txt"/>
 	 
 
     <!-- Post PreBuild Stuff -->
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp
--- a/symbianosbld/foundation_s60_packages/foundation_s60_packages.mrp	Mon Mar 15 12:45:32 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-component           foundation_s60_packages
-# temporary component to hold the Foundation pkgdefs from ex-s60
-source   \sf\os\deviceplatformrelease\symbianosbld\foundation_s60_packages
-# not including non-contributed contents
-source   \sf\app\camera\distribution.policy.s60
-source   \sf\app\camera\package_definition.xml
-source   \sf\app\commonemail\distribution.policy.s60
-source   \sf\app\commonemail\package_definition.xml
-source   \sf\app\conntools\distribution.policy.s60
-source   \sf\app\conntools\package_definition.xml
-source   \sf\app\contentcontrol\distribution.policy.s60
-source   \sf\app\contentcontrol\package_definition.xml
-source   \sf\app\conversations\distribution.policy.s60
-source   \sf\app\conversations\package_definition.xml
-source   \sf\app\devicecontrol\distribution.policy.s60
-source   \sf\app\devicecontrol\package_definition.xml
-source   \sf\app\dictionary\distribution.policy.s60
-source   \sf\app\dictionary\package_definition.xml
-source   \sf\app\files\distribution.policy.s60
-source   \sf\app\files\package_definition.xml
-source   \sf\app\gallery\distribution.policy.s60
-source   \sf\app\gallery\package_definition.xml
-source   \sf\app\graphicsuis\distribution.policy.s60
-source   \sf\app\graphicsuis\package_definition.xml
-source   \sf\app\homescreen\distribution.policy.s60
-source   \sf\app\homescreen\package_definition.xml
-source   \sf\app\homescreentools\distribution.policy.s60
-source   \sf\app\homescreentools\package_definition.xml
-source   \sf\app\im\distribution.policy.s60
-source   \sf\app\im\package_definition.xml
-source   \sf\app\imgeditor\distribution.policy.s60
-source   \sf\app\imgeditor\package_definition.xml
-source   \sf\app\imgvieweruis\distribution.policy.s60
-source   \sf\app\imgvieweruis\package_definition.xml
-source   \sf\app\iptelephony\distribution.policy.s60
-source   \sf\app\iptelephony\package_definition.xml
-source   \sf\app\java\distribution.policy.s60
-source   \sf\app\java\package_definition.xml
-source   \sf\app\location\distribution.policy.s60
-source   \sf\app\location\package_definition.xml
-source   \sf\app\mmsharinguis\distribution.policy.s60
-source   \sf\app\mmsharinguis\package_definition.xml
-source   \sf\app\musicplayer\distribution.policy.s60
-source   \sf\app\musicplayer\package_definition.xml
-source   \sf\app\phone\distribution.policy.s60
-source   \sf\app\phone\package_definition.xml
-source   \sf\app\photos\distribution.policy.s60
-source   \sf\app\photos\package_definition.xml
-source   \sf\app\poc\distribution.policy.s60
-source   \sf\app\poc\package_definition.xml
-source   \sf\app\printing\distribution.policy.s60
-source   \sf\app\printing\package_definition.xml
-source   \sf\app\profile\distribution.policy.s60
-source   \sf\app\profile\package_definition.xml
-source   \sf\app\radio\distribution.policy.s60
-source   \sf\app\radio\package_definition.xml
-source   \sf\app\rndtools\distribution.policy.s60
-source   \sf\app\rndtools\package_definition.xml
-source   \sf\app\screensaver\distribution.policy.s60
-source   \sf\app\screensaver\package_definition.xml
-source   \sf\app\settingsuis\distribution.policy.s60
-source   \sf\app\settingsuis\package_definition.xml
-source   \sf\app\speechsrv\distribution.policy.s60
-source   \sf\app\speechsrv\package_definition.xml
-source   \sf\app\utils\distribution.policy.s60
-source   \sf\app\utils\package_definition.xml
-source   \sf\app\videocenter\distribution.policy.s60
-source   \sf\app\videocenter\package_definition.xml
-source   \sf\app\videoeditor\distribution.policy.s60
-source   \sf\app\videoeditor\package_definition.xml
-source   \sf\app\videoplayer\distribution.policy.s60
-source   \sf\app\videoplayer\package_definition.xml
-source   \sf\app\videotelephony\distribution.policy.s60
-source   \sf\app\videotelephony\package_definition.xml
-source   \sf\app\voicerec\distribution.policy.s60
-source   \sf\app\voicerec\package_definition.xml
-source   \sf\app\webuis\distribution.policy.s60
-source   \sf\app\webuis\package_definition.xml
-source   \sf\mw\accesssec\distribution.policy.s60
-source   \sf\mw\accesssec\package_definition.xml
-source   \sf\mw\camerasrv\distribution.policy.s60
-source   \sf\mw\camerasrv\package_definition.xml
-source   \sf\mw\dlnasrv\distribution.policy.s60
-source   \sf\mw\dlnasrv\package_definition.xml
-source   \sf\mw\drm\distribution.policy.s60
-source   \sf\mw\drm\package_definition.xml
-source   \sf\mw\hapticsservices\distribution.policy.s60
-source   \sf\mw\hapticsservices\package_definition.xml
-source   \sf\mw\homescreensrv\distribution.policy.s60
-source   \sf\mw\homescreensrv\package_definition.xml
-source   \sf\mw\imghandling\distribution.policy.s60
-source   \sf\mw\imghandling\package_definition.xml
-source   \sf\mw\imsrv\distribution.policy.s60
-source   \sf\mw\imsrv\package_definition.xml
-source   \sf\mw\ipconnmgmt\distribution.policy.s60
-source   \sf\mw\ipconnmgmt\package_definition.xml
-source   \sf\mw\legacypresence\distribution.policy.s60
-source   \sf\mw\legacypresence\package_definition.xml
-source   \sf\mw\locationsrv\distribution.policy.s60
-source   \sf\mw\locationsrv\package_definition.xml
-source   \sf\mw\mds\distribution.policy.s60
-source   \sf\mw\mds\package_definition.xml
-source   \sf\mw\metadatasrv\distribution.policy.s60
-source   \sf\mw\metadatasrv\package_definition.xml
-source   \sf\mw\mmappfw\distribution.policy.s60
-source   \sf\mw\mmappfw\package_definition.xml
-source   \sf\mw\mmuifw\distribution.policy.s60
-source   \sf\mw\mmuifw\package_definition.xml
-source   \sf\mw\networkingdm\distribution.policy.s60
-source   \sf\mw\networkingdm\package_definition.xml
-source   \sf\mw\opensrv\distribution.policy.s60
-source   \sf\mw\opensrv\package_definition.xml
-source   \sf\mw\phonesrv\distribution.policy.s60
-source   \sf\mw\phonesrv\package_definition.xml
-source   \sf\mw\platformtools\distribution.policy.s60
-source   \sf\mw\platformtools\package_definition.xml
-source   \sf\mw\remotemgmt\distribution.policy.s60
-source   \sf\mw\remotemgmt\package_definition.xml
-source   \sf\mw\remotestorage\distribution.policy.s60
-source   \sf\mw\remotestorage\package_definition.xml
-source   \sf\mw\serviceapi\distribution.policy.s60
-source   \sf\mw\serviceapi\package_definition.xml
-source   \sf\mw\serviceapifw\distribution.policy.s60
-source   \sf\mw\serviceapifw\package_definition.xml
-source   \sf\mw\svgt\distribution.policy.s60
-source   \sf\mw\svgt\package_definition.xml
-source   \sf\mw\uiaccelerator\distribution.policy.s60
-source   \sf\mw\uiaccelerator\package_definition.xml
-source   \sf\mw\uiresources\distribution.policy.s60
-source   \sf\mw\uiresources\package_definition.xml
-source   \sf\mw\uitools\distribution.policy.s60
-source   \sf\mw\uitools\package_definition.xml
-source   \sf\mw\usbservices\distribution.policy.s60
-source   \sf\mw\usbservices\package_definition.xml
-source   \sf\mw\videoutils\distribution.policy.s60
-source   \sf\mw\videoutils\package_definition.xml
-source   \sf\mw\vpnclient\distribution.policy.s60
-source   \sf\mw\vpnclient\package_definition.xml
-source   \sf\mw\web\distribution.policy.s60
-source   \sf\mw\web\package_definition.xml
-source   \sf\mw\websrv\distribution.policy.s60
-source   \sf\mw\websrv\package_definition.xml
-source   \sf\mw\wirelessacc\distribution.policy.s60
-source   \sf\mw\wirelessacc\package_definition.xml
-source   \sf\os\imagingext\distribution.policy.s60
-source   \sf\os\imagingext\package_definition.xml
-
-notes_source      \component_defs\release.src
-ipr T
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv
--- a/symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/productionbldcbrconfig/Future/AutoCBR_Future_test_export.csv	Wed Mar 31 23:27:53 2010 +0300
@@ -101,7 +101,6 @@
 nokia_textandloc_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 nokia_contacts_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 nokia_techview_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
-foundation_s60_packages,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 # Mobile ActiveSync prebuild binaries,,,,
 mas,exclude_bin,exclude_bin,A B D E F G O T,A B D E F G O T
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv
--- a/symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/AutoCBR_tb101sf_test_export.csv	Wed Mar 31 23:27:53 2010 +0300
@@ -101,7 +101,6 @@
 nokia_textandloc_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 nokia_contacts_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 nokia_techview_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
-foundation_s60_packages,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 # Mobile ActiveSync prebuild binaries,,,,
 mas,exclude_bin,exclude_bin,A B D E F G O T,A B D E F G O T
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv
--- a/symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv	Wed Mar 31 23:27:53 2010 +0300
@@ -101,7 +101,6 @@
 nokia_textandloc_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 nokia_contacts_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 nokia_techview_metadata,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
-foundation_s60_packages,D E F G O T,D E F G O T,A B D E F G O T,A B D E F G O T
 
 # Mobile ActiveSync prebuild binaries,,,,
 mas,exclude_bin,exclude_bin,A B D E F G O T,A B D E F G O T
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt
--- a/symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt	Wed Mar 31 23:27:53 2010 +0300
@@ -180,12 +180,9 @@
 dev_build_imgtools_imglib	*nosource*
 dev_build_imgtools_romtools	*nosource*
 dev_build_imgtools_sisutils	*nosource*
-developerlibrary_doc_html	\sf\os\buildtools\devlib\devlibhelp\group\devlib96\developerlibrary_doc_html.mrp
-developerlibrary_doc_plain_html	\sf\os\buildtools\devlib\devlibhelp\group\shared\developerlibrary_doc_plain_html.mrp
 developerlibrary_doc_source	\sf\os\buildtools\devlib\devlibhelp\developerlibrary_doc_source.mrp
 deviceplatformrelease_metadata	\sf\os\deviceplatformrelease\deviceplatformrelease_info\deviceplatformrelease_metadata\deviceplatformrelease_metadata.mrp
 devicesrv_metadata	\sf\os\devicesrv\devicesrv_info\devicesrv_metadata\devicesrv_metadata.mrp
-foundation_s60_packages	\sf\os\deviceplatformrelease\symbianosbld\foundation_s60_packages\foundation_s60_packages.mrp
 graphics_bitgdi	\sf\os\graphics\graphicsdeviceinterface\bitgdi\group\graphics_bitgdi.mrp
 graphics_commonheader	\sf\os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp
 graphics_compositionbackend	\sf\os\graphics\graphicscomposition\compositionengineadaptation\group\graphics_compositionbackend.mrp
@@ -567,7 +564,6 @@
 tools_cinidata	\sf\os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp
 tools_debug_trace	\sf\os\persistentdata\traceservices\tracefw\ulogger\group\tools_debug_trace.mrp
 tools_depcheck	\sf\os\buildtools\binanamdw_os\depcheck\tools_depcheck.mrp
-tools_documentation	\sf\os\buildtools\devlib\toolsdocs\tools_documentation.mrp
 tools_e32tools	\sf\os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp
 tools_evalid	\sf\os\buildtools\bintools_os\evalid\tools_evalid.mrp
 tools_redistribution_cedar	\sf\os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_cedar.mrp
diff -r c2412f4ab2b5 -r 0c8964472bc7 symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt
--- a/symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt	Mon Mar 15 12:45:32 2010 +0200
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt	Wed Mar 31 23:27:53 2010 +0300
@@ -192,15 +192,12 @@
 dev_build_imgtools_imglib	*nosource*
 dev_build_imgtools_romtools	*nosource*
 dev_build_imgtools_sisutils	*nosource*
-developerlibrary_doc_html	\sf\os\buildtools\devlib\devlibhelp\group\devlib96\developerlibrary_doc_html.mrp
-developerlibrary_doc_plain_html	\sf\os\buildtools\devlib\devlibhelp\group\shared\developerlibrary_doc_plain_html.mrp
 developerlibrary_doc_source	\sf\os\buildtools\devlib\devlibhelp\developerlibrary_doc_source.mrp
 deviceplatformrelease_metadata	\sf\os\deviceplatformrelease\deviceplatformrelease_info\deviceplatformrelease_metadata\deviceplatformrelease_metadata.mrp
 devicesrv_metadata	\sf\os\devicesrv\devicesrv_info\devicesrv_metadata\devicesrv_metadata.mrp
 devsoundexthaitest	\sf\os\mm\mmapitest\devsoundexthaitest\group\devsoundexthaitest.mrp
 devsoundhaitest	\sf\os\mm\mmapitest\devsoundhaitest\group\devsoundhaitest.mrp
 devvideohaitest	\sf\os\mm\mmapitest\devvideohaitest\group\devvideohaitest.mrp
-foundation_s60_packages	\sf\os\deviceplatformrelease\symbianosbld\foundation_s60_packages\foundation_s60_packages.mrp
 graphics_bitgdi	\sf\os\graphics\graphicsdeviceinterface\bitgdi\group\graphics_bitgdi.mrp
 graphics_commonheader	\sf\os\graphics\graphicsutils\commongraphicsheaders\group\graphics_commonheader.mrp
 graphics_compositionbackend	\sf\os\graphics\graphicscomposition\compositionengineadaptation\group\graphics_compositionbackend.mrp
@@ -593,7 +590,6 @@
 tools_cinidata	\sf\os\osrndtools\testexecfw1\cinidata\tools_cinidata.mrp
 tools_debug_trace	\sf\os\persistentdata\traceservices\tracefw\ulogger\group\tools_debug_trace.mrp
 tools_depcheck	\sf\os\buildtools\binanamdw_os\depcheck\tools_depcheck.mrp
-tools_documentation	\sf\os\buildtools\devlib\toolsdocs\tools_documentation.mrp
 tools_e32toolp	\sf\os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp
 tools_e32tools	\sf\os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp
 tools_evalid	\sf\os\buildtools\bintools_os\evalid\tools_evalid.mrp