Mercurial Mercurial > oss > MCL > sf > mw > legacypresence / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: 201027 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 19 Aug 2010 10:19:02 +0300
branchRCL_3
changeset 16 2580314736af
parent 14 e53c01f160bc
child 17 2669f8761a99
Revision: 201027 Kit: 201033
XDMEngine/rom/XdmEngine.iby file | annotate | diff | comparison | revisions
XDMEngine/rom/XdmEngineResources.iby file | annotate | diff | comparison | revisions
XDMSettingsUI/data/XDMPluginRsc.rss file | annotate | diff | comparison | revisions
XDMSettingsUI/group/bld.inf file | annotate | diff | comparison | revisions
XDMSettingsUI/help/rom/xdmsettingsuihelps_variant.iby file | annotate | diff | comparison | revisions
XDMSettingsUI/inc/XDMExternalInterface.h file | annotate | diff | comparison | revisions
XDMSettingsUI/rom/GSXDMPlugin.iby file | annotate | diff | comparison | revisions
XDMSettingsUI/rom/GSXDMPluginResources.iby file | annotate | diff | comparison | revisions
msgconnmanager/rom/msgconnmanager.iby file | annotate | diff | comparison | revisions
presencefwsimpleadpt/rom/presencefwsimpleadpt.iby file | annotate | diff | comparison | revisions
presencesettingsui/data/psuigspluginrsc.rss file | annotate | diff | comparison | revisions
presencesettingsui/help/rom/presencesettingsuihelps_variant.iby file | annotate | diff | comparison | revisions
presencesettingsui/rom/psuigsplugin.iby file | annotate | diff | comparison | revisions
presencesettingsui/rom/psuigspluginresources.iby file | annotate | diff | comparison | revisions
presencesettingsui/src/psuigspluginsettingviewcontainer.cpp file | annotate | diff | comparison | revisions
pressrv_plat/simple_documents_api/inc/msimplecontent.h file | annotate | diff | comparison | revisions
pressrv_plat/simple_documents_api/inc/msimpledocument.h file | annotate | diff | comparison | revisions
simpleengine/rom/simpleengine.iby file | annotate | diff | comparison | revisions
simpleengine/rom/simpleengineresources.iby file | annotate | diff | comparison | revisions
xdmprotocols/rom/XdmProtocols.iby file | annotate | diff | comparison | revisions 
--- a/XDMEngine/rom/XdmEngine.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMEngine/rom/XdmEngine.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -22,9 +22,9 @@
 #define __XDMENGINE_IBY__
 
 #ifdef __XDM
-    file=ABI_DIR\BUILD_DIR\XdmEngine.dll                        SHARED_LIB_DIR\XdmEngine.dll
-    file=ABI_DIR\BUILD_DIR\XdmXmlParser.dll                     SHARED_LIB_DIR\XdmXmlParser.dll
-    file=ABI_DIR\BUILD_DIR\XdmSettingsApi.dll                   SHARED_LIB_DIR\XdmSettingsApi.dll
+    file=ABI_DIR/BUILD_DIR/XdmEngine.dll                        SHARED_LIB_DIR/XdmEngine.dll
+    file=ABI_DIR/BUILD_DIR/XdmXmlParser.dll                     SHARED_LIB_DIR/XdmXmlParser.dll
+    file=ABI_DIR/BUILD_DIR/XdmSettingsApi.dll                   SHARED_LIB_DIR/XdmSettingsApi.dll
     ECOM_PLUGIN(                                                XdmDeviceManagementAdapter.dll, 10275112.rsc) 
     ECOM_PLUGIN(                                                XdmProvisioning.dll, 1028237A.rsc) 
 #endif //__XDM
--- a/XDMEngine/rom/XdmEngineResources.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMEngine/rom/XdmEngineResources.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -23,7 +23,7 @@
 //
 // Settings provisioning adapter plugin resources
 //
-data=DATAZ_\RESOURCE_FILES_DIR\XdmProvisioningTexts.RSC RESOURCE_FILES_DIR\XdmProvisioningTexts.RSC
+data=DATAZ_/RESOURCE_FILES_DIR/XdmProvisioningTexts.RSC RESOURCE_FILES_DIR/XdmProvisioningTexts.RSC
 
 #endif //__XDMENGINE_RESOURCES_IBY__
 
--- a/XDMSettingsUI/data/XDMPluginRsc.rss	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMSettingsUI/data/XDMPluginRsc.rss	Thu Aug 19 10:19:02 2010 +0300
@@ -26,7 +26,7 @@
 #include    <avkon.rh>
 #include    <avkon.rsg>
 #include    <avkon.mbg>
-#include    <eikcore.rsg>
+#include    <EIKCORE.RSG>
 #include    <eikon.rh>
 #include    <eikon.rsg>
 #include    <avkon.loc>
--- a/XDMSettingsUI/group/bld.inf	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMSettingsUI/group/bld.inf	Thu Aug 19 10:19:02 2010 +0300
@@ -33,7 +33,7 @@
 ../rom/GSXDMPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gsxdmplugin.iby)
 ../rom/GSXDMPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gsxdmpluginresources.iby)
 // LOC
-../loc/GSXDMPlugin.loc MW_LAYER_LOC_EXPORT_PATH(gsxdmplugin.loc)
+../loc/gsxdmplugin.loc MW_LAYER_LOC_EXPORT_PATH(gsxdmplugin.loc)
 
 PRJ_EXTENSIONS
 START EXTENSION s60/mifconv
--- a/XDMSettingsUI/help/rom/xdmsettingsuihelps_variant.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMSettingsUI/help/rom/xdmsettingsuihelps_variant.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -19,10 +19,10 @@
 #define __XDMSETTINGSUIHELPS_VARIANT_IBY__
 
 #if defined(FF_S60_HELPS_IN_USE)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\contents.zip)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\index.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\keywords.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\meta.xml)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/contents.zip, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/contents.zip)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/index.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/index.xml)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/keywords.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/keywords.xml)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/meta.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/meta.xml)
 #endif
 
 #endif
\ No newline at end of file
--- a/XDMSettingsUI/inc/XDMExternalInterface.h	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMSettingsUI/inc/XDMExternalInterface.h	Thu Aug 19 10:19:02 2010 +0300
@@ -22,7 +22,7 @@
 
 #include <e32std.h>
 #include <bldvariant.hrh>
-#include <XDMPluginRsc.rsg>
+#include <xdmpluginrsc.rsg>
 #include "XDMPlugin.h"
 #define XDM_PLUGIN
 
--- a/XDMSettingsUI/rom/GSXDMPlugin.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMSettingsUI/rom/GSXDMPlugin.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -28,7 +28,7 @@
 // GS XDM Plugin UI
 ECOM_PLUGIN(GSXDMPlugin.dll,10207428.rsc) // this publishes the DLL and the 
             // resource file to the correct location
-data=DATAZ_\BITMAP_DIR\GSXDMplugin.mif BITMAP_DIR\GSXDMplugin.mif
+data=DATAZ_/BITMAP_DIR/GSXDMplugin.mif BITMAP_DIR/GSXDMplugin.mif
 
 #endif //RD_GS_RENOVATION
 
--- a/XDMSettingsUI/rom/GSXDMPluginResources.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/XDMSettingsUI/rom/GSXDMPluginResources.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -27,7 +27,7 @@
 
 // GS XDM Plugin UI
 
-data=DATAZ_\RESOURCE_FILES_DIR\XDMPluginRsc.RSC       RESOURCE_FILES_DIR\XDMPluginRsc.RSC
+data=DATAZ_/RESOURCE_FILES_DIR/XDMPluginRsc.RSC       RESOURCE_FILES_DIR/XDMPluginRsc.RSC
 
 #endif //RD_GS_RENOVATION
 
--- a/msgconnmanager/rom/msgconnmanager.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/msgconnmanager/rom/msgconnmanager.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -34,7 +34,7 @@
     #endif //__PRESENCE
 
     #ifdef __INCLUDE_CM__
-        file=ABI_DIR\BUILD_DIR\msgconnmanager.dll       SHARED_LIB_DIR\msgconnmanager.dll
+        file=ABI_DIR/BUILD_DIR/msgconnmanager.dll       SHARED_LIB_DIR/msgconnmanager.dll
     #endif //__INCLUDE_CM__
 
 #endif //__MSGCONNMANAGER_IBY__
--- a/presencefwsimpleadpt/rom/presencefwsimpleadpt.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/presencefwsimpleadpt/rom/presencefwsimpleadpt.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -30,7 +30,7 @@
 ECOM_PLUGIN( simpleplugin.dll, simpleplugin.rss )
 
 // stub SIS, provides support for SIS upgrading
-data=DATAZ_\system\install\presencefwsimpleadptstub.sis     system\install\presencefwsimpleadptstub.sis
+data=DATAZ_/system/install/presencefwsimpleadptstub.sis     system/install/presencefwsimpleadptstub.sis
 
 #endif      // __SIP_SIMPLE_PRESENCE_PROTOCOL
 #endif      // __PRESENCE_FRAMEWORK
--- a/presencesettingsui/data/psuigspluginrsc.rss	Mon Jun 21 16:06:46 2010 +0300
+++ b/presencesettingsui/data/psuigspluginrsc.rss	Thu Aug 19 10:19:02 2010 +0300
@@ -27,7 +27,7 @@
 #include    <avkon.hrh>
 #include    <avkon.rsg>
 #include    <avkon.mbg>
-#include    <eikcore.rsg>
+#include    <EIKCORE.RSG>
 #include    <eikon.rh>
 #include    <eikon.rsg>
 #include    <avkon.loc>
--- a/presencesettingsui/help/rom/presencesettingsuihelps_variant.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/presencesettingsui/help/rom/presencesettingsuihelps_variant.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -19,10 +19,10 @@
 #define __PRESENCESETTINGSUIHELPS_VARIANT_IBY__
 
 #if defined(FF_S60_HELPS_IN_USE)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\contents.zip)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\index.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\keywords.xml)
-    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\meta.xml)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/contents.zip, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/contents.zip)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/index.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/index.xml)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/keywords.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/keywords.xml)
+    data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/meta.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/meta.xml)
 #endif
 
 #endif
\ No newline at end of file
--- a/presencesettingsui/rom/psuigsplugin.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/presencesettingsui/rom/psuigsplugin.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -27,7 +27,7 @@
 #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL
 
 ECOM_PLUGIN(psuigsplugin.dll,10281ef0.rsc) 
-data=DATAZ_\BITMAP_DIR\psuigsplugin.mif BITMAP_DIR\psuigsplugin.mif
+data=DATAZ_/BITMAP_DIR/psuigsplugin.mif BITMAP_DIR/psuigsplugin.mif
 
 #endif RD_GS_RENOVATION_PHASE2
 #endif __SIP_SIMPLE_PRESENCE_PROTOCOL
--- a/presencesettingsui/rom/psuigspluginresources.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/presencesettingsui/rom/psuigspluginresources.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -26,7 +26,7 @@
 #ifdef RD_GS_RENOVATION_PHASE2
 #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL
 
-data=DATAZ_\RESOURCE_FILES_DIR\psuigspluginrsc.rsc RESOURCE_FILES_DIR\psuigspluginrsc.rsc
+data=DATAZ_/RESOURCE_FILES_DIR/psuigspluginrsc.rsc RESOURCE_FILES_DIR/psuigspluginrsc.rsc
 
 #endif RD_GS_RENOVATION_PHASE2
 #endif __SIP_SIMPLE_PRESENCE_PROTOCOL
--- a/presencesettingsui/src/psuigspluginsettingviewcontainer.cpp	Mon Jun 21 16:06:46 2010 +0300
+++ b/presencesettingsui/src/psuigspluginsettingviewcontainer.cpp	Thu Aug 19 10:19:02 2010 +0300
@@ -32,7 +32,7 @@
 #include "psuigsplugin.h"
 #include "psuigspluginids.hrh"
 #include <csxhelp/pre.hlp.hrh>
-#include <AknTextSettingPage.h>
+#include <akntextsettingpage.h>
 
 
 // ========================= MEMBER FUNCTIONS ================================
--- a/pressrv_plat/simple_documents_api/inc/msimplecontent.h	Mon Jun 21 16:06:46 2010 +0300
+++ b/pressrv_plat/simple_documents_api/inc/msimplecontent.h	Thu Aug 19 10:19:02 2010 +0300
@@ -22,7 +22,7 @@
 #define M_simplecontent_H
 
 #include <e32std.h>
-// #include <S32strm.h>
+// #include <s32strm.h>
 
 // FORWARD DECLARATION
 
--- a/pressrv_plat/simple_documents_api/inc/msimpledocument.h	Mon Jun 21 16:06:46 2010 +0300
+++ b/pressrv_plat/simple_documents_api/inc/msimpledocument.h	Thu Aug 19 10:19:02 2010 +0300
@@ -22,7 +22,7 @@
 #define M_simpledocument_H
 
 #include <e32std.h>
-#include <S32strm.h>
+#include <s32strm.h>
 #include <msimpleelement.h>
 
 // FORWARD DECLARATION
--- a/simpleengine/rom/simpleengine.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/simpleengine/rom/simpleengine.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -24,17 +24,17 @@
 
 #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL
 
-file=ABI_DIR\BUILD_DIR\simpleengine.dll         SHARED_LIB_DIR\simpleengine.dll
-file=ABI_DIR\BUILD_DIR\simplesiputils.dll       SHARED_LIB_DIR\simplesiputils.dll
-file=ABI_DIR\BUILD_DIR\simplexmlutils.dll       SHARED_LIB_DIR\simplexmlutils.dll
-file=ABI_DIR\BUILD_DIR\rlspresxdm.dll               SHARED_LIB_DIR\rlspresxdm.dll
-file=ABI_DIR\BUILD_DIR\presencesettingsapi.dll      SHARED_LIB_DIR\presencesettingsapi.dll
+file=ABI_DIR/BUILD_DIR/simpleengine.dll         SHARED_LIB_DIR/simpleengine.dll
+file=ABI_DIR/BUILD_DIR/simplesiputils.dll       SHARED_LIB_DIR/simplesiputils.dll
+file=ABI_DIR/BUILD_DIR/simplexmlutils.dll       SHARED_LIB_DIR/simplexmlutils.dll
+file=ABI_DIR/BUILD_DIR/rlspresxdm.dll               SHARED_LIB_DIR/rlspresxdm.dll
+file=ABI_DIR/BUILD_DIR/presencesettingsapi.dll      SHARED_LIB_DIR/presencesettingsapi.dll
 
 ECOM_PLUGIN(PresenceDM.dll, 10282415.rsc) 
 ECOM_PLUGIN(PresenceProvisioning.dll, 10282417.rsc)  
 
 // backup registry
-data=DATAZ_\private\10281EEB\backup_registration.xml  private\10281EEB\backup_registration.xml
+data=DATAZ_/private/10281EEB/backup_registration.xml  private/10281EEB/backup_registration.xml
 
 #endif // __SIP_SIMPLE_PRESENCE_PROTOCOL
 #endif
--- a/simpleengine/rom/simpleengineresources.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/simpleengine/rom/simpleengineresources.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -25,7 +25,7 @@
 #include <bldvariant.hrh>
 #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL
 
-data=DATAZ_\RESOURCE_FILES_DIR\PresenceProvisioningTexts.RSC       RESOURCE_FILES_DIR\PresenceProvisioningTexts.RSC
+data=DATAZ_/RESOURCE_FILES_DIR/PresenceProvisioningTexts.RSC       RESOURCE_FILES_DIR/PresenceProvisioningTexts.RSC
 
 #endif        //__SIP_SIMPLE_PRESENCE_PROTOCOL
 
--- a/xdmprotocols/rom/XdmProtocols.iby	Mon Jun 21 16:06:46 2010 +0300
+++ b/xdmprotocols/rom/XdmProtocols.iby	Thu Aug 19 10:19:02 2010 +0300
@@ -23,14 +23,14 @@
 
 #ifdef __XDM
     #ifdef __XDM_XCAP
-	      file=ABI_DIR\BUILD_DIR\XcapUtils.dll                    SHARED_LIB_DIR\XcapUtils.dll
-        file=ABI_DIR\BUILD_DIR\XcapCacheClient.dll              SHARED_LIB_DIR\XcapCacheClient.dll
-        file=ABI_DIR\BUILD_DIR\XcapCache.exe                    PROGRAMS_DIR\XcapCache.exe
-        file=ABI_DIR\BUILD_DIR\XcapHttpTransport.dll            SHARED_LIB_DIR\XcapHttpTransport.dll
+	      file=ABI_DIR/BUILD_DIR/XcapUtils.dll                    SHARED_LIB_DIR/XcapUtils.dll
+        file=ABI_DIR/BUILD_DIR/XcapCacheClient.dll              SHARED_LIB_DIR/XcapCacheClient.dll
+        file=ABI_DIR/BUILD_DIR/XcapCache.exe                    PROGRAMS_DIR/XcapCache.exe
+        file=ABI_DIR/BUILD_DIR/XcapHttpTransport.dll            SHARED_LIB_DIR/XcapHttpTransport.dll
         ECOM_PLUGIN(                                            XcapAppUsage.dll, 10207416.rsc) 
         ECOM_PLUGIN(                                            XcapOperations.dll, 10207410.rsc) 
         ECOM_PLUGIN(                                            XcapProtocol.dll, 1020740F.rsc)
-        data = DATAZ_\private\10207421\backup_registration.xml  private\10207421\backup_registration.xml
+        data = DATAZ_/private/10207421/backup_registration.xml  private/10207421/backup_registration.xml
     #endif //__XDM_XCAP
     #ifdef __XDM_LOCALSTORAGE
         ECOM_PLUGIN(                                            LocalProtocol.dll, 10207458.rsc)
MCL/sf/mw/legacypresence