# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284546820 -10800 # Node ID e9c37cca4832ea0405fb5633c2bf7533d34289a4 # Parent 1a4e75cfed9dd05807d4f2d59fa986ca9c4b5822 Revision: 201036 Kit: 201036 diff -r 1a4e75cfed9d -r e9c37cca4832 Version/data/sw.txt Binary file Version/data/sw.txt has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/appmngr2/help/data/xhtml.zip Binary file helps_loc2/appmngr2/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/browserui/help/data/xhtml.zip Binary file helps_loc2/browserui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/calendarui/help/data/xhtml.zip Binary file helps_loc2/calendarui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/cameraapp/help/data/xhtml.zip Binary file helps_loc2/cameraapp/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/clock2/help/data/xhtml.zip Binary file helps_loc2/clock2/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/cscapplicationui/help/data/xhtml.zip Binary file helps_loc2/cscapplicationui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/emailhelp/help/data/xhtml.zip Binary file helps_loc2/emailhelp/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/equalizer/help/data/xhtml.zip Binary file helps_loc2/equalizer/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/filemanager/help/data/xhtml.zip Binary file helps_loc2/filemanager/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/gssettingsuis/help/data/xhtml.zip Binary file helps_loc2/gssettingsuis/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/hqtts/help/data/xhtml.zip Binary file helps_loc2/hqtts/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/imageprintui/help/data/xhtml.zip Binary file helps_loc2/imageprintui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/imum/help/data/xhtml.zip Binary file helps_loc2/imum/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/locationsysui/help/data/xhtml.zip Binary file helps_loc2/locationsysui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/logsui/help/data/xhtml.zip Binary file helps_loc2/logsui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/matrixmenu/help/data/xhtml.zip Binary file helps_loc2/matrixmenu/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/mce/help/data/xhtml.zip Binary file helps_loc2/mce/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/mpxmusicplayer/help/data/xhtml.zip Binary file helps_loc2/mpxmusicplayer/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/omadmappui/help/data/xhtml.zip Binary file helps_loc2/omadmappui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/omaprovisioning/help/data/xhtml.zip Binary file helps_loc2/omaprovisioning/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/phonebook/help/data/xhtml.zip Binary file helps_loc2/phonebook/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/phoneui/help/data/xhtml.zip Binary file helps_loc2/phoneui/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/photossuite/help/data/xhtml.zip Binary file helps_loc2/photossuite/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/profilesapplication/help/data/xhtml.zip Binary file helps_loc2/profilesapplication/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/psln/help/data/xhtml.zip Binary file helps_loc2/psln/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/radio/help/data/xhtml.zip Binary file helps_loc2/radio/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/speeddial/help/data/xhtml.zip Binary file helps_loc2/speeddial/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/unieditor/help/data/xhtml.zip Binary file helps_loc2/unieditor/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 helps_loc2/vmbx/help/data/xhtml.zip Binary file helps_loc2/vmbx/help/data/xhtml.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/01.zip Binary file locfiles/data/01.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/02.zip Binary file locfiles/data/02.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/03.zip Binary file locfiles/data/03.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/04.zip Binary file locfiles/data/04.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/05.zip Binary file locfiles/data/05.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/06.zip Binary file locfiles/data/06.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/07.zip Binary file locfiles/data/07.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/08.zip Binary file locfiles/data/08.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/09.zip Binary file locfiles/data/09.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/10.zip Binary file locfiles/data/10.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/102.zip Binary file locfiles/data/102.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/103.zip Binary file locfiles/data/103.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/129.zip Binary file locfiles/data/129.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/13.zip Binary file locfiles/data/13.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/14.zip Binary file locfiles/data/14.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/14346.zip Binary file locfiles/data/14346.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/14387.zip Binary file locfiles/data/14387.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/14412.zip Binary file locfiles/data/14412.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/14419.zip Binary file locfiles/data/14419.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/15.zip Binary file locfiles/data/15.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/157.zip Binary file locfiles/data/157.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/158.zip Binary file locfiles/data/158.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/159.zip Binary file locfiles/data/159.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/16.zip Binary file locfiles/data/16.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/160.zip Binary file locfiles/data/160.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/161.zip Binary file locfiles/data/161.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/17.zip Binary file locfiles/data/17.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/18.zip Binary file locfiles/data/18.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/230.zip Binary file locfiles/data/230.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/25.zip Binary file locfiles/data/25.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/26.zip Binary file locfiles/data/26.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/27.zip Binary file locfiles/data/27.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/28.zip Binary file locfiles/data/28.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/29.zip Binary file locfiles/data/29.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/30.zip Binary file locfiles/data/30.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/31.zip Binary file locfiles/data/31.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/32.zip Binary file locfiles/data/32.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/326.zip Binary file locfiles/data/326.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/327.zip Binary file locfiles/data/327.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/33.zip Binary file locfiles/data/33.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/37.zip Binary file locfiles/data/37.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/39.zip Binary file locfiles/data/39.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/42.zip Binary file locfiles/data/42.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/44.zip Binary file locfiles/data/44.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/45.zip Binary file locfiles/data/45.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/49.zip Binary file locfiles/data/49.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/50.zip Binary file locfiles/data/50.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/51.zip Binary file locfiles/data/51.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/54.zip Binary file locfiles/data/54.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/57.zip Binary file locfiles/data/57.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/59.zip Binary file locfiles/data/59.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/65.zip Binary file locfiles/data/65.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/67.zip Binary file locfiles/data/67.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/68.zip Binary file locfiles/data/68.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/70.zip Binary file locfiles/data/70.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/76.zip Binary file locfiles/data/76.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/78.zip Binary file locfiles/data/78.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/79.zip Binary file locfiles/data/79.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/83.zip Binary file locfiles/data/83.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/93.zip Binary file locfiles/data/93.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/94.zip Binary file locfiles/data/94.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/data/96.zip Binary file locfiles/data/96.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 locfiles/group/switch_loc.zip Binary file locfiles/group/switch_loc.zip has changed diff -r 1a4e75cfed9d -r e9c37cca4832 sf_build/sf_prebuild/makefile --- a/sf_build/sf_prebuild/makefile Tue Sep 14 23:39:54 2010 +0300 +++ b/sf_build/sf_prebuild/makefile Wed Sep 15 13:33:40 2010 +0300 @@ -1,20 +1,19 @@ # S60 build level configuration makefile -MAKEFILE = /sf/os/deviceplatformrelease/sf_build/sf_prebuild/makefile +MAKEFILE = $(EPOCROOT)/sf/os/deviceplatformrelease/sf_build/sf_prebuild/makefile # Exporting makefile template -include /sf/os/devicesrv/commonservices/commonengine/makefile +include $(EPOCROOT)/sf/os/devicesrv/commonservices/commonengine/makefile -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 -# removed by riku include /sf/mw/qtextensions/group/cmaker/makefile +include $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile +include $(EPOCROOT)/sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile + ifeq (S60,$(BUILD)) -include /sf/mw/uiresources/uigraphics/icons/makefile -include /sf/mw/uiresources/uigraphics/bitmaps2/makefile -include /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile -include /sf/app/homescreentools/dtdinstaller/makefile +include $(EPOCROOT)/sf/mw/uiresources/uigraphics/icons/makefile +include $(EPOCROOT)/sf/mw/uiresources/uigraphics/bitmaps2/makefile +include $(EPOCROOT)/sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile +include $(EPOCROOT)/sf/app/homescreentools/dtdinstaller/makefile endif # Place the first target as the default target which is executed from this level diff -r 1a4e75cfed9d -r e9c37cca4832 symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv --- a/symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv Tue Sep 14 23:39:54 2010 +0300 +++ b/symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv Wed Sep 15 13:33:40 2010 +0300 @@ -271,6 +271,7 @@ base_omaph4hrp_sdio,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 base_sa1100,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 base_sdiotests,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 +base_sdiotests_restricted,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 base_soc,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 base_template,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 base_template_usbhostotg,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 diff -r 1a4e75cfed9d -r e9c37cca4832 symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt --- a/symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt Tue Sep 14 23:39:54 2010 +0300 +++ b/symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt Wed Sep 15 13:33:40 2010 +0300 @@ -85,7 +85,7 @@ base_e32_sd4c \sf\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c\base_e32_sd4c.mrp base_e32test \sf\os\kernelhwsrv\kerneltest\e32test\group\base_e32test.mrp base_e32utils \sf\os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp -base_e32utils_restricted \sf\os\kernelhwsrv\kerneltest\e32utils\group\restricted\base_e32utils_restricted.mrp +base_e32utils_restricted \sf\os\kernelhwsrv\kerneltest\e32utils\restricted\base_e32utils_restricted.mrp base_f32 \sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\base_f32.mrp base_f32_automounter \sf\os\kernelhwsrv\userlibandfileserver\fileserver\automounter\base_f32_automounter.mrp base_f32_eshell \sf\os\kernelhwsrv\userlibandfileserver\fileserver\etshell\base_f32_eshell.mrp @@ -118,6 +118,7 @@ base_omaph4hrp_unistore2 \sf\os\boardsupport\omaph4\omaph4unistore2\base_omaph4hrp_unistore2.mrp base_omaph4hrp_usbhostotg_usbware \sf\os\boardsupport\omaph4\omapusbhotgdrivers\base_omaph4hrp_usbhostotg_usbware.mrp base_sdiotests \sf\os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp +base_sdiotests_restricted \sf\os\kernelhwsrv\kerneltest\sdiotest_restricted\base_sdiotests_restricted.mrp base_template \sf\os\kernelhwsrv\bsptemplate\asspandvariant\base_template.mrp base_template_usbhostotg \sf\os\usb\usbbsptemplate\usbhostcntrldrivertemplate\base_template_usbhostotg.mrp base_tiomap3 \sf\os\boardsupport\omap3variants\tiomap3bsp\base_tiomap3.mrp diff -r 1a4e75cfed9d -r e9c37cca4832 symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt --- a/symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt Tue Sep 14 23:39:54 2010 +0300 +++ b/symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt Wed Sep 15 13:33:40 2010 +0300 @@ -91,7 +91,7 @@ base_e32_sd4c \sf\os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c\base_e32_sd4c.mrp base_e32test \sf\os\kernelhwsrv\kerneltest\e32test\group\base_e32test.mrp base_e32utils \sf\os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp -base_e32utils_restricted \sf\os\kernelhwsrv\kerneltest\e32utils\group\restricted\base_e32utils_restricted.mrp +base_e32utils_restricted \sf\os\kernelhwsrv\kerneltest\e32utils\restricted\base_e32utils_restricted.mrp base_f32 \sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\base_f32.mrp base_f32_automounter \sf\os\kernelhwsrv\userlibandfileserver\fileserver\automounter\base_f32_automounter.mrp base_f32_automounter \sf\os\kernelhwsrv\userlibandfileserver\fileserver\automounter\base_f32_automounter.mrp @@ -125,6 +125,7 @@ base_omaph4hrp_unistore2 \sf\os\boardsupport\omaph4\omaph4unistore2\base_omaph4hrp_unistore2.mrp base_omaph4hrp_usbhostotg_usbware \sf\os\boardsupport\omaph4\omapusbhotgdrivers\base_omaph4hrp_usbhostotg_usbware.mrp base_sdiotests \sf\os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp +base_sdiotests_restricted \sf\os\kernelhwsrv\kerneltest\sdiotest_restricted\base_sdiotests_restricted.mrp base_template \sf\os\kernelhwsrv\bsptemplate\asspandvariant\base_template.mrp base_template_usbhostotg \sf\os\usb\usbbsptemplate\usbhostcntrldrivertemplate\base_template_usbhostotg.mrp base_tiomap3 \sf\os\boardsupport\omap3variants\tiomap3bsp\base_tiomap3.mrp