# HG changeset patch # User Pat Downey # Date 1283339809 -3600 # Node ID e0762c15653a7f2ec67487a3d016bdb3583a3444 # Parent cdcbf344a1d3f2d1052699ea570d1372135c36bc Revert incorrect RCL_3 drop: Revision: 201012 Kit: 201035 diff -r cdcbf344a1d3 -r e0762c15653a package_definition.xml --- a/package_definition.xml Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r cdcbf344a1d3 -r e0762c15653a package_map.xml --- a/package_map.xml Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ - diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontroller/group/bld.inf --- a/upnpavcontroller/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpavcontroller/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -15,28 +15,32 @@ * */ + + + + + #include "../../group/upnpplatformvar.hrh" + PRJ_PLATFORMS PRJ_EXPORTS -// none +// ROM build +../rom/upnpavcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontroller.iby) PRJ_MMPFILES // none -// upnp xml parser -#include "../upnpxmlparser/group/bld.inf" + // upnp xml parser + #include "../upnpxmlparser/group/bld.inf" -// avcontroller server -#include "../upnpavcontrollerserver/group/bld.inf" + // avcontroller server + #include "../upnpavcontrollerserver/group/bld.inf" -// avcontroller client -#include "../upnpavcontrollerclient/group/bld.inf" + // avcontroller client + #include "../upnpavcontrollerclient/group/bld.inf" -// avcontroller helper -#include "../upnpavcontrollerhelper/group/bld.inf" + // avcontroller helper + #include "../upnpavcontrollerhelper/group/bld.inf" -// upnpavcontroller ROM -#include "../rom/bld.inf" - diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontroller/rom/bld.inf --- a/upnpavcontroller/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -/* -* Copyright (c) 2010 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: Build information file for upnpavcontroller ROM -* -*/ - - -#include "../../group/upnpplatformvar.hrh" - - -PRJ_PLATFORMS - -PRJ_EXPORTS -// ROM build -../rom/upnpavcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontroller.iby) - -PRJ_MMPFILES -// none diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h --- a/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h Wed Sep 01 12:16:49 2010 +0100 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CUpnpPathElement; diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp --- a/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -29,8 +29,8 @@ #include "upnpstring.h" -#include -#include +#include +#include #include "upnpdominterface.h" diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h --- a/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h Wed Sep 01 12:16:49 2010 +0100 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include //rsfw #include diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp --- a/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -21,7 +21,7 @@ #include "upnpmetadata.h" #include "upnpavcpenginemsclient.h" #include -#include +#include #include #include diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontrolpoint/group/bld.inf --- a/upnpavcontrolpoint/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpavcontrolpoint/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -1,9 +1,9 @@ /** @file -* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2006 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 +* which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * * Initial Contributors: @@ -22,14 +22,11 @@ //DEFAULT PRJ_EXPORTS +../rom/upnpavcontrolpoint.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontrolpoint.iby) PRJ_MMPFILES #include "../avcontrolframework/group/bld.inf" - -// UPnP Stack ROM -#include "../rom/bld.inf" - /* commented-out due to s60 distribution policy #include "../avcpengine/group/bld.inf" @@ -38,4 +35,4 @@ */ -// End of File \ No newline at end of file +// End of File \ No newline at end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpavcontrolpoint/rom/bld.inf --- a/upnpavcontrolpoint/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -/** @file -* Copyright (c) 2010 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: Build info for the UPnP Stack ROM -* -*/ - -#include - -PRJ_PLATFORMS -WINSCW ARMV5 -//DEFAULT - -PRJ_EXPORTS -../rom/upnpavcontrolpoint.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontrolpoint.iby) - - -// End of File \ No newline at end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpframework/group/bld.inf --- a/upnpframework/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpframework/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -23,16 +23,28 @@ DEFAULT PRJ_EXPORTS -// none +// ROM build +../rom/upnpframework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframework.iby) +../rom/upnpframeworkresources.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframeworkresources.iby) +// LOC files +UPNP_LOC_EXPORT(upnpframework.loc) +// IAD support +../install/20009cae.cre /epoc32/release/arm5/urel/z/private/20009cae.cre +../install/20007564.cre /epoc32/release/arm5/urel/z/private/20007564.cre +../install/upnpframework_stub.sis /epoc32/data/z/system/install/upnpframework_stub.sis +// upnpframework common headers +../inc/upnpframeworkfeatures_mmp.hrh |../../inc/upnpframeworkfeatures_mmp.hrh +../inc/upnplogging.h |../../inc/upnplogging.h +../inc/upnppanic.h |../../inc/upnppanic.h +../inc/upnplog.h |../../inc/upnplog.h PRJ_MMPFILES // none -// Build subprojects + // Build subprojects -// UpnpUtilities -#include "../upnputilities/group/bld.inf" - + // UpnpUtilities + #include "../upnputilities/group/bld.inf" #ifdef FF_UPNP_FRAMEWORK_2_0 // UPnP feature flag // UPnP (Home Media) Extension plugin interface #include "../upnpextensionpluginif/group/bld.inf" @@ -51,14 +63,12 @@ #endif // FF_UPNP_FRAMEWORK_2_0 -// UpnpMusicAdapter -#include "../upnpmusicadapter/group/bld.inf" + // UpnpMusicAdapter + #include "../upnpmusicadapter/group/bld.inf" + + // UpnpCommand + #include "../upnpcommand/group/bld.inf" -// UpnpCommand -#include "../upnpcommand/group/bld.inf" - -// Exports for upnpframework -#include "../rom/bld.inf" // End of file diff -r cdcbf344a1d3 -r e0762c15653a upnpframework/rom/bld.inf --- a/upnpframework/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* -* Copyright (c) 2006-2008 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: Exports for upnpframework -* -*/ - - -// For compatibility with S60 3.2 and IAD branch -#include "../../group/upnpplatformvar.hrh" - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// ROM build -upnpframework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframework.iby) -upnpframeworkresources.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpframeworkresources.iby) -// LOC files -UPNP_LOC_EXPORT(upnpframework.loc) -// IAD support -../install/20009cae.cre /epoc32/release/arm5/urel/z/private/20009cae.cre -../install/20007564.cre /epoc32/release/arm5/urel/z/private/20007564.cre -../install/upnpframework_stub.sis /epoc32/data/z/system/install/upnpframework_stub.sis -// upnpframework common headers -../inc/upnpframeworkfeatures_mmp.hrh |../../inc/upnpframeworkfeatures_mmp.hrh -../inc/upnplogging.h |../../inc/upnplogging.h -../inc/upnppanic.h |../../inc/upnppanic.h -../inc/upnplog.h |../../inc/upnplog.h - - -// End of file diff -r cdcbf344a1d3 -r e0762c15653a upnpharvester/group/bld.inf --- a/upnpharvester/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpharvester/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -15,12 +15,22 @@ * */ + + + + + #include "../../group/upnpplatformvar.hrh" + PRJ_PLATFORMS + DEFAULT PRJ_EXPORTS +../install/upnpharvester_stub.SIS /epoc32/data/z/system/install/upnpharvester_stub.sis +../install/10281fab.cre /epoc32/release/armv5/urel/z/private/10202be9/10281fab.cre +../rom/upnpharvester.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpharvester.iby) PRJ_MMPFILES @@ -31,9 +41,6 @@ #include "../cdssync/common/bld.inf" #include "../mdhserver/group/bld.inf" -// CM Metadata Harvester ROM -#include "../rom/bld.inf" - PRJ_TESTMMPFILES PRJ_TESTEXPORTS diff -r cdcbf344a1d3 -r e0762c15653a upnpharvester/rom/bld.inf --- a/upnpharvester/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* -* Copyright (c) 2010 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: Build information file for CM Metadata Harvester ROM -* -*/ - - - - - - -#include "../../group/upnpplatformvar.hrh" - - -PRJ_PLATFORMS - -DEFAULT - -PRJ_EXPORTS -../install/upnpharvester_stub.SIS /epoc32/data/z/system/install/upnpharvester_stub.sis -../install/10281fab.cre /epoc32/release/armv5/urel/z/private/10202be9/10281fab.cre -../rom/upnpharvester.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpharvester.iby) - -PRJ_MMPFILES - -PRJ_TESTMMPFILES - -PRJ_TESTEXPORTS - -// None - -// End of File diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h Wed Sep 01 12:16:49 2010 +0100 @@ -21,7 +21,7 @@ #define CDUTILS_H // INCLUDES -#include +#include #include diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h Wed Sep 01 12:16:49 2010 +0100 @@ -25,7 +25,7 @@ #include "upnpelementfactory.h" // new xml -#include +#include #include "upnpfiletransfer.h" #include "upnpcontentdirectorydatafinder.h" diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h Wed Sep 01 12:16:49 2010 +0100 @@ -26,7 +26,7 @@ #include #include #include -#include +#include // CLASS DECLARATION diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h Wed Sep 01 12:16:49 2010 +0100 @@ -22,8 +22,8 @@ // INCLUDES -#include -#include +#include +#include #include "upnpcontentdirectory.h" #include "upnpfiletransfer.h" #include "upnperrors.h" // Added by ClassView diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h Wed Sep 01 12:16:49 2010 +0100 @@ -26,7 +26,7 @@ #include #include #include -#include +#include // FORWARD DECLARATIONS class CUpnpObjectBean; diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h Wed Sep 01 12:16:49 2010 +0100 @@ -26,7 +26,7 @@ // INCLUDE FILES #include // CBase #include // TDriveNumber -#include +#include // FORWARD DECLARATIONS class CRepository; diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h Wed Sep 01 12:16:49 2010 +0100 @@ -24,7 +24,7 @@ #include "upnptablebean.h" #include #include -#include +#include class CUpnpObject; diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h Wed Sep 01 12:16:49 2010 +0100 @@ -19,8 +19,8 @@ // INCLUDE FILES #include -#include -#include +#include +#include //using namespace Xml; @@ -50,4 +50,4 @@ */ static HBufC8* SerializeLC(RXmlEngDocument& aDoc, TXmlEngElement& aElement ); - }; + }; \ No newline at end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "upnpattributebean.h" #include "upnpcontentdirectoryglobals.h" #include diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -27,7 +27,7 @@ #include "upnpstring.h" #include "upnpcons.h" #include -#include +#include #include // ============================ MEMBER FUNCTIONS =============================== diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "upnpelementbean.h" #include "upnpcontentdirectoryglobals.h" #include "upnpcdutils.h" diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -19,7 +19,7 @@ // INCLUDE FILES #include #include -#include +#include #include "upnpelementfactory.h" #include "upnpcontentdirectoryglobals.h" diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/group/bld.inf --- a/upnpmediaserver/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmediaserver/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -1,9 +1,9 @@ /** @file -* Copyright (c) 2005-2006 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2006 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 +* which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". * * Initial Contributors: @@ -22,6 +22,9 @@ //DEFAULT PRJ_EXPORTS +../rom/upnpmediaserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmediaserver.iby) +../conf/upnpmediaserver.confml MW_LAYER_CONFML(upnpmediaserver.confml) +../conf/upnpmediaserver_101F978F.crml MW_LAYER_CRML(upnpmediaserver_101F978F.crml) PRJ_MMPFILES @@ -30,7 +33,6 @@ #include "../connectionmanagerservice/group/bld.inf" #include "../contentdirectoryservice/group/bld.inf" #include "../mediaserverengine/group/bld.inf" -#include "../rom/bld.inf" -// End of File \ No newline at end of file +// End of File \ No newline at end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpmediaserver/rom/bld.inf --- a/upnpmediaserver/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -/** @file -* Copyright (c) 2010 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: Build info for the UPnP Stack subsystem ROM -* -*/ - -#include - -PRJ_PLATFORMS -WINSCW ARMV5 -//DEFAULT - -PRJ_EXPORTS -../rom/upnpmediaserver.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmediaserver.iby) -../conf/upnpmediaserver.confml MW_LAYER_CONFML(upnpmediaserver.confml) -../conf/upnpmediaserver_101F978F.crml MW_LAYER_CRML(upnpmediaserver_101F978F.crml) - - -// End of File \ No newline at end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpmpxplugins/group/bld.inf --- a/upnpmpxplugins/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpmpxplugins/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -15,18 +15,23 @@ * */ + + + + + #include "../../group/upnpplatformvar.hrh" PRJ_PLATFORMS PRJ_EXPORTS +// ROM build +../rom/upnpmpxplugins.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmpxplugins.iby) PRJ_MMPFILES +// none -// playback plugins -#include "../upnpplaybackplugins/group/bld.inf" - -// upnpmpxplugins ROM -#include "../rom/bld.inf" + // playback plugins + #include "../upnpplaybackplugins/group/bld.inf" // end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpmpxplugins/rom/bld.inf --- a/upnpmpxplugins/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* -* Copyright (c) 2010 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: Build information file for upnpmpxplugins ROM -* -*/ - - - - - - -#include "../../group/upnpplatformvar.hrh" - -PRJ_PLATFORMS - -PRJ_EXPORTS -// ROM build -../rom/upnpmpxplugins.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpmpxplugins.iby) - -PRJ_MMPFILES -// none -// end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpsettings/group/bld.inf --- a/upnpsettings/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpsettings/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -15,21 +15,28 @@ * */ + + + + + // For compatibility with S60 3.2 and IAD branch #include "../../group/upnpplatformvar.hrh" PRJ_PLATFORMS PRJ_EXPORTS +// ROM build +../rom/upnpsettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettings.iby) +../rom/upnpsettingsresources.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettingsresources.iby) +// LOC files +UPNP_LOC_EXPORT(upnpsettings.loc) PRJ_MMPFILES - -// settings engine -#include "../upnpsettingsengine/group/bld.inf" +// none -// Exports for upnpsettings -#include "../rom/bld.inf" - + // settings engine + #include "../upnpsettingsengine/group/bld.inf" #ifdef FF_UPNP_FRAMEWORK_2_0 // UPnP feature flag // multiselectionui #include "../multiselectionui/group/bld.inf" @@ -39,10 +46,8 @@ // Sharing ui #include "../upnpsharingui/group/bld.inf" - +#endif // FF_UPNP_FRAMEWORK_2_0 // GS plugin #include "../upnpgsplugin/group/bld.inf" -#endif // FF_UPNP_FRAMEWORK_2_0 - // end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpsettings/rom/bld.inf --- a/upnpsettings/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* -* Copyright (c) 2008 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: Exports for upnpsettings -* -*/ - - - - - - -// For compatibility with S60 3.2 and IAD branch -#include "../../group/upnpplatformvar.hrh" - -PRJ_PLATFORMS - -PRJ_EXPORTS -// ROM build -upnpsettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettings.iby) -upnpsettingsresources.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsettingsresources.iby) -// LOC files -UPNP_LOC_EXPORT(upnpsettings.loc) - -PRJ_MMPFILES -// none - -// end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp --- a/upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpsettings/upnpsettingsengine/group/upnpsettingsengine.mmp Wed Sep 01 12:16:49 2010 +0100 @@ -62,6 +62,7 @@ // Connection Manager, new APIs for getting IAPs, etc. LIBRARY cmmanager.lib +LIBRARY apengine.lib DEBUGLIBRARY flogger.lib diff -r cdcbf344a1d3 -r e0762c15653a upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp --- a/upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp Wed Sep 01 12:16:49 2010 +0100 @@ -29,6 +29,7 @@ #include //PathInfo #include +#include // CCmSettingsUi #include // RCmManager #include #include // CCommsDatabase @@ -689,6 +690,10 @@ // EXPORT_C void CUPnPSettingsEngine::CreateAccessPointL() { + CCmSettingsUi* settings = CCmSettingsUi::NewL(); + CleanupStack::PushL( settings ); + settings->RunSettingsL(); + CleanupStack::PopAndDestroy( settings ); } //--------------------------------------------------------------------------- diff -r cdcbf344a1d3 -r e0762c15653a upnpsharing/group/bld.inf --- a/upnpsharing/group/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ b/upnpsharing/group/bld.inf Wed Sep 01 12:16:49 2010 +0100 @@ -15,28 +15,36 @@ * */ + + + + + // For compatibility with S60 3.2 and IAD branch #include "../../group/upnpplatformvar.hrh" PRJ_PLATFORMS PRJ_EXPORTS +// ROM build +../rom/upnpsharing.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharing.iby) +../rom/upnpsharingresources.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharingresources.iby) +// LOC files +UPNP_LOC_EXPORT(upnpsharing.loc) PRJ_MMPFILES +// none -// The DLNA profiler -#include "../upnpdlnaprofiler/group/bld.inf" - -// upnp security -#include "../upnpsecurity/group/bld.inf" + // The DLNA profiler + #include "../upnpdlnaprofiler/group/bld.inf" -// content server and server client -#include "../upnpcontentserver/group/bld.inf" + // upnp security + #include "../upnpsecurity/group/bld.inf" -// content server API -#include "../applicationengine/group/bld.inf" + // content server and server client + #include "../upnpcontentserver/group/bld.inf" -// Exports for upnpsharing -#include "../rom/bld.inf" + // content server API + #include "../applicationengine/group/bld.inf" // end of file diff -r cdcbf344a1d3 -r e0762c15653a upnpsharing/rom/bld.inf --- a/upnpsharing/rom/bld.inf Tue Aug 31 15:29:11 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* -* Copyright (c) 2010 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: Build information file for upnpsharing ROM -* -*/ - - - - - - -// For compatibility with S60 3.2 and IAD branch -#include "../../group/upnpplatformvar.hrh" - -PRJ_PLATFORMS - -PRJ_EXPORTS -// ROM build -../rom/upnpsharing.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharing.iby) -../rom/upnpsharingresources.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpsharingresources.iby) -// LOC files -UPNP_LOC_EXPORT(upnpsharing.loc) - -PRJ_MMPFILES -// none - -// end of file