Merge RCL_3 fixes with latest delivery.
Binary file Version/data/sw.txt has changed
Binary file helps_loc2/adobereader/help/data/xhtml.zip has changed
--- a/helps_loc2/adobereader/help/group/bld.inf Wed Jul 21 18:14:21 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-*
-* Contributors:
-*
-*
-* Description:
-* Export help related files.
-*
-*/
-
-
-PRJ_EXPORTS
-:zip ../data/xhtml.zip /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip /epoc32/winscw/c/resource/ overwrite
-
Binary file helps_loc2/appmngr2/help/data/xhtml.zip has changed
Binary file helps_loc2/browserui/help/data/xhtml.zip has changed
Binary file helps_loc2/calendarui/help/data/xhtml.zip has changed
Binary file helps_loc2/cameraapp/help/data/xhtml.zip has changed
Binary file helps_loc2/clock2/help/data/xhtml.zip has changed
Binary file helps_loc2/cscapplicationui/help/data/xhtml.zip has changed
Binary file helps_loc2/deviceencryption/help/data/xhtml.zip has changed
--- a/helps_loc2/deviceencryption/help/group/bld.inf Wed Jul 21 18:14:21 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-*
-* Contributors:
-*
-*
-* Description:
-* Export help related files.
-*
-*/
-
-
-PRJ_EXPORTS
-:zip ../data/xhtml.zip /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip /epoc32/winscw/c/resource/ overwrite
-
Binary file helps_loc2/emailhelp/help/data/xhtml.zip has changed
Binary file helps_loc2/equalizer/help/data/xhtml.zip has changed
Binary file helps_loc2/filemanager/help/data/xhtml.zip has changed
--- a/helps_loc2/group/bld.inf Wed Jul 21 18:14:21 2010 +0100
+++ b/helps_loc2/group/bld.inf Mon Aug 23 11:11:20 2010 +0100
@@ -19,7 +19,6 @@
#include <platform_paths.hrh>
-#include "../adobereader/help/group/bld.inf"
#include "../appmngr2/help/group/bld.inf"
#include "../audiothemes/help/group/bld.inf"
#include "../blid/help/group/bld.inf"
@@ -35,7 +34,6 @@
#include "../connectionmonitorui/help/group/bld.inf"
#include "../converter/help/group/bld.inf"
#include "../cscapplicationui/help/group/bld.inf"
-#include "../deviceencryption/help/group/bld.inf"
#include "../drmsettingsplugin/help/group/bld.inf"
#include "../emailhelp/help/group/bld.inf"
#include "../equalizer/help/group/bld.inf"
@@ -70,7 +68,6 @@
#include "../omadsappui/help/group/bld.inf"
#include "../omaprovisioning/help/group/bld.inf"
#include "../operatormenu/help/group/bld.inf"
-#include "../ovisync/help/group/bld.inf"
#include "../phonebook/help/group/bld.inf"
#include "../phoneui/help/group/bld.inf"
#include "../photossuite/help/group/bld.inf"
Binary file helps_loc2/gssettingsuis/help/data/xhtml.zip has changed
Binary file helps_loc2/hqtts/help/data/xhtml.zip has changed
Binary file helps_loc2/imageprintui/help/data/xhtml.zip has changed
Binary file helps_loc2/imum/help/data/xhtml.zip has changed
--- a/helps_loc2/layers.sysdef.xml Wed Jul 21 18:14:21 2010 +0100
+++ b/helps_loc2/layers.sysdef.xml Mon Aug 23 11:11:20 2010 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
- <!ENTITY layer_real_source_path "ext/os/s60platformrelease/helps_loc2" >
+ <!ENTITY layer_real_source_path "sf/os/deviceplatformrelease/helps_loc2" >
]>
<SystemDefinition name="helps_loc2" schema="1.4.0">
Binary file helps_loc2/locationsysui/help/data/xhtml.zip has changed
Binary file helps_loc2/logsui/help/data/xhtml.zip has changed
Binary file helps_loc2/matrixmenu/help/data/xhtml.zip has changed
Binary file helps_loc2/mce/help/data/xhtml.zip has changed
Binary file helps_loc2/mpxmusicplayer/help/data/xhtml.zip has changed
Binary file helps_loc2/omadmappui/help/data/xhtml.zip has changed
Binary file helps_loc2/omaprovisioning/help/data/xhtml.zip has changed
Binary file helps_loc2/ovisync/help/data/xhtml.zip has changed
--- a/helps_loc2/ovisync/help/group/bld.inf Wed Jul 21 18:14:21 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-*
-* Contributors:
-*
-*
-* Description:
-* Export help related files.
-*
-*/
-
-
-PRJ_EXPORTS
-:zip ../data/xhtml.zip /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip /epoc32/winscw/c/resource/ overwrite
-
Binary file helps_loc2/phonebook/help/data/xhtml.zip has changed
Binary file helps_loc2/phoneui/help/data/xhtml.zip has changed
Binary file helps_loc2/photossuite/help/data/xhtml.zip has changed
Binary file helps_loc2/profilesapplication/help/data/xhtml.zip has changed
Binary file helps_loc2/psln/help/data/xhtml.zip has changed
Binary file helps_loc2/radio/help/data/xhtml.zip has changed
Binary file helps_loc2/source/en_xml.zip has changed
Binary file helps_loc2/speeddial/help/data/xhtml.zip has changed
Binary file helps_loc2/unieditor/help/data/xhtml.zip has changed
Binary file helps_loc2/vmbx/help/data/xhtml.zip has changed
Binary file locfiles/data/01.zip has changed
Binary file locfiles/data/02.zip has changed
Binary file locfiles/data/03.zip has changed
Binary file locfiles/data/04.zip has changed
Binary file locfiles/data/05.zip has changed
Binary file locfiles/data/06.zip has changed
Binary file locfiles/data/07.zip has changed
Binary file locfiles/data/08.zip has changed
Binary file locfiles/data/09.zip has changed
Binary file locfiles/data/10.zip has changed
Binary file locfiles/data/102.zip has changed
Binary file locfiles/data/103.zip has changed
Binary file locfiles/data/129.zip has changed
Binary file locfiles/data/13.zip has changed
Binary file locfiles/data/14.zip has changed
Binary file locfiles/data/14346.zip has changed
Binary file locfiles/data/14387.zip has changed
Binary file locfiles/data/14412.zip has changed
Binary file locfiles/data/14419.zip has changed
Binary file locfiles/data/15.zip has changed
Binary file locfiles/data/157.zip has changed
Binary file locfiles/data/158.zip has changed
Binary file locfiles/data/159.zip has changed
Binary file locfiles/data/16.zip has changed
Binary file locfiles/data/160.zip has changed
Binary file locfiles/data/161.zip has changed
Binary file locfiles/data/17.zip has changed
Binary file locfiles/data/18.zip has changed
Binary file locfiles/data/230.zip has changed
Binary file locfiles/data/25.zip has changed
Binary file locfiles/data/26.zip has changed
Binary file locfiles/data/27.zip has changed
Binary file locfiles/data/28.zip has changed
Binary file locfiles/data/29.zip has changed
Binary file locfiles/data/30.zip has changed
Binary file locfiles/data/31.zip has changed
Binary file locfiles/data/32.zip has changed
Binary file locfiles/data/326.zip has changed
Binary file locfiles/data/327.zip has changed
Binary file locfiles/data/33.zip has changed
Binary file locfiles/data/37.zip has changed
Binary file locfiles/data/39.zip has changed
Binary file locfiles/data/42.zip has changed
Binary file locfiles/data/44.zip has changed
Binary file locfiles/data/45.zip has changed
Binary file locfiles/data/49.zip has changed
Binary file locfiles/data/50.zip has changed
Binary file locfiles/data/51.zip has changed
Binary file locfiles/data/54.zip has changed
Binary file locfiles/data/57.zip has changed
Binary file locfiles/data/59.zip has changed
Binary file locfiles/data/65.zip has changed
Binary file locfiles/data/67.zip has changed
Binary file locfiles/data/68.zip has changed
Binary file locfiles/data/70.zip has changed
Binary file locfiles/data/76.zip has changed
Binary file locfiles/data/78.zip has changed
Binary file locfiles/data/79.zip has changed
Binary file locfiles/data/83.zip has changed
Binary file locfiles/data/93.zip has changed
Binary file locfiles/data/94.zip has changed
Binary file locfiles/data/96.zip has changed
Binary file locfiles/group/switch_loc.zip has changed
--- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml Wed Jul 21 18:14:21 2010 +0100
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml Mon Aug 23 11:11:20 2010 +0100
@@ -53,6 +53,8 @@
<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"/>
+ <SetEnv Order="33" Name="ARMLMD_LICENSE_FILE" Value="c:\apps\arm\license.dat;8224@lolmg.europe.nokia.com;8224@falic01.europe.nokia.com;8224@salmg01.nmp.nokia.com;28747@saslmg04.nmp.nokia.com"/>
+
<!-- Dumping environment -->
<Execute Component="Dumping all environment variables" Cwd="%BuildDir%" CommandLine="SET"/>
--- a/symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh Wed Jul 21 18:14:21 2010 +0100
+++ b/symbianosbld/cedarutils/inc/Symbian_OS_tb92sf.hrh Mon Aug 23 11:11:20 2010 +0100
@@ -2078,6 +2078,27 @@
If SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION is enabled, the Orientation Independent Windows feature is enabled.
*/
#define SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+/**
+@publishedPartner
+ @released
+
+ SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+
+If SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW is defined, TCP protocol will set the Receive window size according to the underlying bearer (ex. GPRS, WiFi, etc)
+ and the window size will change as the bearer changes or the modulation of the bearer changes.
+ #define supports PREQ1854.
+
+*/
+#define SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
+
+/**
+@internalAll
+
+SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD
+
+If SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD is enabled, Symbian emulator will have support for per-(emulated) process writable static data.
+*/
+#define SYMBIAN_EMULATOR_SUPPORTS_PERPROCESS_WSD
/**
SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV
--- a/symbianosbld/cedarutils/tb92sfrom_obys/ABLD.BAT Wed Jul 21 18:14:21 2010 +0100
+++ b/symbianosbld/cedarutils/tb92sfrom_obys/ABLD.BAT Mon Aug 23 11:11:20 2010 +0100
@@ -3,7 +3,7 @@
REM Bldmake-generated batch file - ABLD.BAT
REM ** DO NOT EDIT **
-perl -S ABLD.PL "\sf\os\deviceplatformrelease\symbianosbld\cedarutils\tb92sfrom_obys\\" %1 %2 %3 %4 %5 %6 %7 %8 %9
+perl -S abld.pl "\sf\os\deviceplatformrelease\symbianosbld\cedarutils\tb92sfrom_obys\\" %1 %2 %3 %4 %5 %6 %7 %8 %9
if errorlevel==1 goto CheckPerl
goto End
--- a/symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv Wed Jul 21 18:14:21 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/AutoCBR_tb92sf_test_export.csv Mon Aug 23 11:11:20 2010 +0100
@@ -60,6 +60,12 @@
kernelhwsrv_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
kernelhwsrv_doc_pub,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
lbs_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
+lbs_networkpmasn1_plat,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
+lbs_networkpmasn1_pub,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
+lbs_networkpmutils,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
+lbs_suplcontrolplaneprotocols,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
+lbs_suplpmcore,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
+lbs_suplproxyprotocolmodule,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
messaging_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
messagingmw_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
mm_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
--- a/symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt Wed Jul 21 18:14:21 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/GCCXMLcomponents.txt Mon Aug 23 11:11:20 2010 +0100
@@ -42,7 +42,7 @@
app-services_calcon \sf\app\organizer\pimappsupport\chinesecalendarconverter\group\app-services_calcon.mrp
app-services_chinesecalendaralgorithm \sf\app\organizer\pimappsupport\chinesecalendaralg\group\app-services_chinesecalendaralgorithm.mrp
app-services_chtmltocrtconv \sf\mw\appsupport\filehandling\htmltorichtextconverter\group\app-services_chtmltocrtconv.mrp
-app-services_documentation \sf\mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp
+app-services_documentation \sf\mw\appsupport\commonappservices\doc_pub\app-services_documentation.mrp
app-services_hlpmodel \sf\app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp
app-services_richtexttohtmlconv \sf\mw\appsupport\filehandling\richtexttohtmlconverter\Group\app-services_richtexttohtmlconv.mrp
app-services_testalarmsrv \sf\mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv\app-services_testalarmsrv.mrp
@@ -254,11 +254,16 @@
lbs_network_positioning_module \sf\os\lbs\datasourcemodules\networkpositioningmodule\group\lbs_network_positioning_module.mrp
lbs_networkgateway \sf\os\lbs\locationmgmt\networkgateway\group\lbs_networkgateway.mrp
lbs_networklocationmanager \sf\os\lbs\locationmgmt\networklocationmgr\group\lbs_networklocationmanager.mrp
+lbs_networkpmasn1_plat \sf\os\lbs\networkprotocolmodules\networkpmasn1_plat\group\lbs_networkpmasn1_plat.mrp
+lbs_networkpmasn1_pub \sf\os\lbs\networkprotocolmodules\networkpmasn1_pub\group\lbs_networkpmasn1_pub.mrp
+lbs_networkpmutils \sf\os\lbs\networkprotocolmodules\networkpmutils\group\lbs_networkpmutils.mrp
lbs_networkrequesthandler \sf\os\lbs\locationrequestmgmt\networkrequesthandler\group\lbs_networkrequesthandler.mrp
lbs_networktest \sf\os\lbs\lbstest\locationprotocoltest\group\lbs_networktest.mrp
lbs_npeintegrationmodule \sf\os\lbs\datasourcemodules\npeintegmodule\group\lbs_npeintegrationmodule.mrp
lbs_privacyprotocolmodule \sf\os\lbs\networkprotocolmodules\privacyprotocolmodule\group\lbs_privacyprotocolmodule.mrp
lbs_simulation_positioning_module \sf\os\lbs\datasourcemodules\simulationpositioningmodule\group\lbs_simulation_positioning_module.mrp
+lbs_suplcontrolplaneprotocols \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\group\lbs_suplcontrolplaneprotocols.mrp
+lbs_suplpmcore \sf\os\lbs\networkprotocolmodules\suplpmcore\group\lbs_suplpmcore.mrp
lbs_suplprotocolmodule \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp
lbs_suplproxyprotocolmodule \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group\lbs_suplproxyprotocolmodule.mrp
lbs_suplsmstrigger \sf\mw\messagingmw\messagingfw\suplsmshandler\group\lbs_suplsmstrigger.mrp
--- a/symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt Wed Jul 21 18:14:21 2010 +0100
+++ b/symbianosbld/productionbldcbrconfig/tb92sf/GTcomponents.txt Mon Aug 23 11:11:20 2010 +0100
@@ -47,7 +47,7 @@
app-services_chinesecalendaralgorithm \sf\app\organizer\pimappsupport\chinesecalendaralg\group\app-services_chinesecalendaralgorithm.mrp
app-services_chtmltocrtconv \sf\mw\appsupport\filehandling\htmltorichtextconverter\group\app-services_chtmltocrtconv.mrp
app-services_coreappstest \sf\mw\appsupport\commonappservices\coreappstest\Group\app-services_CoreAppsTest.mrp
-app-services_documentation \sf\mw\appsupport\commonappservices\appservicesdocs\app-services_documentation.mrp
+app-services_documentation \sf\mw\appsupport\commonappservices\doc_pub\app-services_documentation.mrp
app-services_hlpmodel \sf\app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp
app-services_richtexttohtmlconv \sf\mw\appsupport\filehandling\richtexttohtmlconverter\Group\app-services_richtexttohtmlconv.mrp
app-services_testalarmsrv \sf\mw\appsupport\commonappservices\alarmservertest\TestAlarmSrv\app-services_testalarmsrv.mrp
@@ -94,6 +94,7 @@
base_e32utils_restricted \sf\os\kernelhwsrv\kerneltest\e32utils\group\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
base_f32_eshell \sf\os\kernelhwsrv\userlibandfileserver\fileserver\etshell\base_f32_eshell.mrp
base_f32_estart \sf\os\kernelhwsrv\userlibandfileserver\fileserver\estart\base_f32_estart.mrp
base_f32_exfat \sf\os\kernelhwsrv\userlibandfileserver\fileserver\internal\exfat\base_f32_exfat.mrp
@@ -273,11 +274,16 @@
lbs_network_positioning_module \sf\os\lbs\datasourcemodules\networkpositioningmodule\group\lbs_network_positioning_module.mrp
lbs_networkgateway \sf\os\lbs\locationmgmt\networkgateway\group\lbs_networkgateway.mrp
lbs_networklocationmanager \sf\os\lbs\locationmgmt\networklocationmgr\group\lbs_networklocationmanager.mrp
+lbs_networkpmasn1_plat \sf\os\lbs\networkprotocolmodules\networkpmasn1_plat\group\lbs_networkpmasn1_plat.mrp
+lbs_networkpmasn1_pub \sf\os\lbs\networkprotocolmodules\networkpmasn1_pub\group\lbs_networkpmasn1_pub.mrp
+lbs_networkpmutils \sf\os\lbs\networkprotocolmodules\networkpmutils\group\lbs_networkpmutils.mrp
lbs_networkrequesthandler \sf\os\lbs\locationrequestmgmt\networkrequesthandler\group\lbs_networkrequesthandler.mrp
lbs_networktest \sf\os\lbs\lbstest\locationprotocoltest\group\lbs_networktest.mrp
lbs_npeintegrationmodule \sf\os\lbs\datasourcemodules\npeintegmodule\group\lbs_npeintegrationmodule.mrp
lbs_privacyprotocolmodule \sf\os\lbs\networkprotocolmodules\privacyprotocolmodule\group\lbs_privacyprotocolmodule.mrp
lbs_simulation_positioning_module \sf\os\lbs\datasourcemodules\simulationpositioningmodule\group\lbs_simulation_positioning_module.mrp
+lbs_suplcontrolplaneprotocols \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\group\lbs_suplcontrolplaneprotocols.mrp
+lbs_suplpmcore \sf\os\lbs\networkprotocolmodules\suplpmcore\group\lbs_suplpmcore.mrp
lbs_suplprotocolmodule \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp
lbs_suplproxyprotocolmodule \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group\lbs_suplproxyprotocolmodule.mrp
lbs_suplsmstrigger \sf\mw\messagingmw\messagingfw\suplsmshandler\group\lbs_suplsmstrigger.mrp