Mercurial Mercurial > oss > FCL > sf > app > commonemail / 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.
Adjusted to avoid exports, etc, from a top-level bld.inf RCL_3 tip
authorSimon Howkins <simonh@symbian.org>
Thu, 25 Nov 2010 12:13:04 +0000
branchRCL_3
changeset 83 31a5fbf5db1d
parent 82 28205c20df94
Adjusted to avoid exports, etc, from a top-level bld.inf
emailuis/group/bld.inf file | annotate | diff | comparison | revisions
emailuis/widget/group/bld.inf file | annotate | diff | comparison | revisions
ipsservices/conf/bld.inf file | annotate | diff | comparison | revisions
ipsservices/group/bld.inf file | annotate | diff | comparison | revisions
ipsservices/rom/bld.inf file | annotate | diff | comparison | revisions
meetingrequest/conf/bld.inf file | annotate | diff | comparison | revisions
meetingrequest/group/bld.inf file | annotate | diff | comparison | revisions
meetingrequest/rom/bld.inf file | annotate | diff | comparison | revisions 
--- a/emailuis/group/bld.inf	Mon Nov 15 10:30:54 2010 +0000
+++ b/emailuis/group/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -23,6 +23,4 @@
 #include "../emailui/group/bld.inf"
 #include "../gsemailsettings/group/bld.inf"
 #include "../uicomponents/group/bld.inf"
-#if !defined(FF_CMAIL_INTEGRATION)
 #include "../widget/group/bld.inf"
-#endif // FF_CMAIL_INTEGRATION
--- a/emailuis/widget/group/bld.inf	Mon Nov 15 10:30:54 2010 +0000
+++ b/emailuis/widget/group/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -15,6 +15,8 @@
 *
 */
 
+#if !defined(FF_CMAIL_INTEGRATION)
+
 #include <platform_paths.hrh>
 
 #include "../emailwidgetsettings/group/bld.inf"
@@ -71,5 +73,6 @@
 
 PRJ_MMPFILES
 
+#endif // FF_CMAIL_INTEGRATION
 
 // End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ipsservices/conf/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -0,0 +1,26 @@
+/*
+* 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 project ipsservices.
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+FreestyleIpsServices.confml		APP_LAYER_CONFML(freestyleipsservices.confml)
+FreestyleIpsServices_20010128.crml	APP_LAYER_CRML(freestyleipsservices_20010128.crml)
+
--- a/ipsservices/group/bld.inf	Mon Nov 15 10:30:54 2010 +0000
+++ b/ipsservices/group/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -15,33 +15,11 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 
+#include "../conf/bld.inf"
+#include "../rom/bld.inf"
 #include "../ipssossettings/group/bld.inf"
 #include "../ipssosplugin/group/bld.inf"
 #include "../ipssosaoplugin/group/bld.inf"
 
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-//<cmail>
-// per component stubs are removed and replaced by one stub under emailui.
-//../data/freestyleipsservices_stub.sis /epoc32/data/z/system/install/freestyleipsservices_stub.sis
-//../data/StubForAllIPSSosRelated.sis /epoc32/data/z/system/install/StubForAllIPSSosRelated.sis
-
-// Generic configuration interface for component cenrep settings
-../conf/FreestyleIpsServices.confml APP_LAYER_CONFML(freestyleipsservices.confml)
-// <cmail> S60 UID update
-// freestyleemailui_2001E277 implementation specifics for cenrep data
-// </cmail> S60 UID update
-../conf/FreestyleIpsServices_20010128.crml APP_LAYER_CRML(freestyleipsservices_20010128.crml)
-
-// Export macros taken into use
-../rom/FreestyleIpsServices.iby CORE_APP_LAYER_IBY_EXPORT_PATH(FreestyleIpsServices.iby)
-../rom/FreestyleIpsServicesResources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(FreestyleIpsServicesResources.iby)
-// </cmail>
-
-
-PRJ_MMPFILES
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ipsservices/rom/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -0,0 +1,26 @@
+/*
+* 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 project ipsservices.
+*
+*/
+
+#include <platform_paths.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+FreestyleIpsServices.iby		CORE_APP_LAYER_IBY_EXPORT_PATH(FreestyleIpsServices.iby)
+FreestyleIpsServicesResources.iby	LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(FreestyleIpsServicesResources.iby)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/meetingrequest/conf/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -0,0 +1,30 @@
+/*
+* 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 "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 project mrui
+*
+*/
+
+
+#include <platform_paths.hrh>
+#include <bldvariant.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+mrui.confml		APP_LAYER_CONFML(mrui.confml)
+mrui_2001E610.crml	APP_LAYER_CRML(mrui_2001E610.crml)
+mrui_2001E611.crml	APP_LAYER_CRML(mrui_2001E611.crml)				
+
+// End of file
--- a/meetingrequest/group/bld.inf	Mon Nov 15 10:30:54 2010 +0000
+++ b/meetingrequest/group/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -19,7 +19,8 @@
 #include <platform_paths.hrh>
 #include <bldvariant.hrh>
 
-// <cmail>
+#include "../conf/bld.inf"
+#include "../rom/bld.inf"
 #include "../mrcalremoteattachment/group/bld.inf"
 #include "../mrcommon/group/bld.inf"
 #include "../mrdb/group/bld.inf"
@@ -42,35 +43,5 @@
 #include "../mrbcplugin/group/bld.inf"
 #include "../mrprocessor/group/bld.inf"
 #include "../mrcmailremoteattachmentplugin/group/bld.inf"
-//</cmail>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_MMPFILES
-// <cmail> dir name changes
-// <cmail> Mifconv extension taken into use.
-// Keep the PRJ_EXTENSIONS defintions below update with the mk-files.
-// Also keep updating the mk-files to enable "going back option". 
-//gnumakefile ../mrgui/data/icons.mk
-//gnumakefile ../mrcasplugin/data/esmrcaspluginicons.mk
-// </cmail>
-
-//<cmail> Exports moved to under subsystems (due to code policy) 
-PRJ_EXPORTS
-// </cmail>
-
-// <cmail> Export macros taken into use
-../rom/mrui.iby                         CORE_APP_LAYER_IBY_EXPORT_PATH(mrui.iby)
-../rom/mruiresources.iby                LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(mruiresources.iby)
-// </cmail>
-
-// CenRep exports
-// <cmail> Cenrep exports corrected and removed platform export
-../conf/mrui.confml                   APP_LAYER_CONFML(mrui.confml)
-../conf/mrui_2001E610.crml              APP_LAYER_CRML(mrui_2001E610.crml)
-../conf/mrui_2001E611.crml              APP_LAYER_CRML(mrui_2001E611.crml)				
-//../inc/mruidomaincrkeys.h               APP_LAYER_PLATFORM_EXPORT_PATH(mruidomaincrkeys.h)
-// </cmail>
 
 // End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/meetingrequest/rom/bld.inf	Thu Nov 25 12:13:04 2010 +0000
@@ -0,0 +1,29 @@
+/*
+* 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 "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 project mrui
+*
+*/
+
+
+#include <platform_paths.hrh>
+#include <bldvariant.hrh>
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+mrui.iby		CORE_APP_LAYER_IBY_EXPORT_PATH(mrui.iby)
+mruiresources.iby	LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(mruiresources.iby)
+
+// End of file
FCL/sf/app/commonemail