Mercurial Mercurial > oss > FCL > sf > mw > remotemgmt / 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: 201023
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 23 Jun 2010 19:10:17 +0300
changeset 43 c8e5c3d81b42
parent 35 0deca9b72b62
child 44 39aa16f3fdc2
Revision: 201023 Kit: 2010125
omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp file | annotate | diff | comparison | revisions
omaprovisioning/provisioning/tsrc/ModuleTest/group/moduletestprovisioning.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group/TestSyncAgent.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/data_synchronization_plugin_api/tsrc/group/TestStoreFormat.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/devicemgmt_dialogs_api/group/bld.inf file | annotate | diff | comparison | revisions
remotemgmt_plat/ds_constant_definitions_api/inc/nsmldsconstants.h file | annotate | diff | comparison | revisions
remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/oma_provisioning_engine_api/tsrc/group/testengineapis.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapi.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapiexe.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_request_api/tsrc/group/TempClient.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_request_api/tsrc/group/TempServer.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_request_api/tsrc/group/TrustClient.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_request_api/tsrc/group/TrustServer.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_request_api/tsrc/group/policy_management_request_api.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/policy_management_request_api/tsrc/group/request_cntxt_api.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/setting_enforcement_info_api/tsrc/group/TestSettingEnforcementInfo.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/syncml_client_api/tsrc/group/ClientAPI.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/syncml_client_api/tsrc/group/TestHistoryLog.mmp file | annotate | diff | comparison | revisions
remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp file | annotate | diff | comparison | revisions
syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp file | annotate | diff | comparison | revisions
terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp file | annotate | diff | comparison | revisions 
--- a/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -35,33 +35,13 @@
 //TARGETPATH      ?target_path
 //DEFFILE         TestPnpUtil.def
 
-#ifdef SBSV2
-USERINCLUDE     ../inc 
 
-	#if defined(__S60_)
-	    OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-SOURCEPATH      ../src
-#else // SBSV2 not defined
 USERINCLUDE     ../inc 
 
-	#if defined(__S60_)
-OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-APP_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
-#endif // SBSV2
-APP_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
+SYSTEMINCLUDE   /epoc32/include/internal
+
 
 SOURCE          ../src/TestPnpUtil.cpp
 SOURCE          ../src/TestPnpUtilBlocks.cpp
--- a/omaprovisioning/provisioning/tsrc/ModuleTest/group/moduletestprovisioning.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/omaprovisioning/provisioning/tsrc/ModuleTest/group/moduletestprovisioning.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -52,8 +52,6 @@
 #if defined(__S60_)
 SYSTEMINCLUDE 	/epoc32/include/push
 SYSTEMINCLUDE   /epoc32/include/ecom
-#else
-SYSTEMINCLUDE   /epoc32/include 
 #endif
 
 LIBRARY         euser.lib EFSRV.LIB
--- a/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group/TestSyncAgent.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group/TestSyncAgent.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -37,11 +37,7 @@
 
 USERINCLUDE     ../inc 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group/TestStoreFormat.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group/TestStoreFormat.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -38,11 +38,7 @@
 
 USERINCLUDE     ../inc 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 START RESOURCE NSmlContactsDataStoreFormat_1_2.rss
 HEADER
--- a/remotemgmt_plat/devicemgmt_dialogs_api/group/bld.inf	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/devicemgmt_dialogs_api/group/bld.inf	Wed Jun 23 19:10:17 2010 +0300
@@ -24,4 +24,4 @@
 
 PRJ_EXPORTS
 
-../inc/devicedialogconsts.h     APP_LAYER_PLATFORM_EXPORT_PATH(devicedialogconsts.h)
+../inc/devicedialogconsts.h     MW_LAYER_PLATFORM_EXPORT_PATH(devicedialogconsts.h)
\ No newline at end of file
--- a/remotemgmt_plat/ds_constant_definitions_api/inc/nsmldsconstants.h	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/ds_constant_definitions_api/inc/nsmldsconstants.h	Wed Jun 23 19:10:17 2010 +0300
@@ -27,6 +27,6 @@
 // Hybrid
 #define KNSmlDSMaxVersionSize 10
 
-#endif __NSMLDSCONSTANTS_H__
+#endif //__NSMLDSCONSTANTS_H__
 
 //  End of File
--- a/remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -40,15 +40,8 @@
 USERINCLUDE     ../inc 
 USERINCLUDE     ../../../../inc 
 
-SYSTEMINCLUDE     /epoc32/include/app
-#if defined(__S60_)
-//    OS_LAYER_SYSTEMINCLUDE
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-//    SYSTEMINCLUDE   /epoc32/include/internal
-//    SYSTEMINCLUDE     /epoc32/include/applications    
-#endif
+APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group/testengineapis.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group/testengineapis.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -53,13 +53,9 @@
 USERINCLUDE	. ../../../../omaprovisioning/provisioning/Group ../../../../omaprovisioning/provisioning/provisioningengine/Inc
 MW_LAYER_SYSTEMINCLUDE
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-    SYSTEMINCLUDE 	/epoc32/include/push
-    SYSTEMINCLUDE   /epoc32/include/ecom
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
+SYSTEMINCLUDE 	/epoc32/include/push
+SYSTEMINCLUDE   /epoc32/include/ecom
+
 
 LIBRARY         euser.lib EFSRV.LIB
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -35,32 +35,12 @@
 //TARGETPATH      ?target_path
 //DEFFILE         TestPnpUtil.def
 
-#ifdef SBSV2
+
 USERINCLUDE     ../inc 
 
-	#if defined(__S60_)
-	    OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
 
 SOURCEPATH      ../src
-#else // SBSV2 not defined
-USERINCLUDE     ../inc 
 
-	#if defined(__S60_)
-OSEXT_LAYER_SYSTEMINCLUDE
-	#else // __S60_ not defined
-SYSTEMINCLUDE   /epoc32/include 
-SYSTEMINCLUDE   /epoc32/include/internal
-	#endif // __S60_
-
-APP_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
-
-#endif // SBSV2
-APP_LAYER_SYSTEMINCLUDE
 MW_LAYER_SYSTEMINCLUDE
 
 SOURCE          ../src/TestPnpUtil.cpp
--- a/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapi.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapi.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -41,11 +41,6 @@
 
 LANG            SC
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapiexe.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapiexe.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -36,7 +36,7 @@
 USERINCLUDE   ../inc
 
 SYSTEMINCLUDE  /epoc32/include/ecom
-SYSTEMINCLUDE  /epoc32/include
+
 APP_LAYER_SYSTEMINCLUDE
 
 LIBRARY		euser.lib
--- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TempClient.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TempClient.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -39,8 +39,7 @@
 
 
 SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include
-APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
 
 LIBRARY     euser.lib  
--- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TempServer.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TempServer.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -46,9 +46,6 @@
 
 
 SYSTEMINCLUDE  /epoc32/include/ecom
-SYSTEMINCLUDE  /epoc32/include
-APP_LAYER_SYSTEMINCLUDE
-
 MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY       euser.lib
--- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustClient.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustClient.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -39,8 +39,7 @@
 
 
 SYSTEMINCLUDE 	/epoc32/include/ecom
-SYSTEMINCLUDE 	/epoc32/include
-APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 
 
 LIBRARY     euser.lib  
--- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustServer.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustServer.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -46,8 +46,7 @@
 
 
 SYSTEMINCLUDE  /epoc32/include/ecom
-SYSTEMINCLUDE  /epoc32/include
-APP_LAYER_SYSTEMINCLUDE
+
 MW_LAYER_SYSTEMINCLUDE
 
 
--- a/remotemgmt_plat/policy_management_request_api/tsrc/group/policy_management_request_api.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/policy_management_request_api.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -46,11 +46,7 @@
 USERINCLUDE     ../inc 
 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/policy_management_request_api/tsrc/group/request_cntxt_api.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/request_cntxt_api.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -40,11 +40,7 @@
 
 LANG            SC
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -42,12 +42,6 @@
 
 LANG            SC
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
-
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
 LIBRARY         efsrv.lib 
--- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -36,8 +36,8 @@
 USERINCLUDE   ../inc
 
 SYSTEMINCLUDE  /epoc32/include/ecom
-SYSTEMINCLUDE  /epoc32/include
-APP_LAYER_SYSTEMINCLUDE
+
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY		euser.lib
 LIBRARY		ecom.lib
--- a/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -53,12 +53,6 @@
 MW_LAYER_SYSTEMINCLUDE
 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-    
-#endif
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/setting_enforcement_info_api/tsrc/group/TestSettingEnforcementInfo.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/setting_enforcement_info_api/tsrc/group/TestSettingEnforcementInfo.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -59,11 +59,6 @@
 
 USERINCLUDE     ../inc 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/syncml_client_api/tsrc/group/ClientAPI.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/syncml_client_api/tsrc/group/ClientAPI.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -44,11 +44,7 @@
 USERINCLUDE     ../inc 
 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE   /epoc32/include 
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib bafl.lib
 LIBRARY         stiftestinterface.lib
--- a/remotemgmt_plat/syncml_client_api/tsrc/group/TestHistoryLog.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/syncml_client_api/tsrc/group/TestHistoryLog.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -45,11 +45,7 @@
 USERINCLUDE ../../../../inc
 USERINCLUDE ../../../../syncmlfw/common/historylog/inc
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE   /epoc32/include 
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         estor.lib
--- a/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -49,12 +49,6 @@
 USERINCLUDE     ../../../terminalsecurity/tarmterminalcontrol/inc    // domain private headers
 MW_LAYER_SYSTEMINCLUDE
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    SYSTEMINCLUDE   /epoc32/include 
-#endif
-
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
 LIBRARY         stiftestengine.lib
--- a/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -49,7 +49,7 @@
 
 MW_LAYER_SYSTEMINCLUDE
 
-SYSTEMINCLUDE   /epoc32/include/libc /epoc32/include/ecom ../inc ../../../transport/inc
+SYSTEMINCLUDE   /epoc32/include/libc /epoc32/include/ecom 
 
 USERINCLUDE     ../inc ../../../inc ../../../transport/inc ../../../wbxml/inc ../../../wbxml/inc/syncml ../../../syncagent/inc  ../../../xml/inc
 USERINCLUDE     ../../../debug/inc
--- a/terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp	Fri Jun 11 14:27:59 2010 +0300
+++ b/terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp	Wed Jun 23 19:10:17 2010 +0300
@@ -29,9 +29,8 @@
 USERINCLUDE		../inc
 USERINCLUDE		../../SCPServer/inc
 USERINCLUDE 		../../DmEventNotifier/inc
-SYSTEMINCLUDE		/epoc32/include
 
-APP_LAYER_SYSTEMINCLUDE
+MW_LAYER_SYSTEMINCLUDE
 SOURCEPATH	  	../src
 SOURCE		  	SCPParamDB.cpp SCPParamDBController.cpp
FCL/sf/mw/remotemgmt