Bug 880245 - Move EXTRA_JS_MODULES to moz.build (conversion part 1); r=joey

From 69c3338a3287ff8cc97533e06069fc4d4cb7c5f6 Mon Sep 17 00:00:00 2001
2013-06-10 12:08:47 -04:00 · 2013-06-10 12:08:47 -04:00 · 87c2fdb386
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@ -24,10 +24,5 @@ DISABLED_EXTRA_COMPONENTS = \
  Activities.manifest \
  $(NULL)

-EXTRA_JS_MODULES =   \
-  ActivitiesService.jsm \
-  ActivitiesServiceFilter.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@ -21,3 +21,8 @@ EXTRA_COMPONENTS += [
    'ActivityRequestHandler.js',
    'ActivityWrapper.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'ActivitiesService.jsm',
+    'ActivitiesServiceFilter.jsm',
+]
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@ -21,11 +21,6 @@ DISABLED_EXTRA_COMPONENTS =       \
  AlarmsManager.manifest \
  $(NULL)

-EXTRA_JS_MODULES = \
-  AlarmDB.jsm      \
-  AlarmService.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@ -31,3 +31,8 @@ EXTRA_COMPONENTS += [
    'AlarmsManager.js',
    'AlarmsManager.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'AlarmDB.jsm',
+    'AlarmService.jsm',
+]
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@ -24,13 +24,4 @@ EXTRA_PP_JS_MODULES += \
  AppsUtils.jsm \
  $(NULL)

-EXTRA_JS_MODULES += \
-  AppsServiceChild.jsm \
-  OfflineCacheInstaller.jsm \
-  PermissionsInstaller.jsm \
-  PermissionsTable.jsm \
-  FreeSpaceWatcher.jsm \
-  AppDownloadManager.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@ -9,3 +9,12 @@ EXTRA_COMPONENTS += [
    'AppsService.manifest',
    'Webapps.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'AppDownloadManager.jsm',
+    'AppsServiceChild.jsm',
+    'FreeSpaceWatcher.jsm',
+    'OfflineCacheInstaller.jsm',
+    'PermissionsInstaller.jsm',
+    'PermissionsTable.jsm',
+]
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -22,15 +22,6 @@ DISABLED_EXTRA_COMPONENTS = \
  ConsoleAPI.manifest \
  $(NULL)

-EXTRA_JS_MODULES = ConsoleAPIStorage.jsm \
-  $(NULL)
-
-EXTRA_JS_MODULES += \
-  DOMRequestHelper.jsm \
-  IndexedDBHelper.jsm \
-  ObjectWrapper.jsm \
-  $(NULL)
-
 include $(topsrcdir)/dom/dom-config.mk

 ifdef MOZ_JSDEBUGGER
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -103,3 +103,10 @@ EXTRA_COMPONENTS += [
    'SiteSpecificUserAgent.js',
    'SiteSpecificUserAgent.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'ConsoleAPIStorage.jsm',
+    'DOMRequestHelper.jsm',
+    'IndexedDBHelper.jsm',
+    'ObjectWrapper.jsm',
+]
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -21,11 +21,6 @@ DISABLED_EXTRA_COMPONENTS = \
  BrowserElementParent.manifest \
  $(NULL)

-EXTRA_JS_MODULES = \
-  BrowserElementPromptService.jsm \
-  BrowserElementParent.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@ -34,3 +34,8 @@ EXTRA_COMPONENTS += [
    'BrowserElementParent.js',
    'BrowserElementParent.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'BrowserElementParent.jsm',
+    'BrowserElementPromptService.jsm',
+]
--- a/dom/contacts/Makefile.in
+++ b/dom/contacts/Makefile.in
@ -16,9 +16,4 @@ DISABLED_EXTRA_COMPONENTS =        \
  ContactManager.manifest \
  $(NULL)

-EXTRA_JS_MODULES =   \
-  ContactService.jsm \
-  ContactDB.jsm      \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/contacts/moz.build
+++ b/dom/contacts/moz.build
@ -10,3 +10,8 @@ EXTRA_COMPONENTS += [
    'ContactManager.js',
    'ContactManager.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'ContactDB.jsm',
+    'ContactService.jsm',
+]
--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@ -20,10 +20,6 @@ EXTRA_COMPONENTS =      \
  DOMFMRadio.manifest \
  $(NULL)

-EXTRA_JS_MODULES =   \
-  DOMFMRadioParent.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@ -22,3 +22,7 @@ CPP_SOURCES += [
    'nsFMRadioSettings.cpp',
 ]

+EXTRA_JS_MODULES += [
+    'DOMFMRadioParent.jsm',
+]
+
--- a/dom/identity/Makefile.in
+++ b/dom/identity/Makefile.in
@ -21,7 +21,4 @@ EXTRA_PP_JS_MODULES = \
    DOMIdentity.jsm \
    $(NULL)

-EXTRA_JS_MODULES = \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/messages/Makefile.in
+++ b/dom/messages/Makefile.in
@ -17,8 +17,4 @@ DISABLED_EXTRA_COMPONENTS = \
  SystemMessageManager.manifest \
  $(NULL)

-EXTRA_JS_MODULES += \
-  SystemMessagePermissionsChecker.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/messages/moz.build
+++ b/dom/messages/moz.build
@ -11,3 +11,7 @@ EXTRA_COMPONENTS += [
    'SystemMessageManager.js',
    'SystemMessageManager.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'SystemMessagePermissionsChecker.jsm',
+]
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@ -49,13 +49,6 @@ EXTRA_COMPONENTS = \
  ril/MobileMessageDatabaseService.js \
  ril/MobileMessageDatabaseService.manifest \
  $(NULL)
-
-EXTRA_JS_MODULES = \
-  ril/mms_consts.js \
-  ril/MmsPduHelper.jsm \
-  ril/wap_consts.js \
-  ril/WspPduHelper.jsm \
-  $(NULL)
 endif

 include $(topsrcdir)/config/config.mk
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@ -14,7 +14,14 @@ EXPORTS.mozilla.dom.mobilemessage += [
    'Types.h',
 ]

-if not CONFIG['MOZ_B2G_RIL']:
+if CONFIG['MOZ_B2G_RIL']:
+    EXTRA_JS_MODULES = [
+        'ril/MmsPduHelper.jsm',
+        'ril/WspPduHelper.jsm',
+        'ril/mms_consts.js',
+        'ril/wap_consts.js',
+    ]
+else:
    EXPORTS.mozilla.dom.mobilemessage += [
        'MmsService.h',
        'MobileMessageDatabaseService.h',
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@ -25,11 +25,6 @@ DISABLED_EXTRA_COMPONENTS += \
  NetworkStatsManager.manifest \
  NetworkStatsManager.js \
  $(NULL)
-
-EXTRA_JS_MODULES =   \
-  NetworkStatsService.jsm \
-  NetworkStatsDB.jsm \
-  $(NULL)
 endif

 include $(topsrcdir)/dom/dom-config.mk
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@ -23,6 +23,10 @@ if CONFIG['MOZ_B2G_RIL']:
    CPP_SOURCES += [
        'MobileConnection.cpp',
    ]
+    EXTRA_JS_MODULES = [
+        'NetworkStatsDB.jsm',
+        'NetworkStatsService.jsm',
+    ]

 EXTRA_COMPONENTS += [
    'TCPSocket.js',
--- a/dom/payment/Makefile.in
+++ b/dom/payment/Makefile.in
@ -16,9 +16,5 @@ EXTRA_COMPONENTS = \
  Payment.manifest \
  $(NULL)

-EXTRA_JS_MODULES += \
-  Payment.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/payment/moz.build
+++ b/dom/payment/moz.build
@ -8,3 +8,7 @@ PARALLEL_DIRS += ['interfaces']

 TEST_DIRS += ['tests']

+EXTRA_JS_MODULES += [
+    'Payment.jsm',
+]
+
--- a/dom/permission/Makefile.in
+++ b/dom/permission/Makefile.in
@ -16,9 +16,4 @@ DISABLED_EXTRA_COMPONENTS =        \
  PermissionPromptService.manifest \
  $(NULL)

-EXTRA_JS_MODULES =   \
-  PermissionPromptHelper.jsm \
-  PermissionSettings.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/permission/moz.build
+++ b/dom/permission/moz.build
@ -12,3 +12,8 @@ EXTRA_COMPONENTS += [
    'PermissionSettings.js',
    'PermissionSettings.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'PermissionPromptHelper.jsm',
+    'PermissionSettings.jsm',
+]
--- a/dom/phonenumberutils/Makefile.in
+++ b/dom/phonenumberutils/Makefile.in
@ -9,12 +9,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-EXTRA_JS_MODULES =   \
-  PhoneNumber.jsm \
-  PhoneNumberMetaData.jsm \
-  mcc_iso3166_table.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
  PhoneNumberUtils.jsm \
  $(NULL)
--- a/dom/phonenumberutils/moz.build
+++ b/dom/phonenumberutils/moz.build
@ -5,3 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+EXTRA_JS_MODULES += [
+    'PhoneNumber.jsm',
+    'PhoneNumberMetaData.jsm',
+    'mcc_iso3166_table.jsm',
+]
+
--- a/dom/push/src/Makefile.in
+++ b/dom/push/src/Makefile.in
@ -14,9 +14,5 @@ DISABLED_EXTRA_COMPONENTS = \
  Push.manifest \
  $(NULL)

-EXTRA_JS_MODULES = \
-  PushService.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk

--- a/dom/push/src/moz.build
+++ b/dom/push/src/moz.build
@ -9,3 +9,7 @@ EXTRA_COMPONENTS += [
    'Push.manifest',
    'PushServiceLauncher.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'PushService.jsm',
+]
--- a/dom/settings/Makefile.in
+++ b/dom/settings/Makefile.in
@ -16,10 +16,4 @@ DISABLED_EXTRA_COMPONENTS =         \
  SettingsService.manifest \
  $(NULL)

-EXTRA_JS_MODULES =   \
-  SettingsQueue.jsm  \
-  SettingsDB.jsm     \
-  SettingsChangeNotifier.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/dom/settings/moz.build
+++ b/dom/settings/moz.build
@ -12,3 +12,9 @@ EXTRA_COMPONENTS += [
    'SettingsService.js',
    'SettingsService.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'SettingsChangeNotifier.jsm',
+    'SettingsDB.jsm',
+    'SettingsQueue.jsm',
+]
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@ -47,13 +47,6 @@ EXTRA_COMPONENTS = \
  NetworkInterfaceListService.js \
  $(NULL)

-EXTRA_JS_MODULES = \
-  net_worker.js \
-  ril_consts.js \
-  ril_worker.js \
-  systemlibs.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@ -66,3 +66,11 @@ if CONFIG['ENABLE_TESTS']:
 CPP_SOURCES += [
    'SystemWorkerManager.cpp',
 ]
+
+EXTRA_JS_MODULES += [
+    'net_worker.js',
+    'ril_consts.js',
+    'ril_worker.js',
+    'systemlibs.js',
+]
+
--- a/dom/wappush/src/Makefile.in
+++ b/dom/wappush/src/Makefile.in
@ -14,13 +14,6 @@ include $(DEPTH)/config/autoconf.mk
 ifdef MOZ_B2G_RIL
 EXTRA_COMPONENTS = \
  $(NULL)
-
-EXTRA_JS_MODULES = \
-  gonk/WbxmlPduHelper.jsm \
-  gonk/SiPduHelper.jsm \
-  gonk/SlPduHelper.jsm \
-  gonk/WapPushManager.js \
-  $(NULL)
 endif

 include $(topsrcdir)/config/config.mk
--- a/dom/wappush/src/moz.build
+++ b/dom/wappush/src/moz.build
@ -3,3 +3,10 @@
 # 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/.

+if CONFIG['MOZ_B2G_RIL']:
+    EXTRA_JS_MODULES = [
+        'gonk/SiPduHelper.jsm',
+        'gonk/SlPduHelper.jsm',
+        'gonk/WapPushManager.js',
+        'gonk/WbxmlPduHelper.jsm',
+    ]
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@ -22,11 +22,6 @@ EXTRA_COMPONENTS = \
  DOMWifiManager.manifest \
  $(NULL)

-EXTRA_JS_MODULES = \
-  libhardware_legacy.js \
-  wifi_worker.js \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk


--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@ -21,3 +21,8 @@ XPIDL_FLAGS += [

 MODULE = 'dom'

+EXTRA_JS_MODULES += [
+    'libhardware_legacy.js',
+    'wifi_worker.js',
+]
+