Mercurial Mercurial > oss > FCL > sf > os > lbs / 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: 201002 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 15 Mar 2010 12:45:55 +0200
branchRCL_3
changeset 10 af762ad247ea
parent 9 8ffb8a35ea2f
child 11 ffd33da0467c
child 12 d8287cc0d36f
Revision: 201002 Kit: 201010
datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss file | annotate | diff | comparison | revisions
datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf file | annotate | diff | comparison | revisions
datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/nla_btgpspsy.mmp file | annotate | diff | comparison | revisions
datasourcemodules/gpspositioningmodule/lbsagpspsy/group/bld.inf file | annotate | diff | comparison | revisions
datasourcemodules/gpspositioningmodule/lbsgpspsy/group/bld.inf file | annotate | diff | comparison | revisions
lbstest/lbstestproduct/lbssisinstall/group/te_lbssisinstall.mmp file | annotate | diff | comparison | revisions
lbstest/lbstestproduct/sf/core/sflbsclient/group/ctsflbsclientserver.mmp file | annotate | diff | comparison | revisions
lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml file | annotate | diff | comparison | revisions
networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/ethernetced.xml file | annotate | diff | comparison | revisions
networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/h4ethernetced.xml file | annotate | diff | comparison | revisions
networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/naviethernetced.xml file | annotate | diff | comparison | revisions
networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/winscwethernetced.xml file | annotate | diff | comparison | revisions 
--- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss	Fri Mar 12 15:50:23 2010 +0200
+++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss	Mon Mar 15 12:45:55 2010 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 #include <badef.rh>
-#include "Nla_btgpspsy.loc"
+#include <Nla_btgpspsy.loc>
 
 //  RESOURCE DEFINITIONS
 
--- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf	Fri Mar 12 15:50:23 2010 +0200
+++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf	Mon Mar 15 12:45:55 2010 +0200
@@ -23,6 +23,8 @@
 PRJ_EXPORTS
 ./101fe999.cre      z:/private/10202be9/101fe999.cre
 
+../data/Nla_btgpspsy.loc 					OS_LAYER_LOC_EXPORT_PATH(Nla_btgpspsy.loc)
+
 ../inc/Settings/BtGpsPsyPrivateCRKeys.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/btgpspsyprivatecrkeys.h)
 ../inc/Settings/BtGpsPsyPrivatePSKeys.h     SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/btgpspsyprivatepskeys.h)
 
--- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/nla_btgpspsy.mmp	Fri Mar 12 15:50:23 2010 +0200
+++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/nla_btgpspsy.mmp	Mon Mar 15 12:45:55 2010 +0200
@@ -13,7 +13,7 @@
 // Description:
 //
 
-
+#include <platform_paths.hrh>
 
 TARGET      nlabtgpspsy.dll
 TARGETTYPE  PLUGIN
@@ -22,7 +22,7 @@
 
 CAPABILITY      ALL -TCB
 
-
+OS_LAYER_SYSTEMINCLUDE
 
 START RESOURCE  ../data/101FE99A.rss
 TARGET          nlabtgpspsy.rsc
--- a/datasourcemodules/gpspositioningmodule/lbsagpspsy/group/bld.inf	Fri Mar 12 15:50:23 2010 +0200
+++ b/datasourcemodules/gpspositioningmodule/lbsagpspsy/group/bld.inf	Mon Mar 15 12:45:55 2010 +0200
@@ -24,8 +24,12 @@
 ./101fe98c.cre z:/private/10202be9/101fe98c.cre
 
 // ConfML files
-../conf/agpspositioningmodule.confml              OS_LAYER_EXPORTS_CONFML(agpspositioningmodule.confml)
-../conf/agpspositioningmodule_101fe98c.crml       OS_LAYER_EXPORTS_CRML(agpspositioningmodule_101fe98c.crml)
+//! No longer exporting these confml files as this version of the APGS PSY is only used if APE Centric is enabled.  If not
+//! another version of the PSY is used (which has the same UID), so these confml files overwrite those of the other PSY.
+//! A build time feature flag is being raised for these to only export these if APE Centric is enabled.  For now, since
+//! APE Centric is not being used, these are not exported.  Once the feature flag is raised it can be changed to use that.
+//../conf/agpspositioningmodule.confml              OS_LAYER_EXPORTS_CONFML(agpspositioningmodule.confml)
+//../conf/agpspositioningmodule_101fe98c.crml       OS_LAYER_EXPORTS_CRML(agpspositioningmodule_101fe98c.crml)
 
 PRJ_MMPFILES
 //gnumakefile createlbsagpspsyrep.mk
--- a/datasourcemodules/gpspositioningmodule/lbsgpspsy/group/bld.inf	Fri Mar 12 15:50:23 2010 +0200
+++ b/datasourcemodules/gpspositioningmodule/lbsgpspsy/group/bld.inf	Mon Mar 15 12:45:55 2010 +0200
@@ -24,8 +24,12 @@
 ./101fe98a.cre z:/private/10202be9/101fe98a.cre
 
 // ConfML files
-../conf/gpspositioningmodule.confml              OS_LAYER_EXPORTS_CONFML(gpspositioningmodule.confml)
-../conf/gpspositioningmodule_101fe98a.crml       OS_LAYER_EXPORTS_CRML(gpspositioningmodule_101fe98a.crml)
+//! No longer exporting these confml files as this version of the APGS PSY is only used if APE Centric is enabled.  If not
+//! another version of the PSY is used (which has the same UID), so these confml files overwrite those of the other PSY.
+//! A build time feature flag is being raised for these to only export these if APE Centric is enabled.  For now, since
+//! APE Centric is not being used, these are not exported.  Once the feature flag is raised it can be changed to use that.
+//../conf/gpspositioningmodule.confml              OS_LAYER_EXPORTS_CONFML(gpspositioningmodule.confml)
+//../conf/gpspositioningmodule_101fe98a.crml       OS_LAYER_EXPORTS_CRML(gpspositioningmodule_101fe98a.crml)
 
 PRJ_MMPFILES
 //gnumakefile createlbsgpspsyrep.mk
--- a/lbstest/lbstestproduct/lbssisinstall/group/te_lbssisinstall.mmp	Fri Mar 12 15:50:23 2010 +0200
+++ b/lbstest/lbstestproduct/lbssisinstall/group/te_lbssisinstall.mmp	Mon Mar 15 12:45:55 2010 +0200
@@ -36,6 +36,8 @@
 USERINCLUDE	../inc
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
 
 LIBRARY		euser.lib
 LIBRARY		efsrv.lib
--- a/lbstest/lbstestproduct/sf/core/sflbsclient/group/ctsflbsclientserver.mmp	Fri Mar 12 15:50:23 2010 +0200
+++ b/lbstest/lbstestproduct/sf/core/sflbsclient/group/ctsflbsclientserver.mmp	Mon Mar 15 12:45:55 2010 +0200
@@ -32,6 +32,8 @@
 USERINCLUDE		../../../../../../datasourcemodules/networkpositioningmodule/inc
 //USERINCLUDE		../../lbsassdata/inc
 
+MW_LAYER_SYSTEMINCLUDE_SYMBIAN
+
 // Lbs Client framework code.
 SOURCEPATH	../src
 SOURCE	ctlbsclienteventtimer.cpp
--- a/lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml	Fri Mar 12 15:50:23 2010 +0200
+++ b/lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml	Mon Mar 15 12:45:55 2010 +0200
@@ -5,7 +5,7 @@
  Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
--- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/ethernetced.xml	Fri Mar 12 15:50:23 2010 +0200
+++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/ethernetced.xml	Mon Mar 15 12:45:55 2010 +0200
@@ -3,7 +3,7 @@
  Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
--- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/h4ethernetced.xml	Fri Mar 12 15:50:23 2010 +0200
+++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/h4ethernetced.xml	Mon Mar 15 12:45:55 2010 +0200
@@ -3,7 +3,7 @@
  Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
--- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/naviethernetced.xml	Fri Mar 12 15:50:23 2010 +0200
+++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/naviethernetced.xml	Mon Mar 15 12:45:55 2010 +0200
@@ -3,7 +3,7 @@
  Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
 
--- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/winscwethernetced.xml	Fri Mar 12 15:50:23 2010 +0200
+++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/winscwethernetced.xml	Mon Mar 15 12:45:55 2010 +0200
@@ -3,7 +3,7 @@
  Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ 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".
FCL/sf/os/lbs