# HG changeset patch # User hgs # Date 1278992806 -19800 # Node ID 7e865e817571d6026ba82787072e78f8f081912d # Parent dd41e7de33750c0c9e6a5aea78757fa444cfeaa2 201023 diff -r dd41e7de3375 -r 7e865e817571 omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp --- a/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/omaprovisioning/pnputil/tsrc/ModuleTest/group/TestPnpUtil.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 omaprovisioning/provisioning/tsrc/ModuleTest/group/moduletestprovisioning.mmp --- a/omaprovisioning/provisioning/tsrc/ModuleTest/group/moduletestprovisioning.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/omaprovisioning/provisioning/tsrc/ModuleTest/group/moduletestprovisioning.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group/TestSyncAgent.mmp --- a/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group/TestSyncAgent.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/common_agent_util_and_definitions_api/tsrc/group/TestSyncAgent.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/data_synchronization_plugin_api/tsrc/group/TestStoreFormat.mmp --- a/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group/TestStoreFormat.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/data_synchronization_plugin_api/tsrc/group/TestStoreFormat.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/devicemgmt_dialogs_api/group/bld.inf --- a/remotemgmt_plat/devicemgmt_dialogs_api/group/bld.inf Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/devicemgmt_dialogs_api/group/bld.inf Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/ds_constant_definitions_api/inc/nsmldsconstants.h --- a/remotemgmt_plat/ds_constant_definitions_api/inc/nsmldsconstants.h Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/ds_constant_definitions_api/inc/nsmldsconstants.h Tue Jul 13 09:16:46 2010 +0530 @@ -27,6 +27,6 @@ // Hybrid #define KNSmlDSMaxVersionSize 10 -#endif __NSMLDSCONSTANTS_H__ +#endif //__NSMLDSCONSTANTS_H__ // End of File diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp --- a/remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/oma_ds_extensions_api/tsrc/group/ClientAPIAdvanced.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/oma_provisioning_engine_api/tsrc/group/testengineapis.mmp --- a/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group/testengineapis.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/oma_provisioning_engine_api/tsrc/group/testengineapis.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp --- a/remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/pnpms_utils_api/tsrc/group/TestPnpUtil.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapi.mmp --- a/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapi.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapi.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -41,11 +41,6 @@ LANG SC -#if defined(__S60_) - MW_LAYER_SYSTEMINCLUDE -#else - SYSTEMINCLUDE /epoc32/include -#endif LIBRARY euser.lib LIBRARY stiftestinterface.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapiexe.mmp --- a/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapiexe.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_certificate_api/tsrc/group/dmcertapiexe.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -36,7 +36,7 @@ USERINCLUDE ../inc SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE /epoc32/include + APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_request_api/tsrc/group/TempClient.mmp --- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TempClient.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TempClient.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -39,8 +39,7 @@ SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE /epoc32/include -APP_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_request_api/tsrc/group/TempServer.mmp --- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TempServer.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TempServer.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -46,9 +46,6 @@ SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE /epoc32/include -APP_LAYER_SYSTEMINCLUDE - MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_request_api/tsrc/group/TrustClient.mmp --- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustClient.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustClient.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -39,8 +39,7 @@ SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE /epoc32/include -APP_LAYER_SYSTEMINCLUDE +MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_request_api/tsrc/group/TrustServer.mmp --- a/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustServer.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/TrustServer.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -46,8 +46,7 @@ SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE /epoc32/include -APP_LAYER_SYSTEMINCLUDE + MW_LAYER_SYSTEMINCLUDE diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_request_api/tsrc/group/policy_management_request_api.mmp --- a/remotemgmt_plat/policy_management_request_api/tsrc/group/policy_management_request_api.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/policy_management_request_api.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/policy_management_request_api/tsrc/group/request_cntxt_api.mmp --- a/remotemgmt_plat/policy_management_request_api/tsrc/group/request_cntxt_api.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/policy_management_request_api/tsrc/group/request_cntxt_api.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp --- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_server_api.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp --- a/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/scp_server_api/tsrc/group/scp_terminal_security_exe.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp --- a/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/scp_server_api/tsrc/group/testCSCPParamObject.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -53,12 +53,6 @@ MW_LAYER_SYSTEMINCLUDE -#if defined(__S60_) - MW_LAYER_SYSTEMINCLUDE -#else - SYSTEMINCLUDE /epoc32/include - -#endif LIBRARY euser.lib LIBRARY stiftestinterface.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/setting_enforcement_info_api/tsrc/group/TestSettingEnforcementInfo.mmp --- a/remotemgmt_plat/setting_enforcement_info_api/tsrc/group/TestSettingEnforcementInfo.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/setting_enforcement_info_api/tsrc/group/TestSettingEnforcementInfo.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -59,11 +59,6 @@ USERINCLUDE ../inc -#if defined(__S60_) - MW_LAYER_SYSTEMINCLUDE -#else - SYSTEMINCLUDE /epoc32/include -#endif LIBRARY euser.lib LIBRARY stiftestinterface.lib diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/syncml_client_api/tsrc/group/ClientAPI.mmp --- a/remotemgmt_plat/syncml_client_api/tsrc/group/ClientAPI.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/syncml_client_api/tsrc/group/ClientAPI.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/syncml_client_api/tsrc/group/TestHistoryLog.mmp --- a/remotemgmt_plat/syncml_client_api/tsrc/group/TestHistoryLog.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/syncml_client_api/tsrc/group/TestHistoryLog.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp --- a/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/remotemgmt_plat/terminal_security_device_lock_api/tsrc/group/TestTerminalControl.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp --- a/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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 diff -r dd41e7de3375 -r 7e865e817571 terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp --- a/terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp Tue Jul 13 09:06:02 2010 +0530 +++ b/terminalsecurity/SCP/SCPDatabase/group/SCPDatabase.mmp Tue Jul 13 09:16:46 2010 +0530 @@ -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