# HG changeset patch # User Simon Howkins # Date 1290086815 0 # Node ID 71775bb0f6c0bcfdf04b9dd59881c31038131df8 # Parent 16db3449d7babea3e591fc90904f068b1eeec56e Adjusted to avoid exports, etc, from a top-level bld.inf diff -r 16db3449d7ba -r 71775bb0f6c0 group/bld.inf --- a/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -21,12 +21,9 @@ PRJ_PLATFORMS DEFAULT -PRJ_EXPORTS -../mpx/sis/mpxstub.sis /epoc32/data/z/system/install/mpxstub.sis - - PRJ_MMPFILES #include "../mmappfw_plat/group/bld.inf" #include "../mpx/group/bld.inf" #include "../mmappcomponents/group/bld.inf" +#include "../mpx/sis/bld.inf" diff -r 16db3449d7ba -r 71775bb0f6c0 mmappcomponents/asxparser/group/bld.inf --- a/mmappcomponents/asxparser/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mmappcomponents/asxparser/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -18,17 +18,18 @@ // Version : %version: 5.1.2 % +#ifdef __WINDOWS_MEDIA PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -#ifdef __WINDOWS_MEDIA ../sis/asxparser_stub.sis /epoc32/data/z/system/install/asxparser_stub.sis ../rom/asxparser.iby CORE_MW_LAYER_IBY_EXPORT_PATH(asxparser.iby) -#endif PRJ_MMPFILES asxparser.mmp +#endif + // End of File diff -r 16db3449d7ba -r 71775bb0f6c0 mmappcomponents/audiofetcher/group/bld.inf --- a/mmappcomponents/audiofetcher/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mmappcomponents/audiofetcher/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -15,6 +15,7 @@ * */ +#ifdef IAD_INCLUDE_AUDIOFETCHER #include @@ -56,6 +57,8 @@ audiofetcher.mmp +#endif + // End of File diff -r 16db3449d7ba -r 71775bb0f6c0 mmappcomponents/group/bld.inf --- a/mmappcomponents/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mmappcomponents/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -23,16 +23,9 @@ #include "../harvester/group/bld.inf" #include "../mmappcommonui/group/bld.inf" #include "../mediaplayersettingsengine/group/bld.inf" -#ifdef IAD_INCLUDE_AUDIOFETCHER #include "../audiofetcher/group/bld.inf" -#endif - -#ifdef __WINDOWS_MEDIA #include "../asxparser/group/bld.inf" -#endif - #include "../playbackhelper/group/bld.inf" #include "../videoplaylistutility/group/bld.inf" #include "../mmmtpdataprovider/group/bld.inf" -PRJ_EXPORTS diff -r 16db3449d7ba -r 71775bb0f6c0 mmappfw_plat/asx_parser_api/group/bld.inf --- a/mmappfw_plat/asx_parser_api/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mmappfw_plat/asx_parser_api/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -19,6 +19,7 @@ // Version : %version: 6.1.1 % +#ifdef __WINDOWS_MEDIA #include @@ -28,3 +29,5 @@ PRJ_EXPORTS ../inc/asxparser.h MW_LAYER_PLATFORM_EXPORT_PATH(asxparser.h) +#endif + diff -r 16db3449d7ba -r 71775bb0f6c0 mmappfw_plat/group/bld.inf --- a/mmappfw_plat/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mmappfw_plat/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -38,11 +38,7 @@ #include "../mpx_view_utility_api/group/bld.inf" #include "../mpx_albumart_utility_api/group/bld.inf" #include "../media_player_settings_engine_api/group/bld.inf" -#ifdef IAD_INCLUDE_BACKSTEPPING #include "../mpx_backstepping_utility_api/group/bld.inf" -#endif // IAD_INCLUDE_BACKSTEPPING -#ifdef __WINDOWS_MEDIA #include "../asx_parser_api/group/bld.inf" -#endif #include "../playback_helper_api/group/bld.inf" #include "../videoplaylist_utility_api/group/bld.inf" diff -r 16db3449d7ba -r 71775bb0f6c0 mmappfw_plat/mpx_backstepping_utility_api/group/bld.inf --- a/mmappfw_plat/mpx_backstepping_utility_api/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mmappfw_plat/mpx_backstepping_utility_api/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -16,6 +16,7 @@ * */ +#ifdef IAD_INCLUDE_BACKSTEPPING #include @@ -25,3 +26,6 @@ PRJ_EXPORTS ../inc/mpxbacksteppingutility.h MW_LAYER_PLATFORM_EXPORT_PATH(mpxbacksteppingutility.h) + +#endif // IAD_INCLUDE_BACKSTEPPING + diff -r 16db3449d7ba -r 71775bb0f6c0 mpx/Conf/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpx/Conf/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -0,0 +1,26 @@ +/* +* Copyright (c) 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 +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Build information file for MPX Framework. +* +*/ + +#include + +PRJ_EXPORTS +// Generic configuration interface for component cenrep settings +// mpx_101FFC03 implementation specifics for cenrep data +// mpx_101FFCD2 implementation specifics for cenrep data +mpx.confml MW_LAYER_CONFML(mpx.confml) +mpx_101FFC03.crml MW_LAYER_CRML(mpx_101FFC03.crml) +mpx_101FFCD2.crml MW_LAYER_CRML(mpx_101FFCD2.crml) diff -r 16db3449d7ba -r 71775bb0f6c0 mpx/group/bld.inf --- a/mpx/group/bld.inf Wed Oct 13 15:06:09 2010 +0300 +++ b/mpx/group/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -22,13 +22,6 @@ #include "../playbackframework/group/bld.inf" #include "../collectionframework/group/bld.inf" #include "../viewframework/group/bld.inf" - -PRJ_EXPORTS -../rom/mpx.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mpx.iby) +#include "../Conf/bld.inf" +#include "../rom/bld.inf" -// Generic configuration interface for component cenrep settings -// mpx_101FFC03 implementation specifics for cenrep data -// mpx_101FFCD2 implementation specifics for cenrep data -../Conf/mpx.confml MW_LAYER_CONFML(mpx.confml) -../Conf/mpx_101FFC03.crml MW_LAYER_CRML(mpx_101FFC03.crml) -../Conf/mpx_101FFCD2.crml MW_LAYER_CRML(mpx_101FFCD2.crml) diff -r 16db3449d7ba -r 71775bb0f6c0 mpx/rom/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpx/rom/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -0,0 +1,22 @@ +/* +* Copyright (c) 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 +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Build information file for MPX Framework. +* +*/ + +#include + +PRJ_EXPORTS +mpx.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mpx.iby) + diff -r 16db3449d7ba -r 71775bb0f6c0 mpx/sis/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mpx/sis/bld.inf Thu Nov 18 13:26:55 2010 +0000 @@ -0,0 +1,23 @@ +/* +* Copyright (c) 2007 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 MPX SIS +* +*/ + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS +mpxstub.sis /epoc32/data/z/system/install/mpxstub.sis +