Re-merge fixes for bug 476, bug 1895, bug 2049, bug 2149, bug 2509, bug 2539 and bug 2531.
--- a/imgtools_os/romkiteka2/include/featuredatabase.xml Wed Jun 23 19:29:20 2010 +0300
+++ b/imgtools_os/romkiteka2/include/featuredatabase.xml Tue Jul 13 16:41:02 2010 +0100
@@ -46,19 +46,19 @@
<hrhmacro exclude="SYMBIAN_EXCLUDE_FAX"/>
</feature>
<feature name="Print" statusflags="0x00000001" uid="0x000005FF">
- <hrhmacro include="__UPNP_PRINT_FRAMEWORK"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_PRINT"/>
</feature>
<feature name="Bluetooth" statusflags="0x00000001" uid="0x0000000C">
- <hrhmacro include="__BT"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_BLUETOOTH"/>
</feature>
<feature name="Infrared" statusflags="0x00000001" uid="0x0000000B">
- <hrhmacro include="__IRDA"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_INFRARED"/>
</feature>
<feature name="Mmc" statusflags="0x00000001" uid="0x00000001">
- <hrhmacro include="__MMC"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_MMC"/>
</feature>
<feature name="Usb" statusflags="0x00000001" uid="0x0000000D">
- <hrhmacro include="__USB"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_USB"/>
</feature>
<feature name="Obex" statusflags="0x00000001" uid="0x1027980C">
<hrhmacro exclude="SYMBIAN_EXCLUDE_OBEX"/>
@@ -76,32 +76,29 @@
<hrhmacro exclude="SYMBIAN_EXCLUDE_QOS_PROTPLUGINS"/>
</feature>
<feature name="IPSec" statusflags="0x00000001" uid="0x00000066">
- <hrhmacro include="__IPSEC"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_IPSEC"/>
</feature>
<feature name="Dhcp" statusflags="0x00000001" uid="0x0000006B">
- <hrhmacro include="__DHCP"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_DHCP"/>
</feature>
<feature name="Connectivity" statusflags="0x00000001" uid="0x10279816">
<hrhmacro exclude="SYMBIAN_EXCLUDE_PC_CONNECTIVITY_EXCEPT_SECURE_BACKUP"/>
</feature>
<feature name="MTP" statusflags="0x00000001" uid="0x000001F8">
- <hrhmacro include="__MTP_PROTOCOL_SUPPORT"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_MTP"/>
</feature>
<feature name="Location" statusflags="0x00000001" uid="0x00000072"></feature>
<feature name="MobileIP" statusflags="0x00000001" uid="0x10281819"></feature>
<feature name="OfflineMode" statusflags="0x00000001" uid="0x00000007"></feature>
<feature name="DRM" statusflags="0x00000001" uid="0x0000005B"></feature>
<feature name="Vibra" statusflags="0x00000001" uid="0x0000019B">
- <hrhmacro include="__VIBRA"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_VIBRA"/>
</feature>
<feature name="AmbientLightSensor" statusflags="0x00000001" uid="0x000005F9">
- <hrhmacro include="__SERIES60_AMBIENT_LIGHT_SENSOR"/>
- </feature>
- <feature name="CoverDisplay" statusflags="0x00000001" uid="0x00000003">
- <hrhmacro include="__COVER_DISPLAY"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_AMBIENT_LIGHT_SENSOR"/>
</feature>
<feature name="KeypadNoSlider" statusflags="0x00000001" uid="0x000003F5">
- <hrhmacro include="__SERIES60_KEYPAD_NO_SLIDER"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_KEYPAD_NO_SLIDER"/>
</feature>
<feature name="LocationManagement" statusflags="0x00000001" uid="0x10279818">
<hrhmacro exclude="SYMBIAN_EXCLUDE_LOCATION_MANAGEMENT"/>
@@ -110,7 +107,7 @@
<hrhmacro include="SYMBIAN_INCLUDE_LOCATION_API_VARIANT2"/>
</feature>
<feature name="BluetoothGPSPositioningPlugin" statusflags="0x00000000" uid="0x0000007A">
- <hrhmacro include="__BLUETOOTHGPSPSY"/>
+ <hrhmacro include="SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM"/>
</feature>
<feature name="DefaultPositioningPlugin" statusflags="0x00000000" uid="0x10285D6B">
<hrhmacro include="SYMBIAN_INCLUDE_DEFAULT_PM"/>
@@ -125,16 +122,16 @@
<hrhmacro include="SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG"/>
</feature>
<feature name="CsVideoTelephony" statusflags="0x00000001" uid="0x00000059">
- <hrhmacro include="__CS_VIDEO_TELEPHONY"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_CS_VIDEO_TELEPHONY"/>
</feature>
<feature name="EmergencyCallsEnabledInOfflineMode" statusflags="0x00000001" uid="0x00000126">
- <hrhmacro include="__COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE"/>
</feature>
<feature name="DriveModeCanRestrictMtCalls" statusflags="0x00000001" uid="0x00000584">
- <hrhmacro include="__DRIVE_MODE"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_DRIVE_MODE_CAN_RESTRICT_MT_CALLS"/>
</feature>
<feature name="FmTx" statusflags="0x00000001" uid="0x000006A9">
- <hrhmacro include="FF_FMTX"/>
+ <hrhmacro exclude="SYMBIAN_EXCLUDE_FMTX"/>
</feature>
<!-- PREQ 2051 - Variation Support - Start -->
<feature name="Libxml2" statusflags="0x00000001" uid="0x10286747">
@@ -147,6 +144,356 @@
<hrhmacro infeaturesetiby="no" exclude="SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API"/>
</feature>
<!-- PREQ 2051 - Variation Support - End -->
+<feature name="Camera" statusflags="0x00000001" uid ="0x00000002"></feature>
+<feature name="FmRadio" statusflags="0x00000001" uid ="0x00000005"></feature>
+<feature name="OpenGLES3DApi" statusflags="0x00000001" uid ="0x0000000a"></feature>
+<feature name="BtAudio" statusflags="0x00000001" uid ="0x0000000f"></feature>
+<feature name="Srcs" statusflags="0x00000001" uid ="0x00000011"></feature>
+<feature name="BtImagingProfile" statusflags="0x00000001" uid ="0x00000013"></feature>
+<feature name="Wim" statusflags="0x00000001" uid ="0x00000018"></feature>
+<feature name="SimCertificates" statusflags="0x00000001" uid ="0x00000019"></feature>
+<feature name="SmartCardProv" statusflags="0x00000001" uid ="0x0000001b"></feature>
+<feature name="IAUpdate" statusflags="0x00000001" uid ="0x0000001e"></feature>
+<feature name="Dpb" statusflags="0x00000001" uid ="0x00000020"></feature>
+<feature name="Im" statusflags="0x00000001" uid ="0x00000021"></feature>
+<feature name="ImpsStandaloneIpCir" statusflags="0x00000001" uid ="0x00000022"></feature>
+<feature name="Presence" statusflags="0x00000001" uid ="0x00000024"></feature>
+<feature name="SyncMlDm" statusflags="0x00000001" uid ="0x00000029"></feature>
+<feature name="SyncMlDs" statusflags="0x00000001" uid ="0x0000002a"></feature>
+<feature name="SyncMlDsMMS" statusflags="0x00000001" uid ="0x0000002b"></feature>
+<feature name="SyncMlDsEmail" statusflags="0x00000001" uid ="0x0000002c"></feature>
+<feature name="SyncMlDsCon" statusflags="0x00000001" uid ="0x0000002d"></feature>
+<feature name="SyncMlDsCal" statusflags="0x00000001" uid ="0x0000002e"></feature>
+<feature name="SyncMlDmDs" statusflags="0x00000001" uid ="0x0000002f"></feature>
+<feature name="SyncMlDmIAP" statusflags="0x00000001" uid ="0x00000030"></feature>
+<feature name="SyncMlDmEmail" statusflags="0x00000001" uid ="0x00000031"></feature>
+<feature name="SyncMlDmMMS" statusflags="0x00000001" uid ="0x00000032"></feature>
+<feature name="SyncMlObex" statusflags="0x00000001" uid ="0x00000033"></feature>
+<feature name="SyncMlDsAlert" statusflags="0x00000001" uid ="0x00000034"></feature>
+<feature name="SyncMlDsNotepad" statusflags="0x00000001" uid ="0x00000035"></feature>
+<feature name="SyncMlDmObex" statusflags="0x00000001" uid ="0x00000036"></feature>
+<feature name="SyncMlDmWlan" statusflags="0x00000001" uid ="0x00000037"></feature>
+<feature name="SyncMlDmImps" statusflags="0x00000001" uid ="0x00000039"></feature>
+<feature name="SyncMlDmFota" statusflags="0x00000001" uid ="0x0000003a"></feature>
+<feature name="SyncMlDmVoIP" statusflags="0x00000001" uid ="0x0000003b"></feature>
+<feature name="SyncMlDmSIP" statusflags="0x00000001" uid ="0x0000003c"></feature>
+<feature name="FfNcdEngine" statusflags="0x00000001" uid ="0x0000003d"></feature>
+<feature name="FfNcdUi" statusflags="0x00000001" uid ="0x0000003e"></feature>
+<feature name="VirtualFullscrQwertyInput" statusflags="0x00000001" uid ="0x00000040"></feature>
+<feature name="VirtualItutInput" statusflags="0x00000001" uid ="0x00000041"></feature>
+<feature name="Mp3" statusflags="0x00000001" uid ="0x00000047"></feature>
+<feature name="Sind" statusflags="0x00000001" uid ="0x00000048"></feature>
+<feature name="AmrNb" statusflags="0x00000001" uid ="0x00000049"></feature>
+<feature name="AmrWb" statusflags="0x00000001" uid ="0x0000004a"></feature>
+<feature name="Aac" statusflags="0x00000001" uid ="0x0000004b"></feature>
+<feature name="SymbianMultimediaA3fdevsoundId" statusflags="0x00000001" uid ="0x0000004c"></feature>
+<feature name="Svgt" statusflags="0x00000001" uid ="0x0000004d"></feature>
+<feature name="MacromediaFlash6" statusflags="0x00000001" uid ="0x0000004f"></feature>
+<feature name="Mpeg4VideoEncoding" statusflags="0x00000001" uid ="0x00000050"></feature>
+<feature name="ProtocolGsm" statusflags="0x00000001" uid ="0x00000051"></feature>
+<feature name="ProtocolWcdma" statusflags="0x00000001" uid ="0x00000052"></feature>
+<feature name="SimCard" statusflags="0x00000001" uid ="0x00000058"></feature>
+<feature name="UseDrmEngineInCcp" statusflags="0x00000001" uid ="0x0000005c"></feature>
+<feature name="DrmFull" statusflags="0x00000001" uid ="0x0000005d"></feature>
+<feature name="DrmPhase2" statusflags="0x00000001" uid ="0x0000005f"></feature>
+<feature name="DrmClock" statusflags="0x00000001" uid ="0x00000060"></feature>
+<feature name="DrmOma2" statusflags="0x00000001" uid ="0x00000062"></feature>
+<feature name="Qos" statusflags="0x00000001" uid ="0x00000065"></feature>
+<feature name="LoggerGprs" statusflags="0x00000001" uid ="0x00000067"></feature>
+<feature name="EdgeKnowledge" statusflags="0x00000001" uid ="0x00000068"></feature>
+<feature name="NetworkRegistration" statusflags="0x00000001" uid ="0x00000069"></feature>
+<feature name="ConnMonExtension" statusflags="0x00000001" uid ="0x0000006c"></feature>
+<feature name="ProtocolWlan" statusflags="0x00000001" uid ="0x0000006d"></feature>
+<feature name="Landmarks" statusflags="0x00000001" uid ="0x00000070"></feature>
+<feature name="PrivacyFramework" statusflags="0x00000001" uid ="0x00000073"></feature>
+<feature name="UsbCharging" statusflags="0x00000001" uid ="0x00000077"></feature>
+<feature name="RockerKey" statusflags="0x00000001" uid ="0x00000078"></feature>
+<feature name="LandmarksConverter" statusflags="0x00000001" uid ="0x0000007b"></feature>
+<feature name="LocationSysUi" statusflags="0x00000001" uid ="0x0000007c"></feature>
+<feature name="SelectableEmail" statusflags="0x00000001" uid ="0x0000007d"></feature>
+<feature name="EmailMceIntegration" statusflags="0x00000001" uid ="0x0000007e"></feature>
+<feature name="FfSimlessOfflineSupport" statusflags="0x00000001" uid ="0x00000082"></feature>
+<feature name="CaeVrCustomCommands" statusflags="0x00000001" uid ="0x00000083"></feature>
+<feature name="CameraBurstMode" statusflags="0x00000001" uid ="0x00000084"></feature>
+<feature name="FfEmailFramework" statusflags="0x00000001" uid ="0x00000087"></feature>
+<feature name="JavaMMAPI11" statusflags="0x00000001" uid ="0x0000008f"></feature>
+<feature name="JavaFileAPI" statusflags="0x00000001" uid ="0x00000090"></feature>
+<feature name="JavaPIMAPI" statusflags="0x00000001" uid ="0x00000091"></feature>
+<feature name="Java3DAPI" statusflags="0x00000001" uid ="0x00000092"></feature>
+<feature name="JavaLocationAPI" statusflags="0x00000001" uid ="0x00000093"></feature>
+<feature name="OCSP" statusflags="0x00000001" uid ="0x00000095"></feature>
+<feature name="J2MEWebServicesAPI" statusflags="0x00000001" uid ="0x00000096"></feature>
+<feature name="FfVoiceCallContinuity" statusflags="0x00000001" uid ="0x00000098"></feature>
+<feature name="FfWsNcim" statusflags="0x00000001" uid ="0x00000099"></feature>
+<feature name="BrowserAdaptiveBookm" statusflags="0x00000001" uid ="0x000000a3"></feature>
+<feature name="BrowserUrlCompletion" statusflags="0x00000001" uid ="0x000000a5"></feature>
+<feature name="RssFeeds" statusflags="0x00000001" uid ="0x000000a7"></feature>
+<feature name="Series60NativeBrowser" statusflags="0x00000001" uid ="0x000000a8"></feature>
+<feature name="FfConnectionOverride" statusflags="0x00000001" uid ="0x000000b3"></feature>
+<feature name="FfCapacitiveDisplay" statusflags="0x00000001" uid ="0x000000b7"></feature>
+<feature name="FfTacticons" statusflags="0x00000001" uid ="0x000000b8"></feature>
+<feature name="FfIaupdatePhase2" statusflags="0x00000001" uid ="0x000000b9"></feature>
+<feature name="FfOmaScomoAdapter" statusflags="0x00000001" uid ="0x000000c5"></feature>
+<feature name="FfRuntimeDeviceCapabilityConfiguration" statusflags="0x00000001" uid ="0x000000c6"></feature>
+<feature name="IncludeUsbRndis" statusflags="0x00000001" uid ="0x000000c8"></feature>
+<feature name="SideVolumeKeys" statusflags="0x00000001" uid ="0x000000cf"></feature>
+<feature name="VideoRecorder" statusflags="0x00000001" uid ="0x000000d0"></feature>
+<feature name="OpenGLESSWImplementation" statusflags="0x00000001" uid ="0x000000d2"></feature>
+<feature name="FfAvkonEmotionIconEnabled" statusflags="0x00000001" uid ="0x000000d3"></feature>
+<feature name="FfTarmCapabilityBasedAccess" statusflags="0x00000001" uid ="0x000000d6"></feature>
+<feature name="FfEmailProtocolPlugins" statusflags="0x00000001" uid ="0x000000d7"></feature>
+<feature name="BtSap" statusflags="0x00000001" uid ="0x000000de"></feature>
+<feature name="AtHandler" statusflags="0x00000001" uid ="0x000000df"></feature>
+<feature name="BtTestMode" statusflags="0x00000001" uid ="0x000000e0"></feature>
+<feature name="PushWhiteList" statusflags="0x00000001" uid ="0x000000e3"></feature>
+<feature name="OmaProv" statusflags="0x00000001" uid ="0x000000e4"></feature>
+<feature name="FfContactsRemoteLookup" statusflags="0x00000001" uid ="0x000000ea"></feature>
+<feature name="FfAdditionalFonts" statusflags="0x00000001" uid ="0x000000f1"></feature>
+<feature name="MMS" statusflags="0x00000001" uid ="0x000000f4"></feature>
+<feature name="FfDeviceEncryptionFeature" statusflags="0x00000001" uid ="0x000000fa"></feature>
+<feature name="ffContactsMycard" statusflags="0x00000001" uid ="0x0000010b"></feature>
+<feature name="FfContactsMerge" statusflags="0x00000001" uid ="0x0000010c"></feature>
+<feature name="S60MtpController" statusflags="0x00000001" uid ="0x00000110"></feature>
+<feature name="FfContactsSocial" statusflags="0x00000001" uid ="0x00000111"></feature>
+<feature name="FfContactsCompanyNames" statusflags="0x00000001" uid="0x000000ec"></feature>
+<feature name="MpegAacEncoding" statusflags="0x00000001" uid ="0x0000011a"></feature>
+<feature name="UseAmrNbCMMFCodec" statusflags="0x00000001" uid ="0x0000011c"></feature>
+<feature name="UseAmrWbCMMFCodec" statusflags="0x00000001" uid ="0x0000011d"></feature>
+<feature name="UseAacCMMFCodec" statusflags="0x00000001" uid ="0x0000011e"></feature>
+<feature name="UseMp3CMMFCodec" statusflags="0x00000001" uid ="0x0000011f"></feature>
+<feature name="UseQcelpCMMFCodec" statusflags="0x00000001" uid ="0x00000120"></feature>
+<feature name="IncludeAmrNbCMMFCodec" statusflags="0x00000001" uid ="0x00000121"></feature>
+<feature name="SimPhonebookMatch" statusflags="0x00000001" uid ="0x00000124"></feature>
+<feature name="CommonTsy" statusflags="0x00000001" uid ="0x00000125"></feature>
+<feature name="CommonDsy" statusflags="0x00000001" uid ="0x00000129"></feature>
+<feature name="CommonVoip" statusflags="0x00000001" uid ="0x0000012a"></feature>
+<feature name="EnableIsiCommunicationInUsbChargingMode" statusflags="0x00000001" uid ="0x00000135"></feature>
+<feature name="QwertyInput" statusflags="0x00000001" uid ="0x00000199"></feature>
+<feature name="PenSupport" statusflags="0x00000001" uid ="0x0000019a"></feature>
+<feature name="IncludeAmrWbCMMFCodec" statusflags="0x00000001" uid ="0x000001eb"></feature>
+<feature name="IncludeAacCMMFCodec" statusflags="0x00000001" uid ="0x000001ec"></feature>
+<feature name="IncludeMp3CMMFCodec" statusflags="0x00000001" uid ="0x000001ed"></feature>
+<feature name="IncludeQcelpCMMFCodec" statusflags="0x00000001" uid ="0x000001ee"></feature>
+<feature name="Id3V2Metadata" statusflags="0x00000001" uid ="0x000001ef"></feature>
+<feature name="MmfDrmUtility" statusflags="0x00000001" uid ="0x000001f0"></feature>
+<feature name="AudioEffectsApi" statusflags="0x00000001" uid ="0x000001f1"></feature>
+<feature name="AudioResourceIndications" statusflags="0x00000001" uid ="0x000001f3"></feature>
+<feature name="MmCommsEngine" statusflags="0x00000001" uid ="0x000001f5"></feature>
+<feature name="Wma" statusflags="0x00000001" uid ="0x000001f7"></feature>
+<feature name="MmCommsAvController" statusflags="0x00000001" uid ="0x000001f9"></feature>
+<feature name="SupportedFeature1" statusflags="0x00000001" uid ="0x000003e8"></feature>
+<feature name="SupportedFeature2" statusflags="0x00000001" uid ="0x000003ea"></feature>
+<feature name="AvkonELaf" statusflags="0x00000001" uid ="0x000003f2"></feature>
+<feature name="Midi" statusflags="0x00000001" uid ="0x000003f3"></feature>
+<feature name="Help" statusflags="0x00000001" uid ="0x000003f4"></feature>
+<feature name="LunarCalendar" statusflags="0x00000001" uid ="0x000003f9"></feature>
+<feature name="PhoneCnap" statusflags="0x00000001" uid ="0x00000407"></feature>
+<feature name="PhoneTty" statusflags="0x00000001" uid ="0x00000408"></feature>
+<feature name="RealPlayer" statusflags="0x00000001" uid ="0x00000410"></feature>
+<feature name="SettingsProtection" statusflags="0x00000001" uid ="0x0000041a"></feature>
+<feature name="PushSL" statusflags="0x00000001" uid ="0x0000041e"></feature>
+<feature name="DynamicProfiles" statusflags="0x00000001" uid ="0x00000420"></feature>
+<feature name="ExtendedStartup" statusflags="0x00000001" uid ="0x00000421"></feature>
+<feature name="OperatorMenu" statusflags="0x00000001" uid ="0x00000422"></feature>
+<feature name="MultipleProvCtx" statusflags="0x00000001" uid ="0x00000423"></feature>
+<feature name="BrowserNarrowScreen" statusflags="0x00000001" uid ="0x00000424"></feature>
+<feature name="AudioAac" statusflags="0x00000001" uid ="0x00000426"></feature>
+<feature name="AudioPlaylist" statusflags="0x00000001" uid ="0x00000427"></feature>
+<feature name="BrowserProgressInd" statusflags="0x00000001" uid ="0x00000428"></feature>
+<feature name="BrowserFullScr" statusflags="0x00000001" uid ="0x0000042a"></feature>
+<feature name="BrowserFrames" statusflags="0x00000001" uid ="0x0000042d"></feature>
+<feature name="OperatorCache" statusflags="0x00000001" uid ="0x0000042f"></feature>
+<feature name="SmilEditor" statusflags="0x00000001" uid ="0x00000431"></feature>
+<feature name="SeamlessLinks" statusflags="0x00000001" uid ="0x00000432"></feature>
+<feature name="ShowPanics" statusflags="0x00000001" uid ="0x00000433"></feature>
+<feature name="MmcHotswap" statusflags="0x00000001" uid ="0x00000434"></feature>
+<feature name="AlwaysOnLine" statusflags="0x00000001" uid ="0x00000436"></feature>
+<feature name="HttpDigestAuth" statusflags="0x00000001" uid ="0x0000043c"></feature>
+<feature name="SendFileInCall" statusflags="0x00000001" uid ="0x0000043f"></feature>
+<feature name="IPv6" statusflags="0x00000001" uid ="0x00000440"></feature>
+<feature name="CellBroadcast" statusflags="0x00000001" uid ="0x00000442"></feature>
+<feature name="USSD" statusflags="0x00000001" uid ="0x00000443"></feature>
+<feature name="RV9" statusflags="0x00000001" uid ="0x00000446"></feature>
+<feature name="WorldClock" statusflags="0x00000001" uid ="0x0000044a"></feature>
+<feature name="BrowserFileUpload" statusflags="0x00000001" uid ="0x0000044b"></feature>
+<feature name="AlwaysOnLineEmail" statusflags="0x00000001" uid ="0x0000044d"></feature>
+<feature name="BrowserNetscapeAPI" statusflags="0x00000001" uid ="0x0000044f"></feature>
+<feature name="ConnMonUI" statusflags="0x00000001" uid ="0x00000451"></feature>
+<feature name="SmartmsgSMSBookmarkReceiving" statusflags="0x00000001" uid ="0x00000452"></feature>
+<feature name="SmartmsgSMSOperatorLogoReceiving" statusflags="0x00000001" uid ="0x00000456"></feature>
+<feature name="SmartmsgSMSRingingToneReceiving" statusflags="0x00000001" uid ="0x00000457"></feature>
+<feature name="SmartmsgSMSGmsMessageReceiving" statusflags="0x00000001" uid ="0x00000458"></feature>
+<feature name="SmartmsgSMSVcalReceiving" statusflags="0x00000001" uid ="0x0000045a"></feature>
+<feature name="SmartmsgSMSVcardReceiving" statusflags="0x00000001" uid ="0x0000045b"></feature>
+<feature name="SmartmsgSMSVcalSending" statusflags="0x00000001" uid ="0x0000045c"></feature>
+<feature name="SmartmsgSMSVcardSending" statusflags="0x00000001" uid ="0x0000045d"></feature>
+<feature name="EnPolicyDos" statusflags="0x00000001" uid ="0x0000045e"></feature>
+<feature name="BrowserAudioPlugin" statusflags="0x00000001" uid ="0x00000462"></feature>
+<feature name="Layout240_320" statusflags="0x00000001" uid ="0x00000465"></feature>
+<feature name="Layout320_240" statusflags="0x00000001" uid ="0x00000466"></feature>
+<feature name="ScalableIcons" statusflags="0x00000001" uid ="0x00000469"></feature>
+<feature name="Jsr135Support" statusflags="0x00000001" uid ="0x0000046a"></feature>
+<feature name="SvgtViewer" statusflags="0x00000001" uid ="0x00000473"></feature>
+<feature name="UsbDeviceLock" statusflags="0x00000001" uid ="0x00000474"></feature>
+<feature name="AacEncoderPlugin" statusflags="0x00000001" uid ="0x00000475"></feature>
+<feature name="AacPlusDecoderPlugin" statusflags="0x00000001" uid ="0x00000477"></feature>
+<feature name="FlashLiteViewer" statusflags="0x00000001" uid ="0x00000479"></feature>
+<feature name="FlashLiteBrowserPlugin" statusflags="0x00000001" uid ="0x0000047a"></feature>
+<feature name="AccessoryFw" statusflags="0x00000001" uid ="0x0000047e"></feature>
+<feature name="EmailUi" statusflags="0x00000001" uid ="0x00000582"></feature>
+<feature name="InstallerSisx" statusflags="0x00000001" uid ="0x00000583"></feature>
+<feature name="JavaMIDP20" statusflags="0x00000001" uid ="0x00000585"></feature>
+<feature name="SyncMlDsOverHttp" statusflags="0x00000001" uid ="0x00000586"></feature>
+<feature name="JavaJsr205Wma20Support" statusflags="0x00000001" uid ="0x00000587"></feature>
+<feature name="JavaJsr2343DAudioAndMusicCapabilities" statusflags="0x00000001" uid ="0x00000588"></feature>
+<feature name="JavaJsr2262DSvgAPI" statusflags="0x00000001" uid ="0x0000058a"></feature>
+<feature name="JavaJsr177SecurityAndTrustServices" statusflags="0x00000001" uid ="0x0000058b"></feature>
+<feature name="Equalizer" statusflags="0x00000001" uid ="0x000005de"></feature>
+<feature name="CallImagetext" statusflags="0x00000001" uid ="0x000005df"></feature>
+<feature name="ContentDownload" statusflags="0x00000001" uid ="0x000005e0"></feature>
+<feature name="3DMenu" statusflags="0x00000001" uid ="0x000005e7"></feature>
+<feature name="BasicLocationInfoDisplay" statusflags="0x00000001" uid ="0x000005e9"></feature>
+<feature name="SyncMlDsAiwProvider" statusflags="0x00000001" uid ="0x000005ec"></feature>
+<feature name="JapaneseLargerDictionary" statusflags="0x00000001" uid ="0x000005ed"></feature>
+<feature name="IncludeEaacplusCmmfcodec" statusflags="0x00000001" uid ="0x000005f1"></feature>
+<feature name="UseEaacplusCmmfCodec" statusflags="0x00000001" uid ="0x000005f2"></feature>
+<feature name="Xdm" statusflags="0x00000001" uid ="0x000005f3"></feature>
+<feature name="XdmXcap" statusflags="0x00000001" uid ="0x000005f4"></feature>
+<feature name="XdmLocalStorage" statusflags="0x00000001" uid ="0x000005f5"></feature>
+<feature name="UpnpStack" statusflags="0x00000001" uid ="0x000005f8"></feature>
+<feature name="UsbPictbridge" statusflags="0x00000001" uid ="0x000005fb"></feature>
+<feature name="UpnpAvcp" statusflags="0x00000001" uid ="0x000005fd"></feature>
+<feature name="UsbMultiPersonality" statusflags="0x00000001" uid ="0x000005fe"></feature>
+<feature name="S60FmRadioApplication" statusflags="0x00000001" uid ="0x00000603"></feature>
+<feature name="TvOut" statusflags="0x00000001" uid ="0x00000604"></feature>
+<feature name="SatCallControl" statusflags="0x00000001" uid ="0x00000605"></feature>
+<feature name="SatBip" statusflags="0x00000001" uid ="0x00000606"></feature>
+<feature name="SatDisplayText" statusflags="0x00000001" uid ="0x00000607"></feature>
+<feature name="SatGetInkey" statusflags="0x00000001" uid ="0x00000608"></feature>
+<feature name="SatGetInput" statusflags="0x00000001" uid ="0x00000609"></feature>
+<feature name="SatLanguageNotification" statusflags="0x00000001" uid ="0x0000060a"></feature>
+<feature name="SatLaunchBrowser" statusflags="0x00000001" uid ="0x0000060b"></feature>
+<feature name="SatMoSmControl" statusflags="0x00000001" uid ="0x0000060c"></feature>
+<feature name="SatPlayTone" statusflags="0x00000001" uid ="0x0000060d"></feature>
+<feature name="SatProvideLocalInfo" statusflags="0x00000001" uid ="0x0000060e"></feature>
+<feature name="SatRefresh" statusflags="0x00000001" uid ="0x0000060f"></feature>
+<feature name="SatSelectItem" statusflags="0x00000001" uid ="0x00000610"></feature>
+<feature name="SatSendDtfm" statusflags="0x00000001" uid ="0x00000611"></feature>
+<feature name="SatSendSm" statusflags="0x00000001" uid ="0x00000612"></feature>
+<feature name="SatSendSs" statusflags="0x00000001" uid ="0x00000613"></feature>
+<feature name="SatSendUssd" statusflags="0x00000001" uid ="0x00000614"></feature>
+<feature name="SatSetupCall" statusflags="0x00000001" uid ="0x00000615"></feature>
+<feature name="SatSetUpEventList" statusflags="0x00000001" uid ="0x00000616"></feature>
+<feature name="SatSetUpIdleModeText" statusflags="0x00000001" uid ="0x00000617"></feature>
+<feature name="SatSetUpMenu" statusflags="0x00000001" uid ="0x00000618"></feature>
+<feature name="AudioMessaging" statusflags="0x00000001" uid ="0x0000061d"></feature>
+<feature name="AvcDecoder" statusflags="0x00000001" uid ="0x0000061f"></feature>
+<feature name="AvcEncoder" statusflags="0x00000001" uid ="0x00000620"></feature>
+<feature name="SapEmbeddedLinkAdapter" statusflags="0x00000001" uid ="0x00000621"></feature>
+<feature name="SapIdleSoftkeyAdapter" statusflags="0x00000001" uid ="0x00000622"></feature>
+<feature name="SapOperatorLogoAdapter" statusflags="0x00000001" uid ="0x00000623"></feature>
+<feature name="SapScreensaverAdapter" statusflags="0x00000001" uid ="0x00000624"></feature>
+<feature name="SapStartupAdapter" statusflags="0x00000001" uid ="0x00000625"></feature>
+<feature name="SapThemesAdapter" statusflags="0x00000001" uid ="0x00000626"></feature>
+<feature name="SapWallpaperAdapter" statusflags="0x00000001" uid ="0x00000627"></feature>
+<feature name="SapApplicationManagement" statusflags="0x00000001" uid ="0x00000628"></feature>
+<feature name="SapTerminalControlFw" statusflags="0x00000001" uid ="0x00000629"></feature>
+<feature name="SapPolicyManagement" statusflags="0x00000001" uid ="0x0000062a"></feature>
+<feature name="SapUiSettingServer" statusflags="0x00000001" uid ="0x0000062b"></feature>
+<feature name="BtStereoAudio" statusflags="0x00000001" uid ="0x0000062c"></feature>
+<feature name="RemoteStorageFw" statusflags="0x00000001" uid ="0x0000062d"></feature>
+<feature name="SuplFramework" statusflags="0x00000001" uid ="0x0000062f"></feature>
+<feature name="OmaSuplPlugins" statusflags="0x00000001" uid ="0x00000630"></feature>
+<feature name="JavaJsr177SecurityAndTrustServicesApdu" statusflags="0x00000001" uid ="0x00000631"></feature>
+<feature name="JavaJsr177SecurityAndTrustServicesPki" statusflags="0x00000001" uid ="0x00000632"></feature>
+<feature name="JavaJsr177SecurityAndTrustServicesCrypto" statusflags="0x00000001" uid ="0x00000633"></feature>
+<feature name="ICalSupport" statusflags="0x00000001" uid ="0x00000634"></feature>
+<feature name="RtpStack" statusflags="0x00000001" uid ="0x00000635"></feature>
+<feature name="MeetingRequestEnabler" statusflags="0x00000001" uid ="0x00000636"></feature>
+<feature name="AudioControllerStreaming" statusflags="0x00000001" uid ="0x00000637"></feature>
+<feature name="3GpExtension" statusflags="0x00000001" uid ="0x00000638"></feature>
+<feature name="NpProxy" statusflags="0x00000001" uid ="0x0000063e"></feature>
+<feature name="SyncMlDsSms" statusflags="0x00000001" uid ="0x0000063f"></feature>
+<feature name="BticEnabled" statusflags="0x00000001" uid ="0x00000640"></feature>
+<feature name="MapAndNavigationAiwProvider" statusflags="0x00000001" uid ="0x00000642"></feature>
+<feature name="VirtualKeyboardInput" statusflags="0x00000001" uid ="0x00000643"></feature>
+<feature name="HandwritingRecognitionInput" statusflags="0x00000001" uid ="0x00000644"></feature>
+<feature name="OpenvgSwImplementation" statusflags="0x00000001" uid ="0x00000645"></feature>
+<feature name="BrowserVideoPlugin" statusflags="0x00000001" uid ="0x00000646"></feature>
+<feature name="CameraFullscreenViewfinder" statusflags="0x00000001" uid ="0x00000647"></feature>
+<feature name="DisplayPost" statusflags="0x00000001" uid ="0x0000064a"></feature>
+<feature name="SapDeviceLockEnhancements" statusflags="0x00000001" uid ="0x0000064b"></feature>
+<feature name="Upin" statusflags="0x00000001" uid ="0x0000064c"></feature>
+<feature name="Mediator" statusflags="0x00000001" uid ="0x0000064e"></feature>
+<feature name="Layout240_320_LargeScreen" statusflags="0x00000001" uid ="0x00000655"></feature>
+<feature name="Layout320_240_LargeScreen" statusflags="0x00000001" uid ="0x00000656"></feature>
+<feature name="Layout320_480_Touch" statusflags="0x00000001" uid ="0x0000065b"></feature>
+<feature name="Layout480_320_Touch" statusflags="0x00000001" uid ="0x0000065c"></feature>
+<feature name="ArmAvc" statusflags="0x00000001" uid ="0x0000065e"></feature>
+<feature name="UiZoom" statusflags="0x00000001" uid ="0x0000065f"></feature>
+<feature name="OmaEmailNotifications" statusflags="0x00000001" uid ="0x00000661"></feature>
+<feature name="VideoMenu" statusflags="0x00000001" uid ="0x00000662"></feature>
+<feature name="SipSimplePresenceProtocol" statusflags="0x00000001" uid ="0x00000663"></feature>
+<feature name="PresenceFramework" statusflags="0x00000001" uid ="0x00000665"></feature>
+<feature name="UiTransitionEffects" statusflags="0x00000001" uid ="0x00000666"></feature>
+<feature name="BeatnikAudioengine" statusflags="0x00000001" uid ="0x00000668"></feature>
+<feature name="RealPlayerAsDefault" statusflags="0x00000001" uid ="0x00000669"></feature>
+<feature name="ArmMdfH264Dec" statusflags="0x00000001" uid ="0x0000066a"></feature>
+<feature name="ArmMdfRealvideoDec" statusflags="0x00000001" uid ="0x0000066b"></feature>
+<feature name="ArmMdfH263mpeg4Dec" statusflags="0x00000001" uid ="0x0000066c"></feature>
+<feature name="ArmMdfPostprocessor" statusflags="0x00000001" uid ="0x0000066d"></feature>
+<feature name="ThaiCalendar" statusflags="0x00000001" uid ="0x0000066e"></feature>
+<feature name="SvgtScreensaverPlugin" statusflags="0x00000001" uid ="0x0000066f"></feature>
+<feature name="GeneralSearchFramework" statusflags="0x00000001" uid ="0x00000670"></feature>
+<feature name="GeneralSearchUi" statusflags="0x00000001" uid ="0x00000671"></feature>
+<feature name="ChatNG" statusflags="0x00000001" uid ="0x00000672"></feature>
+<feature name="MobileActiveSync" statusflags="0x00000001" uid ="0x00000673"></feature>
+<feature name="RemoteLock" statusflags="0x00000001" uid ="0x00000674"></feature>
+<feature name="WindowsMedia" statusflags="0x00000001" uid ="0x00000675"></feature>
+<feature name="WindowsMediaDrm" statusflags="0x00000001" uid ="0x00000676"></feature>
+<feature name="MultimediaSharing" statusflags="0x00000001" uid ="0x00000678"></feature>
+<feature name="BrandingServer" statusflags="0x00000001" uid ="0x00000679"></feature>
+<feature name="PenSupportCalibration" statusflags="0x00000001" uid ="0x0000067a"></feature>
+<feature name="PlugAndPlayMobileServices" statusflags="0x00000001" uid ="0x0000067b"></feature>
+<feature name="DialupNetworking" statusflags="0x00000001" uid ="0x0000067c"></feature>
+<feature name="UpnpMediaserver" statusflags="0x00000001" uid ="0x0000067d"></feature>
+<feature name="MrtSdkLibraries" statusflags="0x00000001" uid ="0x0000067f"></feature>
+<feature name="JavaESWT" statusflags="0x00000001" uid ="0x00000680"></feature>
+<feature name="HwrmTargetModifierPlugin" statusflags="0x00000001" uid ="0x00000681"></feature>
+<feature name="HsxpaSupport" statusflags="0x00000001" uid ="0x00000682"></feature>
+<feature name="JavaApiEnhancementsIap" statusflags="0x00000001" uid ="0x00000683"></feature>
+<feature name="JavaApiEnhancementsMobinfo" statusflags="0x00000001" uid ="0x00000684"></feature>
+<feature name="VfpHwSupport" statusflags="0x00000001" uid ="0x00000685"></feature>
+<feature name="MmcLock" statusflags="0x00000001" uid ="0x00000687"></feature>
+<feature name="EditKey" statusflags="0x00000001" uid ="0x00000688"></feature>
+<feature name="SlideshowScreensaver" statusflags="0x00000001" uid ="0x0000068c"></feature>
+<feature name="SyncMlDmOta" statusflags="0x00000001" uid ="0x0000068f"></feature>
+<feature name="SyncMlIsync" statusflags="0x00000001" uid ="0x00000690"></feature>
+<feature name="ImageViewer" statusflags="0x00000001" uid ="0x00000692"></feature>
+<feature name="MmcEject" statusflags="0x00000001" uid ="0x00000693"></feature>
+<feature name="OmaImps12" statusflags="0x00000001" uid ="0x00000694"></feature>
+<feature name="BtPbap" statusflags="0x00000001" uid ="0x00000696"></feature>
+<feature name="Java" statusflags="0x00000001" uid ="0x00000697"></feature>
+<feature name="UsbRemotePersonality" statusflags="0x00000001" uid ="0x0000069a"></feature>
+<feature name="WebWidgets" statusflags="0x00000001" uid ="0x0000069b"></feature>
+<feature name="XspExtensionManager" statusflags="0x00000001" uid ="0x0000069c"></feature>
+<feature name="IndicRomContent" statusflags="0x00000001" uid ="0x0000069e"></feature>
+<feature name="OnScreenDialer" statusflags="0x00000001" uid ="0x000006a0"></feature>
+<feature name="MediaTransferProtocol" statusflags="0x00000001" uid ="0x000006a1"></feature>
+<feature name="AllowUpgradeHelix" statusflags="0x00000001" uid ="0x000006a3"></feature>
+<feature name="Layout640_360_Touch" statusflags="0x00000001" uid ="0x000006a4"></feature>
+<feature name="Layout360_640_Touch" statusflags="0x00000001" uid ="0x000006a5"></feature>
+<feature name="LocationCentre" statusflags="0x00000001" uid ="0x000006a6"></feature>
+<feature name="AsynchFileSaveQueue" statusflags="0x00000001" uid ="0x000006a7"></feature>
+<feature name="SyncMlDsBookmark" statusflags="0x00000001" uid ="0x000006aa"></feature>
+<feature name="PowerSave" statusflags="0x00000001" uid ="0x000006ad"></feature>
+<feature name="TouchCallHandling" statusflags="0x00000001" uid ="0x000006b3"></feature>
+<feature name="TactileFeedback" statusflags="0x00000001" uid ="0x000006b6"></feature>
+<feature name="AutoRedialForVideoCall" statusflags="0x00000001" uid ="0x000006bb"></feature>
+<feature name="BrowserProgressiveDownload" statusflags="0x00000001" uid ="0x000006bc"></feature>
+<feature name="ProductIncludesHomeScreenEasyDialing" statusflags="0x00000001" uid ="0x000013dd"></feature>
+<feature name="HlpClearKey" statusflags="0x00000001" uid ="0x00002af8"></feature>
+<feature name="HlpMsk" statusflags="0x00000001" uid ="0x00002afb"></feature>
</featureset>
<defaultfeaturerange higheruid="0x10281805" loweruid="0x10279806"></defaultfeaturerange>
Binary file sbsv1_os/e32toolp/binutils/make.exe has changed
Binary file sbsv1_os/e32toolp/binutils/scpp.exe has changed
--- a/sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl Wed Jun 23 19:29:20 2010 +0300
+++ b/sbsv1_os/e32toolp/genutil/conv_khronos_openvg_hdr_to_cpp.pl Tue Jul 13 16:41:02 2010 +0100
@@ -62,11 +62,12 @@
{
@lines = <INFILE>;
my $s = "";
- foreach (@lines) {
+ foreach my $line (@lines) {
# Find function prototype lines
- if (/^VG[U]?_API_CALL/ || length($s) != 0) {
- $s = $s.$_;
- if (/;/) {
+ if ($line =~ /^VG[U]?_API_CALL/ || length($s) != 0) {
+ $line =~ s/^VG[U]?_API_CALL/EXPORT_C/;
+ $s = $s.$line;
+ if ($line =~ /;/) {
# Convert the function prototype into a stub function definition
$s =~ s/\;$/ { }/;
# Record the stub functions. There will be a stub implementation
--- a/sbsv1_os/e32toolp/genutil/listzip.pl Wed Jun 23 19:29:20 2010 +0300
+++ b/sbsv1_os/e32toolp/genutil/listzip.pl Tue Jul 13 16:41:02 2010 +0100
@@ -32,6 +32,9 @@
_print_err_and_die("$prefix is not a directory.") unless -d $prefix;
_print_err_and_die("$zipf doesn't exist.") unless -f $zipf;
+ $prefix =~ s/\/\//\//g; # SBS provides "Q://", so reduce the doubling
+ $prefix =~ s/\/$//; # remove trailing /, if any
+
my @raw_data = qx/unzip -l $zipf/;
for (@raw_data)
--- a/sbsv1_os/e32toolp/group/bld.inf Wed Jun 23 19:29:20 2010 +0300
+++ b/sbsv1_os/e32toolp/group/bld.inf Tue Jul 13 16:41:02 2010 +0100
@@ -47,8 +47,6 @@
../../../toolsandutils/buildsystem/extension/application-protocols/buildstubsis.mk /epoc32/tools/makefile_templates/application-protocols/buildstubsis.mk
../../../toolsandutils/buildsystem/extension/base/bootstrap.meta /epoc32/tools/makefile_templates/base/bootstrap.meta
../../../toolsandutils/buildsystem/extension/base/bootstrap.mk /epoc32/tools/makefile_templates/base/bootstrap.mk
-../../../toolsandutils/buildsystem/extension/base/bootstrap.flm /epoc32/tools/makefile_templates/base/bootstrap.flm
-../../../toolsandutils/buildsystem/extension/base/bootstrap.xml /epoc32/tools/makefile_templates/base/bootstrap.xml
../../../toolsandutils/buildsystem/extension/base/config.meta /epoc32/tools/makefile_templates/base/config.meta
../../../toolsandutils/buildsystem/extension/base/config.mk /epoc32/tools/makefile_templates/base/config.mk
../../../toolsandutils/buildsystem/extension/base/copy_default.meta /epoc32/tools/makefile_templates/base/copy_default.meta
--- a/sbsv1_os/e32toolp/group/setupprj.bat Wed Jun 23 19:29:20 2010 +0300
+++ b/sbsv1_os/e32toolp/group/setupprj.bat Tue Jul 13 16:41:02 2010 +0100
@@ -117,18 +117,21 @@
closedir CONFIGDIR;
-opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
-my @Docs = map lc $_, readdir SUBDIR;
-@Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+my @Docs;
+if (-d "..\\Docs") {
+ opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
+ @Docs = map lc $_, readdir SUBDIR;
+ @Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+ closedir SUBDIR;
+}
-closedir SUBDIR;
open TEMPLATEFILESUBDIR, "\"dir \/s \/b \/a-d ..\\..\\..\\toolsandutils\\buildsystem\\extension\" |";
my @TemplateFiles=();
my %TemplateDirs;
while (<TEMPLATEFILESUBDIR>)
{
- next if ($_ !~ /\.(mk|meta)$/i);
+ next if ($_ !~ /\.(mk|meta|flm|xml)$/i);
$_ =~ s/^.*\\buildsystem\\extension\\//i;
chomp $_;
push @TemplateFiles, $_;
@@ -241,6 +244,16 @@
);
}
+if (scalar @Docs) {
+ &Output(
+ "$DocsPath :\n",
+ "\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n",
+ "\n"
+ );
+} else {
+ $DocsPath = ""; # suppresses $DocsPath as a dependency in the main rules
+}
+
&Output(
"$ShellFilePath :\n",
"\t\@perl -w ..\\genutil\\emkdir.pl $ShellFilePath\n",
@@ -248,9 +261,6 @@
"$EPOCToolsConfigFilePath :\n",
"\t\@perl -w ..\\genutil\\emkdir.pl $EPOCToolsConfigFilePath\n",
"\n",
- "$DocsPath :\n",
- "\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n",
- "\n",
"\n",
"deb : $EPOCToolsPath $EPOCToolsConfigFilePath $DocsPath $TemplateFilePath $ShellFilePath "
);
--- a/sbsv1_os/e32toolp/makmake/makmake.pl Wed Jun 23 19:29:20 2010 +0300
+++ b/sbsv1_os/e32toolp/makmake/makmake.pl Tue Jul 13 16:41:02 2010 +0100
@@ -457,7 +457,7 @@
@reusedHash = featurevariantmap->CheckOldVmapFile($vmap, \%FeatureVariantInfo);
}
}
- if(defined(@reusedHash))
+ if(@reusedHash)
{
$FeatureVariantInfo{$bld."_LABEL"} = $reusedHash[0];
$FeatureVariantInfo{$bld."_FEATURES"} = $reusedHash[1];
@@ -558,7 +558,7 @@
$variant_info = &Path_Chop($E32env::Data{BldPath}).$Path{BldInfPath}."\\FeatureVariantInfo\\".$Plat{Real}."\\".$Plat{Real}.".".$FeatureVariantInfo{NAME}.".info" if ! -e $MMPFILE;
# modified by SV end: makefile improvement
my $variant_key = "VARIANT_PLAT_NAME_".&Path_Split('Base', $MMPFILE);
- $variant_info_new = $variant_info.".tmp";
+ my $variant_info_new = $variant_info.".tmp";
open VARIANTINFOR_NEW, ">$variant_info_new" or die "ERROR: Can't open or create file \"$variant_info_new\"\n";
# Open the variant infor file
--- a/toolsandutils/buildsystem/extension/base/bootstrap.flm Wed Jun 23 19:29:20 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-# Copyright (c) 2009-2010 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:
-#
-
-ifeq ($($(NAME)_$(PLATFORM_PATH)_bootstrap_flm),)
-$(NAME)_$(PLATFORM_PATH)_bootstrap_flm := 1
-
-E32PATH := $(EXTENSION_ROOT)/$(E32PATH)
-SOURCES := $(foreach S,$(SOURCES),$(addprefix $(EXTENSION_ROOT)/,$(S)))
-INCLUDES2:=$(addprefix $(EXTENSION_ROOT)/,$(INCLUDES))
-EXTRA_INC_PATH := $(foreach S,$(EXTRA_INC_PATH),$(addprefix $(EXTENSION_ROOT)/,$(S)))
-GENINCLUDES_HEADERS := $(foreach H,$(GENINCLUDES_HEADERS),$(addprefix $(EXTENSION_ROOT)/,$(H)))
-
-ifndef LINKBASE
-LINKBASE := 0x00000000
-endif
-
-UNIQ:=$(E32PATH)$(PLATFORM_PATH)$(NAME)$(MEMMODEL)$(SOURCES)$(ASM_MACROS)
-UNIQ:=$(word 1,$(shell echo $(UNIQ) | $(GNUMD5SUM)))
-
-# Make the output build directory name unique, starting with NAME of the binary being built
-EPOCBLDABS := $(EPOCBLD)/$(NAME)_$(UNIQ)
-
-EPOCINC := $(EPOCROOT)/epoc32/include
-EPOCKERNINC := $(EPOCINC)/kernel
-EPOCCPUINC := $(EPOCKERNINC)/$(CPU)
-EPOCTRG := $(EPOCROOT)/epoc32/release/$(PLATFORM_PATH)
-TRG := $(EPOCTRG)/$(NAME).bin
-TEMPTRG := $(EPOCBLDABS)/$(NAME).bin
-ASMINCPATH :=
-ASM_MACROS :=
-CLEANTARGETS :=
-
-CLEANTARGETS := $(CLEANTARGETS) $(TRG) $(TEMPTRG) $(join $(basename $(TRG)),.sym)
-
-ifneq ($(EXTRA_INC_PATH),)
-ASMINCPATH := $(EXTRA_INC_PATH)
-endif
-
-ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC) $(EXTRA_EPOC32_INC_PATH) $(E32PATH)/eka/include/kernel/$(CPU)
-
-ifeq ($(MEMMODEL),)
-$(error MEMMODEL parameter not specified)
-endif
-
-# Convert MEMMODEL parameter to lower case
-MEMMODEL := $(shell echo $(MEMMODEL) | tr A-Z a-z)
-
-ifeq ($(MEMMODEL),direct)
-CFG_MM := CFG_MMDirect
-HEADERS_MM :=
-endif
-ifeq ($(MEMMODEL),flexible)
-CFG_MM := CFG_MMFlexible
-HEADERS_MM := $(E32PATH)/eka/include/memmodel/epoc/flexible/$(CPU)/mmboot.h
-endif
-ifeq ($(MEMMODEL),moving)
-CFG_MM := CFG_MMMoving
-HEADERS_MM := $(E32PATH)/eka/include/memmodel/epoc/moving/$(CPU)/mmboot.h
-endif
-ifeq ($(MEMMODEL),multiple)
-CFG_MM := CFG_MMMultiple
-HEADERS_MM := $(E32PATH)/eka/include/memmodel/epoc/multiple/$(CPU)/mmboot.h
-endif
-ifndef CFG_MM
-$(error '$(MEMMODEL)' memory model unknown)
-endif
-
-ASM_MACROS := $(ASM_MACROS) $(CFG_MM)
-ifneq ($(SMP),)
-ASM_MACROS := $(ASM_MACROS) SMP
-endif
-
-ASMINCPATHCMD := $(foreach dir,$(ASMINCPATH),$(join -I ,$(dir)))
-ASM_MACROS := $(ASM_MACROS) USE_CXSF
-
-INCEXT := inc
-ASM_MACRO_CMD := $(foreach macro,$(ASM_MACROS),--predefine "$(macro) SETL {TRUE}")
-AFLAGS := -g --keep $(ASM_MACRO_CMD) $(ASMINCPATHCMD)
-LFLAGS := --ro-base $(LINKBASE) --entry $(LINKBASE) --map
-SYMOPT := --symdefs
-
-define bootstrap_asm
-$(1) : $(2) : $(3)
- $(call startrule,bootstrap_rvct_asm) \
- $(ASM) $(AFLAGS) -o $$@ --LIST $$(join $$(basename $$@),.lst) $$< \
- $(call endrule,bootstrap_rvct_asm)
-endef
-
-define bootstrap_link
-$(EPOCBLDABS)/$(NAME).in : $(LINKOBJECTS) $(LINKFILE) | $(EPOCBLDABS)
- $(call startrule,bootstrap_rvct_link) \
- $(LD) $(LFLAGS) $(SYMOPT) $$(join $$(basename $$@),.sym) -o $$@ $$(filter %.o,$$^); \
- $(GNUCP) $$@ $$(join $$(basename $(TRG)),.sym) \
- $(call endrule,bootstrap_rvct_link)
-endef
-
-define bootstrap_strip
-$(TRG) : $(EPOCBLDABS)/$(NAME).in
- $(call startrule,bootstrap_strip) \
- $(FROMELF) --bin --output $$@ $$< \
- $(call endrule,bootstrap_rvct_strip)
-endef
-
-define bootstrap_h2inc
-# How to translate the .h files to .inc
-$(1) : $(2)
- $(call startrule,bootstrap_h2inc) \
- $(PERL) $(EPOCROOT)/epoc32/tools/h2inc.pl $$< $$@ ARMASM \
- $(call endrule, bootsrap_h2inc)
-endef
-
-# Joins two lists with a 1:1 mapping, separated by a ->
-# $(call bootstrap_joinlists,a b c,d e f) returns a->d b->e c->f
-define bootstrap_joinlists
-$(join $(1),$(addprefix ->,$(2)))
-endef
-
-# Path for generic source files
-BASESRCPATH := $(E32PATH)/eka/kernel/$(CPU)
-
-# Generic source files
-BASESOURCES := $(foreach S,$(BASESOURCES_NAMES),$(addprefix $(BASESRCPATH)/,$(S)))
-
-HEADERS:= $(E32PATH)/eka/include/kernel/kernboot.h $(E32PATH)/eka/include/kernel/arm/bootdefs.h $(E32PATH)/eka/include/e32rom.h $(GENINCLUDES_HEADERS) $(HEADERS_MM)
-
-# Generated include files
-BOOTSTRAP_GENINCLUDES := $(foreach f,$(HEADERS),$(basename $(notdir $(f))).$(INCEXT))
-
-# Non-generated generic include files
-ifeq ($(BASEINCLUDES),)
-BASEINCLUDES := $(E32PATH)/eka/include/kernel/$(CPU)/bootcpu.inc $(E32PATH)/eka/include/kernel/$(CPU)/bootmacro.inc
-endif
-INCLUDES2 := $(foreach f,$(INCLUDES2),$(basename $(f)).$(INCEXT))
-
-# Generic object files
-FULLBASEOBJECTS := $(foreach src, $(BASESOURCES_NAMES), $(addprefix $(EPOCBLDABS)/,$(basename $(src)).o))
-
-# Platform specific object files
-FULLOBJECTS := $(foreach src, $(SOURCES), $(addprefix $(EPOCBLDABS)/,$(basename $(notdir $(src))).o))
-
-LINKOBJECTS := $(FULLBASEOBJECTS) $(FULLOBJECTS)
-
-# Generated include files with paths
-FULLGENINCLUDES := $(addprefix $(EPOCBLDABS)/,$(BOOTSTRAP_GENINCLUDES))
-
-CLEANTARGETS := $(CLEANTARGETS) $(FULLBASEOBJECTS) $(FULLOBJECTS) $(LINKOBJECTS) $(FULLGENINCLUDES)
-
-CLEANTARGETS := $(CLEANTARGETS) $(EPOCBLDABS)/$(NAME).in $(join $(basename $(EPOCBLDABS)/$(NAME).in),.sym)
-
-JOINED_INC := $(call bootstrap_joinlists,$(FULLGENINCLUDES),$(HEADERS))
-$(foreach J,$(JOINED_INC),$(eval $(call bootstrap_h2inc,$(word 1,$(subst ->, ,$(J))),$(word 2,$(subst ->, ,$(J))) | $(EPOCBLDABS))))
-
-# How to strip linked object to binary
-$(eval $(call bootstrap_strip,$(TRG),$(EPOCBLDABS)/$(NAME).in))
-
-LISTFILE := $(foreach f,$(FULLBASEOBJECTS),$(join $(basename $(f)),.lst)) $(foreach f,$(FULLOBJECTS),$(join $(basename $(f)),.lst))
-CLEANTARGETS := $(CLEANTARGETS) $(LISTFILE)
-
-JOINED_BASEOBJECTS := $(call bootstrap_joinlists,$(FULLBASEOBJECTS),$(BASESOURCES))
-
-$(foreach J,$(JOINED_BASEOBJECTS),$(eval $(call bootstrap_asm,$(word 1,$(subst ->, ,$(J))),$(EPOCBLDABS)/%.o,$(word 2,$(subst ->, ,$(J))) $(BASEINCLUDES) $(FULLGENINCLUDES) $(INCLUDES2) | $(EPOCBLDABS))))
-
-JOINED_OBJECTS := $(call bootstrap_joinlists,$(FULLOBJECTS),$(SOURCES))
-
-$(foreach J,$(JOINED_OBJECTS),$(eval $(call bootstrap_asm,$(word 1,$(subst ->, ,$(J))),$(EPOCBLDABS)/%.o,$(word 2,$(subst ->, ,$(J))) $(BASEINCLUDES) $(FULLGENINCLUDES) $(INCLUDES2) |$(EPOCBLDABS))))
-
-# How to link the object files
-$(eval $(bootstrap_link))
-
-# Hook into global targets
-TARGET :: $(TRG)
-
-#############################################
-
-# --what to show releasables
-$(eval $(call whatmacro,$(TRG),USERFLM))
-# create directory
-CREATABLEPATHS := $(EPOCBLDABS) $(EPOCTRG)
-$(call makepath,$(CREATABLEPATHS))
-# clean up
-$(eval $(call GenerateStandardCleanTarget,$(CLEANTARGETS),$(BUILDLOC)))
-
-endif
--- a/toolsandutils/buildsystem/extension/base/bootstrap.mk Wed Jun 23 19:29:20 2010 +0300
+++ b/toolsandutils/buildsystem/extension/base/bootstrap.mk Tue Jul 13 16:41:02 2010 +0100
@@ -77,13 +77,15 @@
ifeq "$(CPU)" "arm"
ASMINCPATH := . $(EPOCBLDABS) $(ASMINCPATH) $(EXTENSION_ROOT) $(EPOCCPUINC)
ARMASM_OUT := $(shell armasm 2>&1)
-ARMASM_OUT_4 := $(word 4,$(ARMASM_OUT))
+ARMASM_OUT_RVCT := $(wordlist 1,6,$(ARMASM_OUT))
ARMASM_OUT_6 := $(word 6,$(ARMASM_OUT))
# Use GCC toolchain if no other is available
TOOLVER := GCC
-RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_4)))
+# ARM/Thumb Macro Assembler, RVCT2.2 [Build 616]
+# ARM Assembler, RVCT4.0 [Build 529]
+RVCTSTR := $(strip $(findstring RVCT, $(ARMASM_OUT_RVCT)))
ifeq "$(RVCTSTR)" "RVCT"
TOOLVER := RVCT
OP := --
--- a/toolsandutils/buildsystem/extension/base/bootstrap.xml Wed Jun 23 19:29:20 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
-
-<!-- Extension interfaces : replacements for Template Extension Makefiles
--->
-
-<interface name="base.bootstrap" extends="Symbian.KernelFLM" flm="bootstrap.flm">
- <param name="E32PATH" />
- <param name="NAME" />
- <param name="MEMMODEL" />
- <param name="EXTRA_INC_PATH" default=''/>
- <param name="EXTRA_EPOC32_INC_PATH" default=''/>
- <param name="SOURCES" />
- <param name="INCLUDES" />
- <param name="ASM_MACROS" default='' />
- <param name="GENINCLUDES_HEADERS" default=''/>
- <param name="CPU" default='arm'/>
- <param name="SMP" default=''/>
- <param name="LINKBASE" default='0x00000000'/>
- <param name="BASESOURCES_NAMES" default="bootmain.s bootcpu.s bootutils.s"/>
- <param name="INC_PATH" default=''/>
- </interface>
-</build>
--- a/toolsandutils/buildsystem/extension/tools/compsupp.mk Wed Jun 23 19:29:20 2010 +0300
+++ b/toolsandutils/buildsystem/extension/tools/compsupp.mk Tue Jul 13 16:41:02 2010 +0100
@@ -37,7 +37,7 @@
SAVESPACE : do_nothing
RELEASABLES :
- @perl -S $(EPOCROOT)epoc32/tools/listzip.pl $(EPOCROOT)epoc32/release $(FILE)
+ @perl -S $(EPOCROOT)epoc32/tools/listzip.pl $(TODIR) $(FILE)
CLEAN : do_nothing