# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1268649932 -7200
# Node ID c2412f4ab2b5a81a05f887b86e6e9ec012f7e9b1
# Parent  195bcca3f67000271875e1f8b69ddff0501ff3b0
Revision: 201010
Kit: 201010

diff -r 195bcca3f670 -r c2412f4ab2b5 Version/data/sw.txt
Binary file Version/data/sw.txt has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/01.zip
Binary file locfiles/data/01.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/02.zip
Binary file locfiles/data/02.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/03.zip
Binary file locfiles/data/03.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/04.zip
Binary file locfiles/data/04.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/05.zip
Binary file locfiles/data/05.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/06.zip
Binary file locfiles/data/06.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/07.zip
Binary file locfiles/data/07.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/08.zip
Binary file locfiles/data/08.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/09.zip
Binary file locfiles/data/09.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/10.zip
Binary file locfiles/data/10.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/102.zip
Binary file locfiles/data/102.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/103.zip
Binary file locfiles/data/103.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/129.zip
Binary file locfiles/data/129.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/13.zip
Binary file locfiles/data/13.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/14.zip
Binary file locfiles/data/14.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/14346.zip
Binary file locfiles/data/14346.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/14387.zip
Binary file locfiles/data/14387.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/14412.zip
Binary file locfiles/data/14412.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/14419.zip
Binary file locfiles/data/14419.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/15.zip
Binary file locfiles/data/15.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/157.zip
Binary file locfiles/data/157.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/158.zip
Binary file locfiles/data/158.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/159.zip
Binary file locfiles/data/159.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/16.zip
Binary file locfiles/data/16.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/160.zip
Binary file locfiles/data/160.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/161.zip
Binary file locfiles/data/161.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/17.zip
Binary file locfiles/data/17.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/18.zip
Binary file locfiles/data/18.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/230.zip
Binary file locfiles/data/230.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/25.zip
Binary file locfiles/data/25.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/26.zip
Binary file locfiles/data/26.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/27.zip
Binary file locfiles/data/27.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/28.zip
Binary file locfiles/data/28.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/29.zip
Binary file locfiles/data/29.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/30.zip
Binary file locfiles/data/30.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/31.zip
Binary file locfiles/data/31.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/32.zip
Binary file locfiles/data/32.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/326.zip
Binary file locfiles/data/326.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/327.zip
Binary file locfiles/data/327.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/33.zip
Binary file locfiles/data/33.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/37.zip
Binary file locfiles/data/37.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/39.zip
Binary file locfiles/data/39.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/42.zip
Binary file locfiles/data/42.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/44.zip
Binary file locfiles/data/44.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/45.zip
Binary file locfiles/data/45.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/49.zip
Binary file locfiles/data/49.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/50.zip
Binary file locfiles/data/50.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/51.zip
Binary file locfiles/data/51.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/54.zip
Binary file locfiles/data/54.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/57.zip
Binary file locfiles/data/57.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/58.zip
Binary file locfiles/data/58.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/59.zip
Binary file locfiles/data/59.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/65.zip
Binary file locfiles/data/65.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/67.zip
Binary file locfiles/data/67.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/68.zip
Binary file locfiles/data/68.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/70.zip
Binary file locfiles/data/70.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/76.zip
Binary file locfiles/data/76.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/78.zip
Binary file locfiles/data/78.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/79.zip
Binary file locfiles/data/79.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/83.zip
Binary file locfiles/data/83.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/93.zip
Binary file locfiles/data/93.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/94.zip
Binary file locfiles/data/94.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/data/96.zip
Binary file locfiles/data/96.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 locfiles/group/switch_loc.zip
Binary file locfiles/group/switch_loc.zip has changed
diff -r 195bcca3f670 -r c2412f4ab2b5 symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Fri Mar 12 15:49:52 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml	Mon Mar 15 12:45:32 2010 +0200
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1762010 $ $DateTime: 2010/02/12 16:02:11 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#41 $" >
+	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 $" >
 <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 195bcca3f670 -r c2412f4ab2b5 symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Fri Mar 12 15:49:52 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml	Mon Mar 15 12:45:32 2010 +0200
@@ -4,7 +4,7 @@
 <Schedule12 Schema="2.0.0" 
 	Status="DRAFT" 
 	OS_version="tb101sf" Release_type="Update" 
-	DocVersion="$Change: 1762010 $ $DateTime: 2010/02/12 16:02:11 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#41 $" >
+	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 $" >
 <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 195bcca3f670 -r c2412f4ab2b5 symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Fri Mar 12 15:49:52 2010 +0200
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Mon Mar 15 12:45:32 2010 +0200
@@ -40,9 +40,10 @@
 	<SetEnv Order="19" Name="MWLD" Value="%MWROOT%\Symbian_Tools\Command_Line_Tools\mwldsym2.exe"/> 
     <SetEnv Order="20" Name="PATH" Value="%MWROOT%\Symbian_Tools\Command_Line_Tools;%PATH%"/>
     <SetEnv Order="21" Name="PATH" Value="%PATH%;C:\Apps\Python24"/>
-    <SetEnv Order="22" Name="PATH" Value="%EPOCROOT%SBSv2\bin;%PATH%"/>
+	<!-- %SBS_LOCAL_BIN% is required to support the optional use of a locally installed Raptor -->
+    <SetEnv Order="22" Name="PATH" Value="%SBS_LOCAL_BIN%%EPOCROOT%SBSv2\bin;%PATH%"/>
     <SetEnv Order="23" Name="SBS_SRC" Value="%EPOCROOT%tools\sbs"/>
-	<SetEnv Order="24" Name="SBS_HOME" Value="%EPOCROOT%SBSv2"/>
+	<SetEnv Order="24" Name="SBS_ROOT" Value="%EPOCROOT%SBSv2"/>
     <SetEnv Order="25" Name="SOURCEROOT" Value="%SourceDir%"/> 
     <SetEnv Order="26" Name="SBS_VERSION" Value="1"/>
 	<SetEnv Order="27" Name="PATH" Value="%BuildDir%\reltools;%EPOCROOT%epoc32\tools;%EPOCROOT%epoc32\gcc\bin;%PATH%;%EPOCROOT%epoc32\rom\include;%EPOCROOT%epoc32\include;"/>
@@ -71,7 +72,7 @@
 	
     <!-- Install SBSv2 -->
     <Execute Component="Get Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GetDPComp\GetDPComp.pl -c dev_build_sbsv2_raptor -c dev_build_sbsv2_cpp-raptor -c dev_hostenv_dist_cygwin-1.5.25 -c dev_hostenv_dist_mingw-5.1.4 -c dev_hostenv_pythontoolsplat_python-2.5.2 -bv green -o %LogsDir%\raptor_version.txt"/>
-    <Execute Component="Copy SBSv2 to own directory" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\bxcopy.pl  -s %SBS_SRC%  -t %SBS_HOME%"/>
+    <Execute Component="Copy SBSv2 to own directory" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\bxcopy.pl  -s %SBS_SRC%  -t %SBS_ROOT%"/>
     <Execute Component="Remove Raptor related components" Cwd="%BuildDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\RmInstalledEnv.pl -x  %LogsDir%\raptor_version.txt"/>
 	<Execute Component="Remove epoc32 directory" Cwd="%BuildDir%" CommandLine="rd %EPOCROOT%epoc32 /s /q"/>
 	
@@ -395,7 +396,7 @@
 
     <!--Prep for CBR -->
     <Execute Component="CBR Copy Clean Src" Cwd="%BuildDir%\CBRTV" CommandLine="xcopy %CleanSourceDir% %BuildDir%\CBRTV\sf /E /Z /I /Q"/>
-    <Execute Component="Run sbsv2cache tool" Cwd="%BuildDir%" CommandLine="%SBS_HOME%\win32\python252\python.exe %SBS_HOME%\bin\sbsv2cache.py -v -s -o %ABLDCACHE% -l %LogsDir%\sbs_e32toolp_log.xml.log -l %LogsDir%\sbs_GT_log.xml.log -l %LogsDir%\sbs_TV_log.xml.log -l %LogsDir%\sbs_tools_log.xml.log -l %LogsDir%\sbs_tools2_rel_log.xml.log -l %LogsDir%\sbs_tools2_deb_log.xml.log > %LogsDir%\sbs_sbsv2cache.log 2>&amp;1"/>
+    <Execute Component="Run sbsv2cache tool" Cwd="%BuildDir%" CommandLine="%SBS_ROOT%\win32\python252\python.exe %SBS_ROOT%\bin\sbsv2cache.py -v -s -o %ABLDCACHE% -l %LogsDir%\sbs_e32toolp_log.xml.log -l %LogsDir%\sbs_GT_log.xml.log -l %LogsDir%\sbs_TV_log.xml.log -l %LogsDir%\sbs_tools_log.xml.log -l %LogsDir%\sbs_tools2_rel_log.xml.log -l %LogsDir%\sbs_tools2_deb_log.xml.log > %LogsDir%\sbs_sbsv2cache.log 2>&amp;1"/>
     <Execute Component="Publish Raptor Cache Log"    Cwd="%BuildDir%" CommandLine="copy %LogsDir%\sbs_sbsv2cache.log %PublishLocation%\%Type%\%BuildNumber%\logs\sbs_sbsv2cache.log"/>
 
 	<!-- Cleanup unnecessary files  to remove warnings -->