# HG changeset patch # User hgs # Date 1281088630 -10800 # Node ID 52826dcbed74a658c80d7c216e96bc3b1016dc9e # Parent b39000d0fc2eeee78ada5bcf6b98130a6e63986a 201031 diff -r b39000d0fc2e -r 52826dcbed74 package_definition.xml --- a/package_definition.xml Fri Apr 30 17:07:47 2010 +0300 +++ b/package_definition.xml Fri Aug 06 12:57:10 2010 +0300 @@ -1,213 +1,245 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r b39000d0fc2e -r 52826dcbed74 package_map.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package_map.xml Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,1 @@ + diff -r b39000d0fc2e -r 52826dcbed74 upnpavcontroller/group/bld.inf --- a/upnpavcontroller/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpavcontroller/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -15,32 +15,28 @@ * */ - - - - - #include "../../group/upnpplatformvar.hrh" - PRJ_PLATFORMS PRJ_EXPORTS -// ROM build -../rom/upnpavcontroller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(upnpavcontroller.iby) +// none 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 b39000d0fc2e -r 52826dcbed74 upnpavcontroller/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpavcontroller/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,29 @@ +/* +* 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 b39000d0fc2e -r 52826dcbed74 upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h --- a/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpavcontrolpoint/avcpengine/inc/upnppathresolver.h Fri Aug 06 12:57:10 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CUpnpPathElement; diff -r b39000d0fc2e -r 52826dcbed74 upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp --- a/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpavcontrolpoint/avcpengine/src/upnppathresolver.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -29,8 +29,8 @@ #include "upnpstring.h" -#include -#include +#include +#include #include "upnpdominterface.h" diff -r b39000d0fc2e -r 52826dcbed74 upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h --- a/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpavcontrolpoint/avcpengineclient/inc/upnpmetadata.h Fri Aug 06 12:57:10 2010 +0300 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include //rsfw #include diff -r b39000d0fc2e -r 52826dcbed74 upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp --- a/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpavcontrolpoint/avcpengineclient/src/upnpmetadata.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -21,7 +21,7 @@ #include "upnpmetadata.h" #include "upnpavcpenginemsclient.h" #include -#include +#include #include #include diff -r b39000d0fc2e -r 52826dcbed74 upnpavcontrolpoint/group/bld.inf --- a/upnpavcontrolpoint/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpavcontrolpoint/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -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,11 +22,14 @@ //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" @@ -35,4 +38,4 @@ */ -// End of File \ No newline at end of file +// End of File \ No newline at end of file diff -r b39000d0fc2e -r 52826dcbed74 upnpavcontrolpoint/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpavcontrolpoint/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,28 @@ +/** @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 b39000d0fc2e -r 52826dcbed74 upnpframework/group/bld.inf --- a/upnpframework/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpframework/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -23,28 +23,16 @@ DEFAULT PRJ_EXPORTS -// 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 +// none 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" @@ -63,12 +51,14 @@ #endif // FF_UPNP_FRAMEWORK_2_0 - // UpnpMusicAdapter - #include "../upnpmusicadapter/group/bld.inf" - - // UpnpCommand - #include "../upnpcommand/group/bld.inf" +// UpnpMusicAdapter +#include "../upnpmusicadapter/group/bld.inf" +// UpnpCommand +#include "../upnpcommand/group/bld.inf" + +// Exports for upnpframework +#include "../rom/bld.inf" // End of file diff -r b39000d0fc2e -r 52826dcbed74 upnpframework/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpframework/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,42 @@ +/* +* 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 b39000d0fc2e -r 52826dcbed74 upnpharvester/group/bld.inf --- a/upnpharvester/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpharvester/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -15,22 +15,12 @@ * */ - - - - - #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 @@ -41,6 +31,9 @@ #include "../cdssync/common/bld.inf" #include "../mdhserver/group/bld.inf" +// CM Metadata Harvester ROM +#include "../rom/bld.inf" + PRJ_TESTMMPFILES PRJ_TESTEXPORTS diff -r b39000d0fc2e -r 52826dcbed74 upnpharvester/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpharvester/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,43 @@ +/* +* 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 b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcdutils.h Fri Aug 06 12:57:10 2010 +0300 @@ -21,7 +21,7 @@ #define CDUTILS_H // INCLUDES -#include +#include #include diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectory.h Fri Aug 06 12:57:10 2010 +0300 @@ -25,7 +25,7 @@ #include "upnpelementfactory.h" // new xml -#include +#include #include "upnpfiletransfer.h" #include "upnpcontentdirectorydatafinder.h" diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpcontentdirectorydb.h Fri Aug 06 12:57:10 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include // CLASS DECLARATION diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpelementfactory.h Fri Aug 06 12:57:10 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES -#include -#include +#include +#include #include "upnpcontentdirectory.h" #include "upnpfiletransfer.h" #include "upnperrors.h" // Added by ClassView diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmetadatastorage.h Fri Aug 06 12:57:10 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include // FORWARD DECLARATIONS class CUpnpObjectBean; diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpmspathutility.h Fri Aug 06 12:57:10 2010 +0300 @@ -26,7 +26,7 @@ // INCLUDE FILES #include // CBase #include // TDriveNumber -#include +#include // FORWARD DECLARATIONS class CRepository; diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpobjectbean.h Fri Aug 06 12:57:10 2010 +0300 @@ -24,7 +24,7 @@ #include "upnptablebean.h" #include #include -#include +#include class CUpnpObject; diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h --- a/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/inc/upnpxmlcontentfilter.h Fri Aug 06 12:57:10 2010 +0300 @@ -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 b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpattributebean.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "upnpattributebean.h" #include "upnpcontentdirectoryglobals.h" #include diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpcdutils.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -27,7 +27,7 @@ #include "upnpstring.h" #include "upnpcons.h" #include -#include +#include #include // ============================ MEMBER FUNCTIONS =============================== diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectory.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpcontentdirectorydb.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementbean.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "upnpelementbean.h" #include "upnpcontentdirectoryglobals.h" #include "upnpcdutils.h" diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpelementfactory.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include #include -#include +#include #include "upnpelementfactory.h" #include "upnpcontentdirectoryglobals.h" diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp --- a/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/contentdirectoryservice/src/upnpxmlcontentfilter.cpp Fri Aug 06 12:57:10 2010 +0300 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include diff -r b39000d0fc2e -r 52826dcbed74 upnpmediaserver/group/bld.inf --- a/upnpmediaserver/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmediaserver/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -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,9 +22,6 @@ //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 @@ -33,6 +30,7 @@ #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 b39000d0fc2e -r 52826dcbed74 upnpmediaserver/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpmediaserver/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,30 @@ +/** @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 b39000d0fc2e -r 52826dcbed74 upnpmpxplugins/group/bld.inf --- a/upnpmpxplugins/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpmpxplugins/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -15,23 +15,18 @@ * */ - - - - - #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" +// playback plugins +#include "../upnpplaybackplugins/group/bld.inf" + +// upnpmpxplugins ROM +#include "../rom/bld.inf" // end of file diff -r b39000d0fc2e -r 52826dcbed74 upnpmpxplugins/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpmpxplugins/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,33 @@ +/* +* 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 b39000d0fc2e -r 52826dcbed74 upnpsettings/group/bld.inf --- a/upnpsettings/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpsettings/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -15,28 +15,21 @@ * */ - - - - - // 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 -// none + +// settings engine +#include "../upnpsettingsengine/group/bld.inf" - // settings engine - #include "../upnpsettingsengine/group/bld.inf" +// Exports for upnpsettings +#include "../rom/bld.inf" + #ifdef FF_UPNP_FRAMEWORK_2_0 // UPnP feature flag // multiselectionui #include "../multiselectionui/group/bld.inf" diff -r b39000d0fc2e -r 52826dcbed74 upnpsettings/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpsettings/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,38 @@ +/* +* 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 b39000d0fc2e -r 52826dcbed74 upnpsharing/group/bld.inf --- a/upnpsharing/group/bld.inf Fri Apr 30 17:07:47 2010 +0300 +++ b/upnpsharing/group/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -15,36 +15,28 @@ * */ - - - - - // 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" +// The DLNA profiler +#include "../upnpdlnaprofiler/group/bld.inf" + +// upnp security +#include "../upnpsecurity/group/bld.inf" - // upnp security - #include "../upnpsecurity/group/bld.inf" +// content server and server client +#include "../upnpcontentserver/group/bld.inf" - // content server and server client - #include "../upnpcontentserver/group/bld.inf" +// content server API +#include "../applicationengine/group/bld.inf" - // content server API - #include "../applicationengine/group/bld.inf" +// Exports for upnpsharing +#include "../rom/bld.inf" // end of file diff -r b39000d0fc2e -r 52826dcbed74 upnpsharing/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/upnpsharing/rom/bld.inf Fri Aug 06 12:57:10 2010 +0300 @@ -0,0 +1,38 @@ +/* +* 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