bug 880246: move EXTRA_PP_COMPONENTS to mozbuild (cleanup). r=mshal
authorJoey Armstrong <joey@mozilla.com>
Thu, 20 Jun 2013 15:59:59 -0400
changeset 143011 69f37f4cdd2e95e2eb7c1fe5d0448b6c834f8b82
parent 143010 0a931415540432a73be2bdf4d442b0de3b2dc804
child 143012 89f6185a271b9cce8186295f5d458cf60ed5c3a2
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs880246
milestone24.0a1
bug 880246: move EXTRA_PP_COMPONENTS to mozbuild (cleanup). r=mshal
b2g/components/Makefile.in
browser/components/Makefile.in
browser/components/feeds/src/Makefile.in
browser/components/migration/src/Makefile.in
browser/fuel/src/Makefile.in
browser/metro/components/Makefile.in
config/rules.mk
content/base/src/Makefile.in
dom/apps/src/Makefile.in
image/decoders/icon/qt/Makefile.in
js/src/config/rules.mk
mobile/android/components/Makefile.in
services/datareporting/Makefile.in
testing/marionette/components/Makefile.in
toolkit/components/passwordmgr/Makefile.in
toolkit/components/satchel/Makefile.in
toolkit/components/search/Makefile.in
toolkit/components/telemetry/Makefile.in
toolkit/components/url-classifier/Makefile.in
toolkit/mozapps/downloads/Makefile.in
toolkit/mozapps/extensions/Makefile.in
toolkit/mozapps/update/Makefile.in
xulrunner/setup/Makefile.in
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -4,39 +4,16 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-        ActivitiesGlue.js \
-        AlertsService.js \
-        B2GAboutRedirector.js \
-        B2GComponents.manifest \
-        ContentHandler.js \
-        ContentPermissionPrompt.js \
-        DirectoryProvider.js \
-        FilePicker.js \
-        MailtoProtocolHandler.js \
-        MozKeyboard.js \
-        ProcessGlobal.js \
-        PaymentGlue.js \
-        SmsProtocolHandler.js \
-        TelProtocolHandler.js \
-        YoutubeProtocolHandler.js \
-        RecoveryService.js \
-        $(NULL)
-
 EXTRA_JS_MODULES = \
 	Keyboard.jsm \
 	TelURIParser.jsm \
 	SignInToWebsite.jsm \
 	ErrorPage.jsm \
 	$(NULL)
 
-ifdef MOZ_UPDATER
-DISABLED_EXTRA_PP_COMPONENTS += UpdatePrompt.js
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -8,16 +8,11 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserComponents.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsBrowserContentHandler.js \
-  nsBrowserGlue.js \
-  $(NULL)
-
 EXTRA_JS_MODULES = distribution.js
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -18,16 +18,11 @@ DEFINES += \
 	$(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserFeeds.manifest \
 	FeedConverter.js \
 	WebContentConverter.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-	FeedWriter.js \
-	$(NULL)
-
-
 LOCAL_INCLUDES = -I$(srcdir)/../../build
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -12,38 +12,25 @@ include $(DEPTH)/config/autoconf.mk
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 DISABLED_EXTRA_COMPONENTS = \
   ProfileMigrator.js \
   FirefoxProfileMigrator.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  ChromeProfileMigrator.js \
-  $(NULL)
-
 ifeq ($(OS_ARCH),WINNT)
 DISABLED_EXTRA_COMPONENTS += IEProfileMigrator.js \
                     $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
-                       $(NULL)
-
 DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
-                       $(NULL)
 DEFINES += -DHAS_SAFARI_MIGRATOR
 endif
 
-DISABLED_EXTRA_PP_COMPONENTS += \
-	BrowserProfileMigrators.manifest \
-	$(NULL)
-
 EXTRA_PP_JS_MODULES = \
 	MigrationUtils.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/browser/fuel/src/Makefile.in
+++ b/browser/fuel/src/Makefile.in
@@ -5,11 +5,10 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = fuelApplication.manifest
-DISABLED_EXTRA_PP_COMPONENTS = fuelApplication.js
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/metro/components/Makefile.in
+++ b/browser/metro/components/Makefile.in
@@ -6,27 +6,16 @@ DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 # metro/components.manifest
-DISABLED_EXTRA_PP_COMPONENTS = \
-        components.manifest \
-        AboutRedirector.js \
-        BrowserCLH.js \
-        BrowserStartup.js \
-        DirectoryProvider.js\
-        HelperAppDialog.js \
-        Sidebar.js \
-        SessionStore.js \
-        $(NULL)
-
 EXTRA_COMPONENTS = \
         AlertsService.js \
         ContentPermissionPrompt.js \
         DownloadManagerUI.js \
         PromptService.js \
         ContentDispatchChooser.js \
         LoginManagerPrompter.js \
         $(NULL)
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -11,16 +11,17 @@ ifndef topsrcdir
 endif
 
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  EXTRA_PP_COMPONENTS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
   XPIDL_MODULE \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -29,20 +29,16 @@ FORCE_STATIC_LIB = 1
 EXTRA_COMPONENTS = \
 		contentSecurityPolicy.manifest \
 		contentAreaDropListener.js \
 		contentAreaDropListener.manifest \
 		messageWakeupService.js \
 		messageWakeupService.manifest \
 		$(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-		contentSecurityPolicy.js \
-		$(NULL)
-
 EXTRA_JS_MODULES = \
 		CSPUtils.jsm \
 		$(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@@ -10,18 +10,14 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   AppsService.js \
   AppsService.manifest \
   Webapps.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  Webapps.js \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES += \
   Webapps.jsm \
   AppsUtils.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -13,12 +13,11 @@ LIBXUL_LIBRARY	= 1
 
 
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 EXTRA_COMPONENTS = gtkqticonsconverter.manifest
-DISABLED_EXTRA_PP_COMPONENTS = gtkqticonsconverter.js
 
 include $(topsrcdir)/config/rules.mk
 
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -11,16 +11,17 @@ ifndef topsrcdir
 endif
 
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
+  EXTRA_PP_COMPONENTS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \
   PARALLEL_DIRS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \
   XPIDL_MODULE \
--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -4,26 +4,16 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-        MobileComponents.manifest \
-        AboutRedirector.js \
-        BrowserCLH.js \
-        DirectoryProvider.js\
-        HelperAppDialog.js \
-        Sidebar.js \
-        SessionStore.js \
-        $(NULL)
-
 EXTRA_COMPONENTS = \
         AlertsService.js \
         ContentPermissionPrompt.js \
         XPIDialogService.js \
         DownloadManagerUI.js \
         PromptService.js \
         ContentDispatchChooser.js \
         AddonUpdateService.js \
--- a/services/datareporting/Makefile.in
+++ b/services/datareporting/Makefile.in
@@ -15,17 +15,11 @@ PP_TARGETS += MODULES
 
 TESTING_JS_MODULES := $(addprefix modules-testing/,mocks.jsm)
 TESTING_JS_MODULE_DIR := services/datareporting
 
 EXTRA_COMPONENTS := \
   DataReporting.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS := \
-  DataReportingService.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 $(FINAL_TARGET)/components/DataReportingService.js: policy.jsm sessions.jsm ../common/observers.js
-
-
--- a/testing/marionette/components/Makefile.in
+++ b/testing/marionette/components/Makefile.in
@@ -8,14 +8,9 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-    MarionetteComponents.manifest \
-    marionettecomponent.js \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -13,17 +13,13 @@ DISABLED_EXTRA_COMPONENTS = \
   crypto-SDR.js \
   nsLoginInfo.js \
   nsLoginManager.js \
   nsLoginManagerPrompter.js \
   passwordmgr.manifest \
   storage-Legacy.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  storage-mozStorage.js \
-  $(NULL)
-
 EXTRA_JS_MODULES = \
   LoginManagerContent.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -20,20 +20,16 @@ LOCAL_INCLUDES = \
 
 DISABLED_EXTRA_COMPONENTS = \
   nsFormAutoComplete.js \
   FormHistoryStartup.js \
   nsInputListAutoComplete.js \
   satchel.manifest \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-	nsFormHistory.js \
-	$(NULL)
-
 EXTRA_JS_MODULES = \
   nsFormAutoCompleteResult.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   FormHistory.jsm \
 	$(NULL)
 
--- a/toolkit/components/search/Makefile.in
+++ b/toolkit/components/search/Makefile.in
@@ -9,15 +9,11 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   toolkitsearch.manifest \
   nsSearchSuggestions.js \
   $(NULL)
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsSearchService.js \
-  $(NULL)
-
 DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -17,20 +17,16 @@ MODULE_NAME = telemetry
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 FAIL_ON_WARNINGS = 1
 
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  TelemetryPing.js \
-  $(NULL)
-
 DISABLED_EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   $(NULL)
 
 EXTRA_JS_MODULES = \
   TelemetryStopwatch.jsm \
   $(NULL)
 
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -21,18 +21,13 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 DISABLED_EXTRA_COMPONENTS = \
   nsUrlClassifierHashCompleter.js \
   nsURLClassifier.manifest \
   $(NULL)
 
 # Same as JS components that are run through the pre-processor.
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsUrlClassifierLib.js \
-  nsUrlClassifierListManager.js \
-  $(NULL)
-
 EXTRA_JS_MODULES = \
   SafeBrowsing.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/downloads/Makefile.in
+++ b/toolkit/mozapps/downloads/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 DISABLED_EXTRA_COMPONENTS = nsHelperAppDlg.manifest
-DISABLED_EXTRA_PP_COMPONENTS = nsHelperAppDlg.js
 
 EXTRA_JS_MODULES = \
   DownloadLastDir.jsm \
   DownloadPaths.jsm \
   DownloadUtils.jsm \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -20,21 +20,16 @@ DEFINES += -DMOZ_EXTENSIONS_DB_SCHEMA=14
 # Additional debugging info is exposed in debug builds, or by setting the
 # MOZ_EM_DEBUG environment variable when building.
 ifneq (,$(MOZ_EM_DEBUG))
 DEFINES += -DMOZ_EM_DEBUG=1
 else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif
 
-DISABLED_EXTRA_PP_COMPONENTS = \
-  nsBlocklistService.js \
-  extensions.manifest \
-  $(NULL)
-
 DISABLED_EXTRA_COMPONENTS = \
   addonManager.js \
   amContentHandler.js \
   amWebInstallListener.js \
   $(NULL)
 
 EXTRA_PP_JS_MODULES = \
   AddonManager.jsm \
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -11,20 +11,15 @@ include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   nsUpdateTimerManager.js \
   nsUpdateTimerManager.manifest \
   $(NULL)
 
 ifdef MOZ_UPDATER
 
-DISABLED_EXTRA_PP_COMPONENTS += \
-  nsUpdateService.js \
-  nsUpdateServiceStub.js \
-  $(NULL)
-
 DISABLED_EXTRA_COMPONENTS += \
   nsUpdateService.manifest \
   $(NULL)
 
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_COMPONENTS = nsXULAppInstall.manifest
-DISABLED_EXTRA_PP_COMPONENTS = nsXULAppInstall.js
 
 DEFINES = -DBIN_SUFFIX=$(BIN_SUFFIX)
 
 include $(topsrcdir)/config/rules.mk