# HG changeset patch # User William Roberts # Date 1279813092 -3600 # Node ID f8ad95794a08780daebcd9e7130d64f8ee56e0c3 # Parent 1347d5cca6af144edb3158c6fea2cb772eba5b3c# Parent 61f466445ae5dd4f85c6259a3c6ea9fb4da67432 Catchup to latest Symbian^4 diff -r 61f466445ae5 -r f8ad95794a08 group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 layers.sysdef.xml diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/BMARM/alwaysonlinemanagerserveru.def diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/group/AlwaysOnlineManagerServer.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManager.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/inc/AlwaysOnlineManagerDiskSpaceObserver.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManagerDiskSpaceObserver.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/alwaysonline/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BDB/group/BIODB.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BITS/BITS.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BITSTSRC/T_BIOLOG.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BIUT/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BIUT/group/BIUT.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BIUTTSRC/T_BIOMSG.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BIUTTSRC/t_ipaddr.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BioWatchers/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BioWatchers/Test/T_NbsWatcher.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/BioWatchers/Test/T_WapWatcher.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/CBCPTSRC/T_CBCP.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/IACPTSRC/T_DB.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/biomsgfw/group/messaging_biomsg.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/deprecate/senduiservices/datautils/group/SenduiDataUtils.mmp --- a/messagingfw/deprecate/senduiservices/datautils/group/SenduiDataUtils.mmp Tue Jul 06 14:48:25 2010 +0300 +++ b/messagingfw/deprecate/senduiservices/datautils/group/SenduiDataUtils.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -55,7 +55,7 @@ LIBRARY PlatformEnv.lib #endif -#if defined( ARMCC ) +#if defined( EABI ) DEFFILE ../eabi/ #elif defined( WINSCW ) DEFFILE ../bwinscw/ diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/deprecate/senduiservices/group/Sendui.mmp --- a/messagingfw/deprecate/senduiservices/group/Sendui.mmp Tue Jul 06 14:48:25 2010 +0300 +++ b/messagingfw/deprecate/senduiservices/group/Sendui.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -48,7 +48,7 @@ -#if defined(ARMCC) +#if defined(EABI) DEFFILE ../eabi/ #elif defined( WINSCW ) DEFFILE ../bwinscw/ diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgcommonutils/group/eabiU.def diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgcommonutils/group/msgcommonutils.mmp --- a/messagingfw/msgcommonutils/group/msgcommonutils.mmp Tue Jul 06 14:48:25 2010 +0300 +++ b/messagingfw/msgcommonutils/group/msgcommonutils.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -93,7 +93,7 @@ //LIBRARY Pbk2Presentation.lib -#if defined( ARMCC ) +#if defined( EABI ) deffile ./eabi.def #else deffile ./wins.def diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgcommonutils/group/winsu.def diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgcommonutils/src/MsgVoIPExtension.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgcommonutils/src/javaprotectionresolver.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgcommonutils/src/javaprotectionresolverstub.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgconf/group/messaging_config.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgconf/group/messaging_config.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/group/messaging_framework.history.xml diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/group/messaging_framework.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/mtmbase/test/group/T_ui.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/MSVROPS.H diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/MSVROPS.INL diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/MSVSERV.H diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/inc/msvsearchsortcachemanager.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/MSVSERV.CPP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/MSVSESS.CPP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/MSVTIME.CPP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/cmsvconverterwaiter.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/diskchange.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/msvdbadapter.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/src/msvsearchsortcachemanager.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_visiblefolder_step.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/base/group/OBSEXE1.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/base/group/OBSEXE2.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/base/src/TESTSMTM.CPP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/testrom/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgsrvnstore/server/test/unit/group/t_msgs_backup.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/group/messaging_test.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/Delay/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/Delay/T_delay.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/Rom/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/Script/autotest.txt diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/SerialLog/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/SerialLog/T_seriallog.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/StayAwake/StayAwake.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/StayAwake/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/TechviewStart/Start.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/TechviewStart/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/targetautomation/TechviewStart/start.rpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/testrom/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/testutils/base/test/group/t_testutils.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtest/testutils/sms/test/group/MsgScriptsTest.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/CapUtils.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/MessagingTestServerDebug.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/messaging_testframework.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_attachment.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_base.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_email.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_nonscripted_testcase.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_sample.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_sms_mms.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestfw/group/mts_utils.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestproduct/burtestserver/group/burtestserver.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestproduct/email/imap/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestproduct/email/pop/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtestproduct/group/messaging_testproduct.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtests/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgtests/group/messaging.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgurlhandler/group/messaging_urlhandler.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/msgurlhandler/test/ui/group/TestHandler.MMP diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/muiuutils/group/muiuutils.mmp --- a/messagingfw/muiuutils/group/muiuutils.mmp Tue Jul 06 14:48:25 2010 +0300 +++ b/messagingfw/muiuutils/group/muiuutils.mmp Thu Jul 22 16:38:12 2010 +0100 @@ -34,7 +34,7 @@ LANGUAGE_IDS -#if defined(ARMCC) +#if defined(EABI) deffile ../eabi/eabi.def #elif defined( WINSCW ) deffile ../bwinscw/winscwu.def diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/scheduledsendmtm/group/messaging_schedulesend.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/scheduledsendmtm/test/unit/group/T_schsend1.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/sendas/group/messaging_sendas2.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/sendas/test/sendastextnotifier/group/sendasUInotifier.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/MiscPushMsgUtils/group/Miscpushmsgutils.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/MiscPushMsgUtils/inc/CMultipartBinIterator.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/MiscPushMsgUtils/inc/cmultiparttextiterator.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/PushMsgEntry/group/Pushmsgentry.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/SISLPushMsgUtils/group/SISLPushMsgUtils.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/examples/PushAppHandlerEx/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/examples/PushAppHandlerEx/PushAppHandlerEx.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/examples/PushAppHandlerEx/test/t_push.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/group/BLD.INF diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/group/wap-browser_wappush.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/plugins/group/Sl1_0StringDict00.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushmtm/group/pushmtmclientserver.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushmtm/test/t_pushmtm.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushutils/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushutils/group/pushutils.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushutils/inc/PushDispatcher.h diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushutils/test/t_failure.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushutils/test/t_filter.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/pushwatcher/group/pushwatcher.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/tpush/DummyStack/Dummywapstack.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/tpush/t_pushmsggen.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/watcherfw/group/messaging_watcher.mrp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/watcherfw/test/group/ecomtestwatcher.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/watcherfw/test/group/t_forever.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/watcherfw/test/group/t_watcher.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingfw/watcherfw/test/group/testwatcher.mmp diff -r 61f466445ae5 -r f8ad95794a08 messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp diff -r 61f466445ae5 -r f8ad95794a08 msgfw_plat/group/bld.inf diff -r 61f466445ae5 -r f8ad95794a08 msgfw_plat/msg_common_utils_api/inc/MsgVoIPExtension.h diff -r 61f466445ae5 -r f8ad95794a08 msgfw_pub/send_ui_api/inc/CMessageAddress.h diff -r 61f466445ae5 -r f8ad95794a08 msgfw_pub/send_ui_api/inc/CMessageData.h diff -r 61f466445ae5 -r f8ad95794a08 msgfw_pub/send_ui_api/inc/CSendingServiceInfo.h diff -r 61f466445ae5 -r f8ad95794a08 msgfw_pub/send_ui_api/tsrc/bc/inc/SendUIAPITest.h diff -r 61f466445ae5 -r f8ad95794a08 msgfw_pub/send_ui_api/tsrc/inc/SendUIAPITest.h diff -r 61f466445ae5 -r f8ad95794a08 package_definition.xml