--- a/telephonyserverplugins/common_tsy/group/bld.inf Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserverplugins/common_tsy/group/bld.inf Thu May 06 15:10:38 2010 +0100
@@ -1,146 +1,147 @@
-// Copyright (c) 2006-2009 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:
-//
-
-
-
-PRJ_EXPORTS
-
-#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
-//Exported headers used in the Dispatcher component
-PRJ_EXPORTS
-../commontsy/inc/tflogger.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ctsy/tflogger.h)
-#endif
-
-//
-// licenseetsy_lib
-//
-
-../licenseetsy_lib/inc/mltsyfactorybase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/mltsyfactorybase.h)
-../licenseetsy_lib/inc/mltsyfactory.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/mltsyfactory.h)
-../licenseetsy_lib/inc/mltsydispatchfactory.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/ltsy/mltsydispatchfactory.h)
-../licenseetsy_lib/def/bwins/licenseetsyu.def /epoc32/include/def/bwins/licenseetsyu.def
-../licenseetsy_lib/def/eabi/licenseetsyu.def /epoc32/include/def/eabi/licenseetsyu.def
-
-
-//
-// customapi
-//
-../customapi/inc/RMmCustomAPI.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/rmmcustomapi.h)
-
-
-//
-// commontsy
-//
-
-// name constants, needed for loading the Tsy and its modules
-../commontsy/exportinc/tsynamesapi/MmTsy_names.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/mmtsy_names.h)
-
-// error values defined by CommonTsy
-../commontsy/exportinc/serviceapi/GsmError.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/gsmerror.h)
-
-// headers for service API
-../commontsy/exportinc/serviceapi/ctsysatmessagingbase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsysatmessagingbase.h)
-../commontsy/exportinc/serviceapi/ctsydomainpskeys.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsydomainpskeys.h)
-../commontsy/exportinc/serviceapi/MmTsy_IPCdefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mmtsy_ipcdefs.h)
-../commontsy/exportinc/serviceapi/MmTsy_Defaults.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mmtsy_defaults.h)
-../commontsy/exportinc/serviceapi/cmmsmsutility.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmsmsutility.h)
-../commontsy/exportinc/serviceapi/CMmCustomVendorExt.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmcustomvendorext.h)
-../commontsy/exportinc/serviceapi/CMmUtility.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmutility.h)
-../commontsy/exportinc/serviceapi/mmgsmwcdmautils.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mmgsmwcdmautils.h)
-../commontsy/exportinc/serviceapi/cmmgsmphonestorageutility.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmgsmphonestorageutility.h)
-../commontsy/exportinc/serviceapi/ctsydomaincrkeys.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsydomaincrkeys.h)
-../commontsy/exportinc/serviceapi/mctsysatservice.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mctsysatservice.h)
-../commontsy/exportinc/serviceapi/mcustomvendorextcomplete.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mcustomvendorextcomplete.h)
-../commontsy/exportinc/serviceapi/mstktsysatservice.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mstktsysatservice.h)
-../commontsy/exportinc/serviceapi/mstktsycallorigin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mstktsycallorigin.h)
-../commontsy/exportinc/serviceapi/ctsypaniccodes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsypaniccodes.h)
-../commontsy/exportinc/serviceapi/cmmcustomsecuritytsyconstants.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmcustomsecuritytsyconstants.h)
-
-
-// headers for plugin API
-../commontsy/exportinc/pluginapi/cmmdatapackage.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/cmmdatapackage.h)
-../commontsy/exportinc/pluginapi/mmessagerouter.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mmessagerouter.h)
-../commontsy/exportinc/pluginapi/mmmessagemanagercallback.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mmmessagemanagercallback.h)
-../commontsy/exportinc/pluginapi/mtelephonyaudiocontrol.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mtelephonyaudiocontrol.h)
-../commontsy/exportinc/pluginapi/mtelephonyaudiocontrolcallback.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mtelephonyaudiocontrolcallback.h)
-
-// SSM Stub - SSM does not exist in OS v9.3
-#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../systemstateplugin/ssmadaptationstub/ssmadaptationcli.h /epoc32/include/ssm/ssmadaptationcli.h
-#endif
-#endif
-
-// Feature Manager stub - FeatMgr only exists where SYMBIAN_FEATURE_MANAGER defined
-#ifndef SYMBIAN_FEATURE_MANAGER
-../featmgrstub/inc/featmgr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featmgr.h)
-../featmgrstub/inc/featurecontrol.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featurecontrol.h)
-../featmgrstub/inc/featurecmn.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featurecmn.h)
-../featmgrstub/inc/featurenotifier.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featurenotifier.h)
-
-// Up to date feature IDs
-../featmgrstub/inc/featureuids.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featureuids.h)
-#endif
-
-// variant information. c32.exe SID is 101F7989
-../commontsy/inc/operatorVariants.ini /epoc32/data/z/private/101f7989/operatorvariants.ini
-../commontsy/inc/operatorVariants.ini /epoc32/release/winscw/udeb/z/private/101f7989/operatorvariants.ini
-../commontsy/inc/operatorVariants.ini /epoc32/release/winscw/urel/z/private/101f7989/operatorvariants.ini
-
-// ROM
-
-#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
-ctsy.iby /epoc32/rom/include/ctsy.iby
-#endif
-../systemstateplugin/group/ctsysystemstateplugin.iby /epoc32/rom/include/ctsysystemstateplugin.iby
-
-// ConfML files
-../conf/ctsy.confml OS_LAYER_EXPORTS_CONFML(ctsy.confml)
-../conf/ctsy_10282DFE.crml OS_LAYER_EXPORTS_CRML(ctsy_10282DFE.crml)
-../conf/ctsy_102029A2.crml OS_LAYER_EXPORTS_CRML(ctsy_102029A2.crml)
-../conf/ctsy_10282826.crml OS_LAYER_EXPORTS_CRML(ctsy_10282826.crml)
-../conf/ctsy_10282827.crml OS_LAYER_EXPORTS_CRML(ctsy_10282827.crml)
-
-PRJ_MMPFILES
-// SSM Stub - SSM exist only where SYMBIAN_SYSTEM_STATE_MANAGEMENT defined
-#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
-../systemstateplugin/ssmadaptationstub/ssmadaptationstub.mmp
-#endif
-
-// Feature Manager stub - FeatMgr only exists where SYMBIAN_FEATURE_MANAGER defined
-#ifndef SYMBIAN_FEATURE_MANAGER
-../featmgrstub/group/featmgrstub.mmp
-#endif
-
-../licenseetsy_lib/group/licenseetsy_lib.mmp
-../customapi/group/CustomAPI.mmp
-../commontsy/group/commontsy.mmp
-../phonetsy/group/phonetsy.mmp
-../systemstateplugin/group/ctsysystemstateplugin.mmp
-
-#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
-../commontsy/group/dispatchercommontsy.mmp // build version of commontsy that supports dispatcher
-../phonetsy/group/dispatcherphonetsy.mmp // build version of phonetsy that supports dispatcher
-#endif
-
-
-PRJ_TESTMMPFILES
-// component tests
-#include "../test/component/group/bld.inf"
-
-// integration tests
-#include "../test/integration/group/bld.inf"
-
-// End of File
+// Copyright (c) 2006-2009 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:
+//
+
+
+
+PRJ_EXPORTS
+
+#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
+//Exported headers used in the Dispatcher component
+PRJ_EXPORTS
+../commontsy/inc/tflogger.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ctsy/tflogger.h)
+#endif
+
+//
+// licenseetsy_lib
+//
+
+../licenseetsy_lib/inc/mltsyfactorybase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/mltsyfactorybase.h)
+../licenseetsy_lib/inc/mltsyfactory.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/mltsyfactory.h)
+../licenseetsy_lib/inc/mltsydispatchfactory.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/ltsy/mltsydispatchfactory.h)
+../licenseetsy_lib/def/bwins/licenseetsyu.def /epoc32/include/def/bwins/licenseetsyu.def
+../licenseetsy_lib/def/eabi/licenseetsyu.def /epoc32/include/def/eabi/licenseetsyu.def
+
+
+//
+// customapi
+//
+../customapi/inc/RMmCustomAPI.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/rmmcustomapi.h)
+
+
+//
+// commontsy
+//
+
+// name constants, needed for loading the Tsy and its modules
+../commontsy/exportinc/tsynamesapi/MmTsy_names.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/mmtsy_names.h)
+
+// error values defined by CommonTsy
+../commontsy/exportinc/serviceapi/GsmError.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/gsmerror.h)
+
+// headers for service API
+../commontsy/exportinc/serviceapi/ctsysatmessagingbase.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsysatmessagingbase.h)
+../commontsy/exportinc/serviceapi/ctsydomainpskeys.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsydomainpskeys.h)
+../commontsy/exportinc/serviceapi/MmTsy_IPCdefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mmtsy_ipcdefs.h)
+../commontsy/exportinc/serviceapi/MmTsy_Defaults.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mmtsy_defaults.h)
+../commontsy/exportinc/serviceapi/cmmsmsutility.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmsmsutility.h)
+../commontsy/exportinc/serviceapi/CMmCustomVendorExt.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmcustomvendorext.h)
+../commontsy/exportinc/serviceapi/CMmUtility.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmutility.h)
+../commontsy/exportinc/serviceapi/mmgsmwcdmautils.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mmgsmwcdmautils.h)
+../commontsy/exportinc/serviceapi/cmmgsmphonestorageutility.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmgsmphonestorageutility.h)
+../commontsy/exportinc/serviceapi/ctsydomaincrkeys.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsydomaincrkeys.h)
+../commontsy/exportinc/serviceapi/mctsysatservice.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mctsysatservice.h)
+../commontsy/exportinc/serviceapi/mcustomvendorextcomplete.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mcustomvendorextcomplete.h)
+../commontsy/exportinc/serviceapi/mstktsysatservice.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mstktsysatservice.h)
+../commontsy/exportinc/serviceapi/mstktsycallorigin.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/mstktsycallorigin.h)
+../commontsy/exportinc/serviceapi/ctsypaniccodes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/ctsypaniccodes.h)
+../commontsy/exportinc/serviceapi/cmmcustomsecuritytsyconstants.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/serviceapi/cmmcustomsecuritytsyconstants.h)
+
+
+// headers for plugin API
+../commontsy/exportinc/pluginapi/cmmdatapackage.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/cmmdatapackage.h)
+../commontsy/exportinc/pluginapi/mmessagerouter.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mmessagerouter.h)
+../commontsy/exportinc/pluginapi/mmmessagemanagercallback.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mmmessagemanagercallback.h)
+../commontsy/exportinc/pluginapi/mtelephonyaudiocontrol.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mtelephonyaudiocontrol.h)
+../commontsy/exportinc/pluginapi/mtelephonyaudiocontrolcallback.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ctsy/pluginapi/mtelephonyaudiocontrolcallback.h)
+
+// SSM Stub - SSM does not exist in OS v9.3
+#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../systemstateplugin/ssmadaptationstub/ssmadaptationcli.h /epoc32/include/ssm/ssmadaptationcli.h
+#endif
+#endif
+
+// Feature Manager stub - FeatMgr only exists where SYMBIAN_FEATURE_MANAGER defined
+#ifndef SYMBIAN_FEATURE_MANAGER
+../featmgrstub/inc/featmgr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featmgr.h)
+../featmgrstub/inc/featurecontrol.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featurecontrol.h)
+../featmgrstub/inc/featurecmn.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featurecmn.h)
+../featmgrstub/inc/featurenotifier.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featmgr/featurenotifier.h)
+
+// Up to date feature IDs
+../featmgrstub/inc/featureuids.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(featureuids.h)
+#endif
+
+// variant information. c32.exe SID is 101F7989
+../commontsy/inc/operatorVariants.ini z:/private/101f7989/operatorvariants.ini
+
+// by default load the non-dispatcher LTSY
+../phonetsy/data/ltsydata.ini z:/private/101f7989/ltsydata.ini
+
+// ROM
+
+#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
+ctsy.iby /epoc32/rom/include/ctsy.iby
+#endif
+../systemstateplugin/group/ctsysystemstateplugin.iby /epoc32/rom/include/ctsysystemstateplugin.iby
+
+// ConfML files
+../conf/ctsy.confml OS_LAYER_EXPORTS_CONFML(ctsy.confml)
+../conf/ctsy_10282DFE.crml OS_LAYER_EXPORTS_CRML(ctsy_10282DFE.crml)
+../conf/ctsy_102029A2.crml OS_LAYER_EXPORTS_CRML(ctsy_102029A2.crml)
+../conf/ctsy_10282826.crml OS_LAYER_EXPORTS_CRML(ctsy_10282826.crml)
+../conf/ctsy_10282827.crml OS_LAYER_EXPORTS_CRML(ctsy_10282827.crml)
+
+PRJ_MMPFILES
+// SSM Stub - SSM exist only where SYMBIAN_SYSTEM_STATE_MANAGEMENT defined
+#ifndef SYMBIAN_SYSTEM_STATE_MANAGEMENT
+../systemstateplugin/ssmadaptationstub/ssmadaptationstub.mmp
+#endif
+
+// Feature Manager stub - FeatMgr only exists where SYMBIAN_FEATURE_MANAGER defined
+#ifndef SYMBIAN_FEATURE_MANAGER
+../featmgrstub/group/featmgrstub.mmp
+#endif
+
+../licenseetsy_lib/group/licenseetsy_lib.mmp
+../customapi/group/CustomAPI.mmp
+../commontsy/group/commontsy.mmp
+../phonetsy/group/phonetsy.mmp
+../systemstateplugin/group/ctsysystemstateplugin.mmp
+
+#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
+../commontsy/group/dispatchercommontsy.mmp // build version of commontsy that supports dispatcher
+../phonetsy/group/dispatcherphonetsy.mmp // build version of phonetsy that supports dispatcher
+#endif
+
+
+PRJ_TESTMMPFILES
+// component tests
+#include "../test/component/group/bld.inf"
+
+// integration tests
+#include "../test/integration/group/bld.inf"
+
+// End of File