# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1272979799 -3600
# Node ID a3582192319f3dc807660dd8854c1ad4b7b89f4d
# Parent  5a3f83d60aea326f8b61df69a7fe9891fc87f3ad# Parent  c66bccf3bced3b886d80817b5e390c7462aca928
Merge

diff -r 5a3f83d60aea -r a3582192319f Version/data/sw.txt
Binary file Version/data/sw.txt has changed
diff -r 5a3f83d60aea -r a3582192319f foundation_system/systemdocs/group/system.history.xml
--- a/foundation_system/systemdocs/group/system.history.xml	Tue May 04 14:22:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<relnotes name="DEVELOPERLIBRARY">
-  <purpose>
-  </purpose>
-</relnotes>
diff -r 5a3f83d60aea -r a3582192319f foundation_system/systemdocs/group/system.mrp
--- a/foundation_system/systemdocs/group/system.mrp	Tue May 04 14:22:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-component	system
-notes_source	\component_defs\release.src
-source		\sf\os\deviceplatformrelease\foundation_system\systemdocs
-
-ipr G 
-ipr O \sf\os\deviceplatformrelease\foundation_system\systemdocs\documentation\saod93\deps\icons
\ No newline at end of file
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/01.zip
Binary file locfiles/data/01.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/02.zip
Binary file locfiles/data/02.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/03.zip
Binary file locfiles/data/03.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/04.zip
Binary file locfiles/data/04.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/05.zip
Binary file locfiles/data/05.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/06.zip
Binary file locfiles/data/06.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/07.zip
Binary file locfiles/data/07.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/08.zip
Binary file locfiles/data/08.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/09.zip
Binary file locfiles/data/09.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/10.zip
Binary file locfiles/data/10.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/102.zip
Binary file locfiles/data/102.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/103.zip
Binary file locfiles/data/103.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/129.zip
Binary file locfiles/data/129.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/13.zip
Binary file locfiles/data/13.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/14.zip
Binary file locfiles/data/14.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/14346.zip
Binary file locfiles/data/14346.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/14387.zip
Binary file locfiles/data/14387.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/14412.zip
Binary file locfiles/data/14412.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/14419.zip
Binary file locfiles/data/14419.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/15.zip
Binary file locfiles/data/15.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/157.zip
Binary file locfiles/data/157.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/158.zip
Binary file locfiles/data/158.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/159.zip
Binary file locfiles/data/159.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/16.zip
Binary file locfiles/data/16.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/160.zip
Binary file locfiles/data/160.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/161.zip
Binary file locfiles/data/161.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/17.zip
Binary file locfiles/data/17.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/18.zip
Binary file locfiles/data/18.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/230.zip
Binary file locfiles/data/230.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/25.zip
Binary file locfiles/data/25.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/26.zip
Binary file locfiles/data/26.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/27.zip
Binary file locfiles/data/27.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/28.zip
Binary file locfiles/data/28.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/29.zip
Binary file locfiles/data/29.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/30.zip
Binary file locfiles/data/30.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/31.zip
Binary file locfiles/data/31.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/32.zip
Binary file locfiles/data/32.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/326.zip
Binary file locfiles/data/326.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/327.zip
Binary file locfiles/data/327.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/33.zip
Binary file locfiles/data/33.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/37.zip
Binary file locfiles/data/37.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/39.zip
Binary file locfiles/data/39.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/42.zip
Binary file locfiles/data/42.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/44.zip
Binary file locfiles/data/44.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/45.zip
Binary file locfiles/data/45.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/49.zip
Binary file locfiles/data/49.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/50.zip
Binary file locfiles/data/50.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/51.zip
Binary file locfiles/data/51.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/54.zip
Binary file locfiles/data/54.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/57.zip
Binary file locfiles/data/57.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/58.zip
Binary file locfiles/data/58.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/59.zip
Binary file locfiles/data/59.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/65.zip
Binary file locfiles/data/65.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/67.zip
Binary file locfiles/data/67.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/68.zip
Binary file locfiles/data/68.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/70.zip
Binary file locfiles/data/70.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/76.zip
Binary file locfiles/data/76.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/78.zip
Binary file locfiles/data/78.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/79.zip
Binary file locfiles/data/79.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/83.zip
Binary file locfiles/data/83.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/93.zip
Binary file locfiles/data/93.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/94.zip
Binary file locfiles/data/94.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/data/96.zip
Binary file locfiles/data/96.zip has changed
diff -r 5a3f83d60aea -r a3582192319f locfiles/group/switch_loc.zip
Binary file locfiles/group/switch_loc.zip has changed
diff -r 5a3f83d60aea -r a3582192319f symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Tue May 04 14:22:49 2010 +0100
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml	Tue May 04 14:29:59 2010 +0100
@@ -59,7 +59,8 @@
     <Execute Component="Publish Build Start to Diamonds" Cwd="%LogsDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GenResult\GenDiamondsXml.pl -t STARTBUILD -i START -s %DiamondsServer%"/> 
     <Execute Component="Publish PreBuild Start to Diamonds" Cwd="%LogsDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\GenResult\GenDiamondsXml.pl -t PREBUILD -i START -s %DiamondsServer%"/> 
 
- 
+	<Execute Component="Make Temp Dir" Cwd="%BuildDir%" CommandLine="mkdir D:\Builds\Temp"/>
+
      <!-- Get source code from TCL -->
     <Execute Component="Delta sync TCL sources" Cwd="%CleanSourceDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\perforce\P4GetSource.pl -f -s %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\cedarutils\tcl_in_mcl_sf_clientspec.txt -d %TCLDeltaCache% -p tcl -t for_mcl -c  %ChangelistNumber%"/>
 	
@@ -514,6 +515,9 @@
     <Execute Component="Stop PerfMon" Cwd="%SourceDir%\os\buildtools\bldsystemtools\commonbldutils\PerfMon" CommandLine="perl PerfMonControlStop.pl -p 1973"/>
     <Execute Component="Publish PerfMon Log" Cwd="%LogsDir%" CommandLine="xcopy PerfMon_%BuildNumber%.csv %PublishLocation%\%Type%\%BuildNumber%\logs\ /Z /I /Q"/>
 
+	<!-- Remove CBR Temp Dir -->
+	<Execute Component="Delete Temp Folder" Cwd="%BuildDir%" CommandLine="rmdir D:\Builds\Temp /s /q"/>
+
     <!--Publish the Full Logs Dir -->
     <Execute Component="Publish Full Logs Dir" Cwd="%BuildDir%" CommandLine="xcopy %LogsDir% %PublishLocation%\%Type%\logs\%BuildNumber% /E /Z /I /Q"/>
 
diff -r 5a3f83d60aea -r a3582192319f symbianosbld/cedarutils/sf_partial_clientspec.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbianosbld/cedarutils/sf_partial_clientspec.txt	Tue May 04 14:29:59 2010 +0100
@@ -0,0 +1,118 @@
+# A Perforce Client Specification.
+#
+#  Client:      The client name.
+#  Update:      The date this specification was last modified.
+#  Access:      The date this client was last used in any way.
+#  Owner:       The user who created this client.
+#  Host:        If set, restricts access to the named host.
+#  Description: A short description of the client (optional).
+#  Root:        The base directory of the client workspace.
+#  Options:     Client options:
+#                      [no]allwrite [no]clobber [no]compress
+#                      [un]locked [no]modtime [no]rmdir
+#  LineEnd:     Text file line endings on client: local/unix/mac/win/share.
+#  View:        Lines to map depot files into the client workspace.
+#
+# Use 'p4 help client' to see more about client views and options.
+
+Client:	CLIENTNAME
+
+Update:	CHANGEABLE
+
+Access:	CHANGEABLE
+
+Owner:	CHANGEABLE
+
+Host:	HOST
+
+Description:
+	Cedar Platform
+
+Root:	PERFORCEROOT
+
+Options:	noallwrite clobber nocompress unlocked nomodtime rmdir
+
+SubmitOptions:	submitunchanged
+
+LineEnd:	local
+
+View:
+	//SSS/release/sf/tb92/app/camera/... 		//CLIENTNAME/app/camera/...
+	//SSS/release/sf/tb92/app/commonemail/... 	//CLIENTNAME/app/commonemail/...
+	//SSS/release/sf/tb92/app/conntools/... 	//CLIENTNAME/app/conntools/...
+	//SSS/release/sf/tb92/app/contentcontrol/...	//CLIENTNAME/app/contentcontrol/...
+	//SSS/release/sf/tb92/app/conversations/... 	//CLIENTNAME/app/conversations/...
+	//SSS/release/sf/tb92/app/devicecontrol/... 	//CLIENTNAME/app/devicecontrol/...
+	//SSS/release/sf/tb92/app/dictionary/... 	//CLIENTNAME/app/dictionary/...
+	//SSS/release/sf/tb92/app/files/... 		//CLIENTNAME/app/files/...
+	//SSS/release/sf/tb92/app/gallery/... 		//CLIENTNAME/app/gallery/...
+	//SSS/release/sf/tb92/app/graphicsuis/... 	//CLIENTNAME/app/graphicsuis/...
+	//SSS/release/sf/tb92/app/helps/... 		//CLIENTNAME/app/helps/...
+	//SSS/release/sf/tb92/app/homescreen/... 	//CLIENTNAME/app/homescreen/...
+	//SSS/release/sf/tb92/app/homescreentools/... 	//CLIENTNAME/app/homescreentools/...
+	//SSS/release/sf/tb92/app/im/... 		//CLIENTNAME/app/im/...
+	//SSS/release/sf/tb92/app/imgeditor/... 	//CLIENTNAME/app/imgeditor/...
+	//SSS/release/sf/tb92/app/imgvieweruis/... 	//CLIENTNAME/app/imgvieweruis/...
+	//SSS/release/sf/tb92/app/iptelephony/... 	//CLIENTNAME/app/iptelephony/...
+	//SSS/release/sf/tb92/app/java/... 		//CLIENTNAME/app/java/...
+	//SSS/release/sf/tb92/app/location/... 		//CLIENTNAME/app/location/...
+	//SSS/release/sf/tb92/app/mmsharinguis/... 	//CLIENTNAME/app/mmsharinguis/...
+	//SSS/release/sf/tb92/app/musicplayer/... 	//CLIENTNAME/app/musicplayer/...
+	//SSS/release/sf/tb92/app/phone/... 		//CLIENTNAME/app/phone/...
+	//SSS/release/sf/tb92/app/photos/... 		//CLIENTNAME/app/photos/...
+	//SSS/release/sf/tb92/app/poc/... 		//CLIENTNAME/app/poc/...
+	//SSS/release/sf/tb92/app/printing/... 		//CLIENTNAME/app/printing/...
+	//SSS/release/sf/tb92/app/profile/... 		//CLIENTNAME/app/profile/...
+	//SSS/release/sf/tb92/app/radio/... 		//CLIENTNAME/app/radio/...
+	//SSS/release/sf/tb92/app/rndtools/... 		//CLIENTNAME/app/rndtools/...
+	//SSS/release/sf/tb92/app/screensaver/... 	//CLIENTNAME/app/screensaver/...
+	//SSS/release/sf/tb92/app/settinguis/... 	//CLIENTNAME/app/settinguis/...
+	//SSS/release/sf/tb92/app/speechsrv/... 	//CLIENTNAME/app/speechsrv/...
+	//SSS/release/sf/tb92/app/utils/... 		//CLIENTNAME/app/utils/...
+	//SSS/release/sf/tb92/app/videocenter/... 	//CLIENTNAME/app/videocenter/...
+	//SSS/release/sf/tb92/app/videoeditor/... 	//CLIENTNAME/app/videoeditor/...
+	//SSS/release/sf/tb92/app/videoplayer/... 	//CLIENTNAME/app/videplayer/...
+	//SSS/release/sf/tb92/app/videotelephony/... 	//CLIENTNAME/app/videotelephony/...
+	//SSS/release/sf/tb92/app/voicerec/... 		//CLIENTNAME/app/voicerec/...
+	//SSS/release/sf/tb92/app/webuis/... 		//CLIENTNAME/app/webuis/...
+	//SSS/release/sf/tb92/mw/accesssec/... 		//CLIENTNAME/mw/accesssec/...
+	//SSS/release/sf/tb92/mw/camerasrv/... 		//CLIENTNAME/mw/camerasrv/...
+	//SSS/release/sf/tb92/mw/dlnasrv/... 		//CLIENTNAME/mw/dlnasrv/...
+	//SSS/release/sf/tb92/mw/drm/... 		//CLIENTNAME/mw/drm/...
+	//SSS/release/sf/tb92/mw/gsprofilesrv/... 	//CLIENTNAME/mw/gsprofilesrv/...
+	//SSS/release/sf/tb92/mw/hapticservices/... 	//CLIENTNAME/mw/hapticservices/...
+	//SSS/release/sf/tb92/mw/helix/... 		//CLIENTNAME/mw/helix/...
+	//SSS/release/sf/tb92/mw/homescreensrv/... 	//CLIENTNAME/mw/homescreensrv/...
+	//SSS/release/sf/tb92/mw/imghandling/... 	//CLIENTNAME/mw/imghandling/...
+	//SSS/release/sf/tb92/mw/imsrv/... 		//CLIENTNAME/mw/imsrv/...
+	//SSS/release/sf/tb92/mw/ipappsrv/... 		//CLIENTNAME/mw/ipappsrv/...
+	//SSS/release/sf/tb92/mw/ipconnmgmt/... 	//CLIENTNAME/mw/ipconnmgmt/...
+	//SSS/release/sf/tb92/mw/legacypresence/... 	//CLIENTNAME/mw/legacypresence/...
+	//SSS/release/sf/tb92/mw/locationsrv/... 	//CLIENTNAME/mw/locationsrv/...
+	//SSS/release/sf/tb92/mw/mds/... 		//CLIENTNAME/mw/mds/...
+	//SSS/release/sf/tb92/mw/metadatasrv/... 	//CLIENTNAME/mw/metadatasrv/...
+	//SSS/release/sf/tb92/mw/mmappfw/... 		//CLIENTNAME/mw/mmappfw/...
+	//SSS/release/sf/tb92/mw/mmmw/... 		//CLIENTNAME/mw/mmmw/...
+	//SSS/release/sf/tb92/mw/mmuifw/... 		//CLIENTNAME/mw/mmmuifw/...
+	//SSS/release/sf/tb92/mw/networkingdm/... 	//CLIENTNAME/mw/networkingdm/...
+	//SSS/release/sf/tb92/mw/opensrv/... 		//CLIENTNAME/mw/opensrv/...
+	//SSS/release/sf/tb92/mw/phonesrv/... 		//CLIENTNAME/mw/phonesrv/...
+	//SSS/release/sf/tb92/mw/platformtools/... 	//CLIENTNAME/mw/platformtools/...
+	//SSS/release/sf/tb92/mw/remotemgmt/... 	//CLIENTNAME/mw/remotemgmt/...
+	//SSS/release/sf/tb92/mw/remotestorage/... 	//CLIENTNAME/mw/remotestorage/...
+	//SSS/release/sf/tb92/mw/serviceapi/... 	//CLIENTNAME/mw/serviceapi/...
+	//SSS/release/sf/tb92/mw/serviceapifw/... 	//CLIENTNAME/mw/serviceapifw/...
+	//SSS/release/sf/tb92/mw/svgt/... 		//CLIENTNAME/mw/svgt/...
+	//SSS/release/sf/tb92/mw/uiaccelerator/... 	//CLIENTNAME/mw/uiaccelerator/...
+	//SSS/release/sf/tb92/mw/uiresources/... 	//CLIENTNAME/mw/uiresources/...
+	//SSS/release/sf/tb92/mw/uitools/... 		//CLIENTNAME/mw/uitools/...
+	//SSS/release/sf/tb92/mw/usbservices/... 	//CLIENTNAME/mw/usbservices/...
+	//SSS/release/sf/tb92/mw/videoutils/... 	//CLIENTNAME/mw/videoutils/...
+	//SSS/release/sf/tb92/mw/vpnclient/... 		//CLIENTNAME/mw/vpnclient/...
+	//SSS/release/sf/tb92/mw/web/... 		//CLIENTNAME/mw/web/...
+	//SSS/release/sf/tb92/mw/websrv/... 		//CLIENTNAME/mw/websrv/...
+	//SSS/release/sf/tb92/mw/wirelessacc/... 	//CLIENTNAME/mw/wirelessacc/...
+	//SSS/release/sf/tb92/os/imagingext/... 	//CLIENTNAME/os/imagingext/...
+	//SSS/release/sf/tb92/os/osrndtools/... 	//CLIENTNAME/os/osrndtools/...
+	//SSS/release/sf/tb92/os/unref/... 		//CLIENTNAME/os/unref/...
+	//SSS/release/sf/tb92/os/wlan/... 		//CLIENTNAME/os/wlan/...
diff -r 5a3f83d60aea -r a3582192319f symbianosbld/productionbldcbrconfig/tb92sf/reltools.ini
--- a/symbianosbld/productionbldcbrconfig/tb92sf/reltools.ini	Tue May 04 14:22:49 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/reltools.ini	Tue May 04 14:29:59 2010 +0100
@@ -11,7 +11,7 @@
 categorise_binaries
 categorise_exports
 diff_tool				windiff
-
+temp_dir				D:\Builds\Temp
 ignore_binary	\epoc32\engdoc\*
 use_distribution_policy_files_first