Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #4); r=mshal
authorMs2ger <ms2ger@gmail.com>
Fri, 02 Aug 2013 09:03:42 +0200
changeset 140949 225a4dbdeb1fb12a93e79b13009d558aba9bad8d
parent 140948 f2528126addb5804de1b3ebfce42f164fb1c7a62
child 140950 5423e04326c2d9d826b0dc6247a3840d4e0e5805
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs870370
milestone25.0a1
Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #4); r=mshal
browser/metro/components/Makefile.in
browser/metro/components/moz.build
dom/fm/Makefile.in
dom/fm/moz.build
dom/payment/Makefile.in
dom/payment/moz.build
mobile/android/components/Makefile.in
mobile/android/components/moz.build
toolkit/components/captivedetect/Makefile.in
toolkit/components/captivedetect/moz.build
widget/windows/winrt/Makefile.in
widget/windows/winrt/moz.build
xulrunner/examples/simple/components/src/Makefile.in
xulrunner/examples/simple/components/src/moz.build
xulrunner/setup/Makefile.in
xulrunner/setup/moz.build
deleted file mode 100644
--- a/browser/metro/components/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/config.mk
-
-# metro/components.manifest
-EXTRA_COMPONENTS = \
-        AlertsService.js \
-        ContentPermissionPrompt.js \
-        DownloadManagerUI.js \
-        PromptService.js \
-        ContentDispatchChooser.js \
-        LoginManagerPrompter.js \
-        $(NULL)
-
-ifdef MOZ_SAFE_BROWSING
-EXTRA_COMPONENTS += SafeBrowsing.js
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@@ -6,16 +6,30 @@
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
 MODULE = 'components'
 
 # metro/components.manifest
+EXTRA_COMPONENTS += [
+    'AlertsService.js',
+    'ContentDispatchChooser.js',
+    'ContentPermissionPrompt.js',
+    'DownloadManagerUI.js',
+    'LoginManagerPrompter.js',
+    'PromptService.js',
+]
+
+if CONFIG['MOZ_SAFE_BROWSING']:
+    EXTRA_COMPONENTS += [
+        'SafeBrowsing.js',
+    ]
+
 EXTRA_PP_COMPONENTS += [
     'AboutRedirector.js',
     'BrowserCLH.js',
     'BrowserStartup.js',
     'DirectoryProvider.js',
     'HelperAppDialog.js',
     'SessionStore.js',
     'Sidebar.js',
--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@@ -9,16 +9,11 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfm_s
 LIBXUL_LIBRARY   = 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXTRA_COMPONENTS =      \
-  DOMFMRadioChild.js       \
-  DOMFMRadio.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@@ -21,8 +21,13 @@ CPP_SOURCES += [
     'FMRadio.cpp',
     'nsFMRadioSettings.cpp',
 ]
 
 EXTRA_JS_MODULES += [
     'DOMFMRadioParent.jsm',
 ]
 
+EXTRA_COMPONENTS += [
+    'DOMFMRadio.manifest',
+    'DOMFMRadioChild.js',
+]
+
deleted file mode 100644
--- a/dom/payment/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-  Payment.js \
-  PaymentFlowInfo.js \
-  PaymentRequestInfo.js \
-  Payment.manifest \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/payment/moz.build
+++ b/dom/payment/moz.build
@@ -7,8 +7,15 @@
 PARALLEL_DIRS += ['interfaces']
 
 TEST_DIRS += ['tests']
 
 EXTRA_JS_MODULES += [
     'Payment.jsm',
 ]
 
+EXTRA_COMPONENTS += [
+    'Payment.js',
+    'Payment.manifest',
+    'PaymentFlowInfo.js',
+    'PaymentRequestInfo.js',
+]
+
--- a/mobile/android/components/Makefile.in
+++ b/mobile/android/components/Makefile.in
@@ -4,28 +4,13 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_COMPONENTS = \
-        ContentPermissionPrompt.js \
-        XPIDialogService.js \
-        DownloadManagerUI.js \
-        PromptService.js \
-        ContentDispatchChooser.js \
-        AddonUpdateService.js \
-        LoginManagerPrompter.js \
-        BlocklistPrompt.js \
-        NSSDialogService.js \
-        SiteSpecificUserAgent.js \
-        PaymentsUI.js \
-        FilePicker.js \
-        $(NULL)
-
 DEFINES += \
   -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/mobile/android/components/moz.build
+++ b/mobile/android/components/moz.build
@@ -5,17 +5,33 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
     'SessionStore.idl',
 ]
 
 MODULE = 'MobileComponents'
 
+EXTRA_COMPONENTS += [
+    'AddonUpdateService.js',
+    'BlocklistPrompt.js',
+    'ContentDispatchChooser.js',
+    'ContentPermissionPrompt.js',
+    'DownloadManagerUI.js',
+    'FilePicker.js',
+    'LoginManagerPrompter.js',
+    'NSSDialogService.js',
+    'PaymentsUI.js',
+    'PromptService.js',
+    'SiteSpecificUserAgent.js',
+    'XPIDialogService.js',
+]
+
 EXTRA_PP_COMPONENTS += [
     'AboutRedirector.js',
     'BrowserCLH.js',
     'DirectoryProvider.js',
     'HelperAppDialog.js',
     'MobileComponents.manifest',
     'SessionStore.js',
     'Sidebar.js',
 ]
+
deleted file mode 100644
--- a/toolkit/components/captivedetect/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
-  CaptivePortalDetectComponents.manifest \
-  captivedetect.js \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/captivedetect/moz.build
+++ b/toolkit/components/captivedetect/moz.build
@@ -7,8 +7,13 @@
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsICaptivePortalDetector.idl',
 ]
 
 MODULE = 'captivedetect'
 
+EXTRA_COMPONENTS += [
+    'CaptivePortalDetectComponents.manifest',
+    'captivedetect.js',
+]
+
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -40,20 +40,16 @@ LOCAL_INCLUDES	= \
 include $(topsrcdir)/config/config.mk
 
 MIDL_GENERATED_FILES = \
 	UIABridge_i.c \
 	UIABridge_p.c \
 	dlldata.c \
 	$(NULL)
 
-EXTRA_COMPONENTS = MetroUIUtils.js \
-	MetroUIUtils.manifest \
-	$(NULL)
-
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen
 
 do_interfaces_gen: UIABridge.idl
 	$(MIDL) $(srcdir)/UIABridge.idl -I $(srcdir)
 	touch $@
 
 export:: do_interfaces_gen
 
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -16,8 +16,13 @@ CPP_SOURCES += [
     'MetroUtils.cpp',
     'MetroWidget.cpp',
     'UIAAccessibilityBridge.cpp',
     'UIABridge.cpp',
     'nsMetroFilePicker.cpp',
     'nsWinMetroUtils.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'MetroUIUtils.js',
+    'MetroUIUtils.manifest',
+]
+
--- a/xulrunner/examples/simple/components/src/Makefile.in
+++ b/xulrunner/examples/simple/components/src/Makefile.in
@@ -14,11 +14,9 @@ XPI_NAME	= simple
 SHORT_LIBNAME = simpltst
 IS_COMPONENT	= 1
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
-EXTRA_COMPONENTS = SimpleTest.js SimpleTest.manifest
-
 include $(topsrcdir)/config/rules.mk
--- a/xulrunner/examples/simple/components/src/moz.build
+++ b/xulrunner/examples/simple/components/src/moz.build
@@ -7,8 +7,13 @@
 MODULE = 'simple'
 
 CPP_SOURCES += [
     'SimpleTest.cpp',
 ]
 
 LIBRARY_NAME = 'simpletest'
 
+EXTRA_COMPONENTS += [
+    'SimpleTest.js',
+    'SimpleTest.manifest',
+]
+
--- a/xulrunner/setup/Makefile.in
+++ b/xulrunner/setup/Makefile.in
@@ -4,13 +4,11 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_COMPONENTS = nsXULAppInstall.manifest
-
 DEFINES = -DBIN_SUFFIX=$(BIN_SUFFIX)
 
 include $(topsrcdir)/config/rules.mk
--- a/xulrunner/setup/moz.build
+++ b/xulrunner/setup/moz.build
@@ -7,11 +7,15 @@
 XPIDL_SOURCES += [
     'nsIXULAppInstall.idl',
 ]
 
 XPIDL_MODULE = 'xulapp_setup'
 
 MODULE = 'xulrunner'
 
+EXTRA_COMPONENTS += [
+    'nsXULAppInstall.manifest',
+]
+
 EXTRA_PP_COMPONENTS += [
     'nsXULAppInstall.js',
 ]