From 5ee4cebbf99d9c47680182573bd0926be433aead Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 30 Apr 2012 08:04:31 +0200 Subject: [PATCH] Bug 749548 - Only reference IE and Safari migrators in components manifest when they are installed. r=mak --- .../components/migration/src/BrowserProfileMigrators.manifest | 4 ++++ browser/components/migration/src/Makefile.in | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest index 527771f5624..d7fec75e351 100644 --- a/browser/components/migration/src/BrowserProfileMigrators.manifest +++ b/browser/components/migration/src/BrowserProfileMigrators.manifest @@ -4,7 +4,11 @@ component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26} component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386} +#ifdef HAS_IE_MIGRATOR component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4} +#endif +#ifdef HAS_SAFARI_MIGRATOR component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=safari {4b609ecf-60b2-4655-9df4-dc149e474da1} +#endif diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in index 758a04f24ce..c6fc2dccd30 100644 --- a/browser/components/migration/src/Makefile.in +++ b/browser/components/migration/src/Makefile.in @@ -60,14 +60,16 @@ CPPSRCS += nsIEHistoryEnumerator.cpp EXTRA_PP_COMPONENTS += IEProfileMigrator.js \ SafariProfileMigrator.js \ $(NULL) +DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR endif ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \ $(NULL) +DEFINES += -DHAS_SAFARI_MIGRATOR endif -EXTRA_COMPONENTS = \ +EXTRA_PP_COMPONENTS += \ BrowserProfileMigrators.manifest \ $(NULL)