Bug 870370 - Move EXTRA_COMPONENTS to mozbuild (file batch #3); r=mshal

content/base/src/Makefile.in

@@ -22,14 +22,6 @@ endif
 
 GQI_SRCS = contentbase.gqi
 
-EXTRA_COMPONENTS = \
-		contentSecurityPolicy.manifest \
-		contentAreaDropListener.js \
-		contentAreaDropListener.manifest \
-		messageWakeupService.js \
-		messageWakeupService.manifest \
-		$(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

content/base/src/moz.build

@@ -154,6 +154,14 @@ CPP_SOURCES += [
     'nsXMLNameSpaceMap.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'contentAreaDropListener.js',
+    'contentAreaDropListener.manifest',
+    'contentSecurityPolicy.manifest',
+    'messageWakeupService.js',
+    'messageWakeupService.manifest',
+]
+
 EXTRA_PP_COMPONENTS += [
     'contentSecurityPolicy.js',
 ]

content/xslt/src/xslt/Makefile.in

@@ -17,11 +17,6 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
-EXTRA_COMPONENTS = \
-  txEXSLTRegExFunctions.js \
-  txEXSLTRegExFunctions.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \

content/xslt/src/xslt/moz.build

@@ -39,5 +39,10 @@ CPP_SOURCES += [
     'txXSLTProcessor.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'txEXSLTRegExFunctions.js',
+    'txEXSLTRegExFunctions.manifest',
+]
+
 LIBRARY_NAME = 'txxslt_s'
 

dom/mobilemessage/src/Makefile.in

@@ -41,13 +41,6 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/telephony \
   -I$(topsrcdir)/dom/system/gonk \
   $(NULL)
-
-EXTRA_COMPONENTS = \
-  gonk/MmsService.js \
-  gonk/MmsService.manifest \
-  gonk/MobileMessageDatabaseService.js \
-  gonk/MobileMessageDatabaseService.manifest \
-  $(NULL)
 endif
 
 include $(topsrcdir)/config/config.mk

dom/mobilemessage/src/moz.build

@@ -64,6 +64,14 @@ CPP_SOURCES += [
     'SmsServicesFactory.cpp',
 ]
 
+if CONFIG['MOZ_B2G_RIL']:
+    EXTRA_COMPONENTS += [
+        'gonk/MmsService.js',
+        'gonk/MmsService.manifest',
+        'gonk/MobileMessageDatabaseService.js',
+        'gonk/MobileMessageDatabaseService.manifest',
+    ]
+
 IPDL_SOURCES += [
     'ipc/PMobileMessageCursor.ipdl',
     'ipc/PSms.ipdl',

dom/system/Makefile.in

@@ -20,26 +20,6 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/bindings \
-  $(NULL)
-
-# On Systems that have build in geolocation providers,
-# we really do not need these.
-ifneq (Android,$(OS_TARGET))
-EXTRA_COMPONENTS = \
-  NetworkGeolocationProvider.js \
-  NetworkGeolocationProvider.manifest \
-  $(NULL)
-endif
-
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_COMPONENTS = \
-  NetworkGeolocationProvider.js \
-  NetworkGeolocationProvider.manifest \
-  $(NULL)
-endif
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 

dom/system/gonk/Makefile.in

@@ -36,16 +36,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
-EXTRA_COMPONENTS = \
-  NetworkManager.manifest \
-  NetworkManager.js \
-  RadioInterfaceLayer.manifest \
-  RadioInterfaceLayer.js \
-  RILContentHelper.js \
-  NetworkInterfaceListService.manifest \
-  NetworkInterfaceListService.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

dom/system/gonk/moz.build

@@ -67,6 +67,16 @@ CPP_SOURCES += [
     'SystemWorkerManager.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'NetworkInterfaceListService.js',
+    'NetworkInterfaceListService.manifest',
+    'NetworkManager.js',
+    'NetworkManager.manifest',
+    'RILContentHelper.js',
+    'RadioInterfaceLayer.js',
+    'RadioInterfaceLayer.manifest',
+]
+
 EXTRA_JS_MODULES += [
     'net_worker.js',
     'ril_consts.js',

dom/system/moz.build

@@ -41,3 +41,11 @@ CPP_SOURCES += [
     'nsDeviceSensors.cpp',
 ]
 
+# On Systems that have build in geolocation providers,
+# we really do not need these.
+if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXTRA_COMPONENTS += [
+        'NetworkGeolocationProvider.js',
+        'NetworkGeolocationProvider.manifest',
+    ]
+

dom/wappush/src/Makefile.in

@@ -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) \
-  $(NULL)
-
-include $(DEPTH)/config/autoconf.mk
-
-ifdef MOZ_B2G_RIL
-EXTRA_COMPONENTS = \
-  $(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk

dom/wappush/src/moz.build

@@ -1,3 +1,4 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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

dom/wifi/Makefile.in

@@ -14,13 +14,6 @@ LIBXUL_LIBRARY   = 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
-EXTRA_COMPONENTS = \
-  WifiWorker.js \
-  WifiWorker.manifest \
-  DOMWifiManager.js \
-  DOMWifiManager.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 

dom/wifi/moz.build

@@ -21,6 +21,13 @@ XPIDL_FLAGS += [
 
 MODULE = 'dom'
 
+EXTRA_COMPONENTS += [
+    'DOMWifiManager.js',
+    'DOMWifiManager.manifest',
+    'WifiWorker.js',
+    'WifiWorker.manifest',
+]
+
 EXTRA_JS_MODULES += [
     'libhardware_legacy.js',
     'wifi_worker.js',

dom/workers/test/extensions/traditional/Makefile.in

@@ -10,11 +10,6 @@ VPATH            = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 XPI_NAME = worker
-EXTRA_COMPONENTS = \
-  WorkerTest.js \
-  WorkerTest.manifest \
-  $(NULL)
-
 DIST_FILES = \
   install.rdf \
   worker.js \

dom/workers/test/extensions/traditional/moz.build

@@ -10,3 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'WorkerTest'
 
+EXTRA_COMPONENTS += [
+    'WorkerTest.js',
+    'WorkerTest.manifest',
+]

extensions/widgetutils/src/Makefile.in

@@ -16,19 +16,13 @@ FORCE_SHARED_LIB = 1
 IS_COMPONENT = 1
 
 EXTRA_DSO_LDOPTS = \
-	$(XPCOM_GLUE_LDOPTS) \
+  $(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
+  $(NSPR_LIBS) \
-	$(NULL)
+  $(MOZ_COMPONENT_LIBS) \
-
+  $(NULL)
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
-EXPORT_RESOURCE = \
-	$(NULL)
 
 ifdef TARGET_XPCOM_ABI
 FINAL_TARGET=$(DIST)/xpi-stage/$(XPI_NAME)/platform/$(OS_TARGET)_$(TARGET_XPCOM_ABI)
 endif
 
-#EXTRA_COMPONENTS = $(srcdir)/SimpleTest.js
-
 include $(topsrcdir)/config/rules.mk

image/decoders/icon/qt/Makefile.in

@@ -14,7 +14,5 @@ LIBXUL_LIBRARY	= 1
 
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 
-EXTRA_COMPONENTS = gtkqticonsconverter.manifest
-
 include $(topsrcdir)/config/rules.mk
 

image/decoders/icon/qt/moz.build

@@ -12,6 +12,10 @@ CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+EXTRA_COMPONENTS += [
+    'gtkqticonsconverter.manifest',
+]
+
 EXTRA_PP_COMPONENTS += [
     'gtkqticonsconverter.js',
 ]

layout/tools/recording/Makefile.in

@@ -1,19 +0,0 @@
-# vim: set shiftwidth=8 tabstop=8 autoindent noexpandtab copyindent:
-# 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 = \
-		recording-cmdline.js \
-		$(NULL)
-
-EXTRA_COMPONENTS += recording-cmdline.manifest
-
-include $(topsrcdir)/config/rules.mk

layout/tools/recording/moz.build

@@ -5,3 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'recording'
+
+EXTRA_COMPONENTS += [
+    'recording-cmdline.js',
+    'recording-cmdline.manifest',
+]

layout/tools/reftest/Makefile.in

@@ -10,10 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_COMPONENTS= \
-		reftest-cmdline.js \
-		$(NULL)
-
 ifdef XPI_NAME
 NO_JS_MANIFEST = 1
 DIST_FILES = install.rdf

layout/tools/reftest/moz.build

@@ -6,3 +6,7 @@
 
 MODULE = 'reftest'
 
+EXTRA_COMPONENTS += [
+    'reftest-cmdline.js',
+]
+

netwerk/protocol/app/Makefile.in

@@ -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 = \
-  AppProtocolHandler.js \
-  AppProtocolHandler.manifest \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk

netwerk/protocol/app/moz.build

@@ -4,3 +4,7 @@
 # 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/.
 
+EXTRA_COMPONENTS += [
+    'AppProtocolHandler.js',
+    'AppProtocolHandler.manifest',
+]

netwerk/test/httpserver/Makefile.in

@@ -14,10 +14,6 @@ include $(DEPTH)/config/autoconf.mk
 
 NO_INTERFACES_MANIFEST = 1
 
-EXTRA_COMPONENTS = \
-                   httpd.js \
-                   $(NULL)
-
 ifdef XPI_NAME
 NO_JS_MANIFEST = 1
 USE_EXTENSION_MANIFEST = 1

netwerk/test/httpserver/moz.build

@@ -11,3 +11,8 @@ XPIDL_SOURCES += [
 MODULE = 'test_necko'
 
 XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
+
+EXTRA_COMPONENTS += [
+    'httpd.js',
+]
+

services/common/Makefile.in

@@ -31,10 +31,6 @@ testing_modules := \
   utils.js \
   $(NULL)
 
-EXTRA_COMPONENTS := \
-  servicesComponents.manifest \
-  $(NULL)
-
 PREF_JS_EXPORTS = $(srcdir)/services-common.js
 
 MODULES_FILES := $(modules)

services/common/moz.build

@@ -5,3 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'servicesComponents.manifest',
+]

services/crypto/Makefile.in

@@ -14,10 +14,6 @@ modules := \
   WeaveCrypto.js \
   $(NULL)
 
-EXTRA_COMPONENTS := \
-  cryptoComponents.manifest \
-  $(NULL)
-
 CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules))
 CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto
 INSTALL_TARGETS += CRYPTO_MODULE

services/crypto/moz.build

@@ -9,3 +9,6 @@ TEST_DIRS += ['tests']
 
 MODULE = 'services-crypto'
 
+EXTRA_COMPONENTS += [
+    'cryptoComponents.manifest',
+]

services/datareporting/Makefile.in

@@ -16,10 +16,6 @@ PP_TARGETS += MODULES
 TESTING_JS_MODULES := $(addprefix modules-testing/,mocks.jsm)
 TESTING_JS_MODULE_DIR := services/datareporting
 
-EXTRA_COMPONENTS := \
-  DataReporting.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 $(FINAL_TARGET)/components/DataReportingService.js: policy.jsm sessions.jsm ../common/observers.js

services/datareporting/moz.build

@@ -6,6 +6,10 @@
 
 TEST_DIRS += ['tests']
 
+EXTRA_COMPONENTS += [
+    'DataReporting.manifest',
+]
+
 EXTRA_PP_COMPONENTS += [
     'DataReportingService.js',
 ]

services/healthreport/Makefile.in

@@ -46,10 +46,6 @@ PP_TARGETS += MODULES
 TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))
 TESTING_JS_MODULE_DIR := services/healthreport
 
-EXTRA_COMPONENTS := \
-  HealthReportComponents.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 # Add extra prerequisites until bug 837792 is addressed.

services/healthreport/moz.build

@@ -5,3 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'HealthReportComponents.manifest',
+]

services/sync/Makefile.in

@@ -66,11 +66,6 @@ sync_testing_modules := \
   utils.js \
   $(NULL)
 
-EXTRA_COMPONENTS := \
-  SyncComponents.manifest \
-  Weave.js \
-  $(NULL)
-
 PREF_JS_EXPORTS := $(srcdir)/services-sync.js
 
 # Install JS module files.

services/sync/moz.build

@@ -6,3 +6,8 @@
 
 DIRS += ['locales']
 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'SyncComponents.manifest',
+    'Weave.js',
+]

testing/specialpowers/Makefile.in

@@ -18,8 +18,6 @@ DIST_FILES = \
   chrome.manifest \
   $(NULL)
 
-EXTRA_COMPONENTS = components/SpecialPowersObserver.js
-
 XPI_NAME=specialpowers
 
 # Used in install.rdf

testing/specialpowers/moz.build

@@ -4,3 +4,6 @@
 # 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/.
 
+EXTRA_COMPONENTS += [
+    'components/SpecialPowersObserver.js',
+]

toolkit/mozapps/plugins/Makefile.in

@@ -1,15 +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 = pluginGlue.manifest
-
-include $(topsrcdir)/config/rules.mk

toolkit/mozapps/plugins/moz.build

@@ -5,3 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
+
+EXTRA_COMPONENTS += [
+    'pluginGlue.manifest',
+]

uriloader/exthandler/Makefile.in

@@ -76,13 +76,6 @@ LOCAL_INCLUDES   += $(MOZ_GIO_CFLAGS)
 endif
 endif
 
-EXTRA_COMPONENTS = \
-  nsHandlerService.js \
-  nsHandlerService.manifest \
-  nsWebHandlerApp.js \
-  nsWebHandlerApp.manifest \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

uriloader/exthandler/moz.build

@@ -112,6 +112,13 @@ if CONFIG['MOZ_ENABLE_CONTENTACTION']:
         'nsContentHandlerApp.cpp',
     ]
 
+EXTRA_COMPONENTS += [
+    'nsHandlerService.js',
+    'nsHandlerService.manifest',
+    'nsWebHandlerApp.js',
+    'nsWebHandlerApp.manifest',
+]
+
 IPDL_SOURCES += [
     'PExternalHelperApp.ipdl',
 ]

webapprt/Makefile.in

@@ -15,14 +15,6 @@ include $(topsrcdir)/config/config.mk
 # Place webapprt resources in a separate app dir
 DIST_SUBDIR = webapprt
 
-EXTRA_COMPONENTS := \
-  components.manifest \
-  CommandLineHandler.js \
-  ContentPermission.js \
-  ContentPolicy.js \
-  DirectoryProvider.js \
-  $(NULL)
-
 PREF_JS_EXPORTS = $(srcdir)/prefs.js \
                   $(NULL)
 

webapprt/moz.build

@@ -14,6 +14,14 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
 DIRS += ['locales']
 TEST_DIRS += ['test']
 
+EXTRA_COMPONENTS += [
+    'CommandLineHandler.js',
+    'ContentPermission.js',
+    'ContentPolicy.js',
+    'DirectoryProvider.js',
+    'components.manifest',
+]
+
 EXTRA_JS_MODULES += [
     'Startup.jsm',
     'WebappRT.jsm',

xpcom/ds/Makefile.in

@@ -14,12 +14,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 MOZILLA_INTERNAL_API = 1
 
-EXTRA_COMPONENTS = \
-  nsINIProcessor.js \
-  nsINIProcessor.manifest \
-  $(NULL)
-
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../io

xpcom/ds/moz.build

@@ -113,5 +113,10 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
 else:
     error('No TimeStamp implementation on this platform.  Build will not succeed')
 
+EXTRA_COMPONENTS += [
+    'nsINIProcessor.js',
+    'nsINIProcessor.manifest',
+]
+
 LIBRARY_NAME = 'xpcomds_s'
 

xpcom/sample/Makefile.in

@@ -25,13 +25,8 @@ IS_COMPONENT	= 1
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule
 
-# CPPSRCS specifies C++ files to be built into a library.
 include $(topsrcdir)/config/config.mk
 
-# EXTRA_COMPONENTS installs components written JavaScript to
-# dist/bin/components
-EXTRA_COMPONENTS = nsSample.js nsSample.manifest
-
 # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library
 # from this Makefile. We link against the "dependent glue" and against the
 # frozen XPCOM shared library.

xpcom/sample/moz.build

@@ -10,10 +10,19 @@ DIRS += ['program']
 # on these files to generate C++ headers and .xpt typelib files.
 XPIDL_SOURCES += ['nsISample.idl']
 
+# MODULE specifies where header files from this Makefile are installed,
+# i.e. dist/include/xpcomsample
 MODULE = 'xpcomsample'
 
+# CPP_SOURCES specifies C++ files to be built into a library.
 CPP_SOURCES += [
     'nsSample.cpp',
     'nsSampleModule.cpp',
 ]
 
+# EXTRA_COMPONENTS installs components written JavaScript to
+# dist/bin/components
+EXTRA_COMPONENTS += [
+    'nsSample.js',
+    'nsSample.manifest',
+]