Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch mozilla#2); r=…

…joey
Nephyrin · Jun 17, 2013 · fab4df7 · fab4df7
1 parent 3afe016
commit fab4df7
Show file tree

Hide file tree

Showing 40 changed files with 139 additions and 140 deletions.
diff --git a/toolkit/components/contentprefs/Makefile.in b/toolkit/components/contentprefs/Makefile.in
@@ -14,10 +14,4 @@ DISABLED_EXTRA_COMPONENTS = \
   nsContentPrefService.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  ContentPrefInstance.jsm \
-  ContentPrefService2.jsm \
-  ContentPrefStore.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/contentprefs/moz.build b/toolkit/components/contentprefs/moz.build
@@ -12,3 +12,10 @@ EXTRA_COMPONENTS += [
     'nsContentPrefService.js',
     'nsContentPrefService.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'ContentPrefInstance.jsm',
+    'ContentPrefService2.jsm',
+    'ContentPrefStore.jsm',
+]
+
diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in
@@ -11,10 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsctypes
 
-EXTRA_JS_MODULES = \
-    ctypes.jsm \
-    $(NULL)
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1

diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build
@@ -14,3 +14,6 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'jsctypes'
 
+EXTRA_JS_MODULES += [
+    'ctypes.jsm',
+]
diff --git a/toolkit/components/jsdownloads/src/Makefile.in b/toolkit/components/jsdownloads/src/Makefile.in
@@ -14,14 +14,6 @@ DISABLED_EXTRA_COMPONENTS = \
   DownloadLegacy.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  Downloads.jsm \
-  DownloadCore.jsm \
-  DownloadList.jsm \
-  DownloadStore.jsm \
-  DownloadUIHelper.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   DownloadIntegration.jsm \
   $(NULL)

diff --git a/toolkit/components/jsdownloads/src/moz.build b/toolkit/components/jsdownloads/src/moz.build
@@ -8,3 +8,12 @@ EXTRA_COMPONENTS += [
     'DownloadLegacy.js',
     'Downloads.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'DownloadCore.jsm',
+    'DownloadList.jsm',
+    'DownloadStore.jsm',
+    'DownloadUIHelper.jsm',
+    'Downloads.jsm',
+]
+
diff --git a/toolkit/components/microformats/Makefile.in b/toolkit/components/microformats/Makefile.in
@@ -9,6 +9,4 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = Microformats.js
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/microformats/moz.build b/toolkit/components/microformats/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['tests']
 
 MODULE = 'microformats'
 
+EXTRA_JS_MODULES += [
+    'Microformats.js',
+]
+
diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in
@@ -11,10 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsperf
 
-EXTRA_JS_MODULES = \
-    PerfMeasurement.jsm \
-    $(NULL)
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1

diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build
@@ -12,3 +12,6 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'jsperf'
 
+EXTRA_JS_MODULES += [
+    'PerfMeasurement.jsm',
+]
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
@@ -32,15 +32,6 @@ ifdef MOZ_XUL
 DISABLED_EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
 endif
 
-EXTRA_JS_MODULES = \
-  PlacesDBUtils.jsm \
-  ColorAnalyzer_worker.js \
-  ColorConversion.js \
-  ClusterLib.js \
-  BookmarkJSONUtils.jsm \
-  PlacesBackups.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   BookmarkHTMLUtils.jsm \
   PlacesUtils.jsm \

diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build
@@ -51,6 +51,15 @@ if CONFIG['MOZ_PLACES']:
         'Database.cpp',
     ]
 
+    EXTRA_JS_MODULES = [
+        'BookmarkJSONUtils.jsm',
+        'ClusterLib.js',
+        'ColorAnalyzer_worker.js',
+        'ColorConversion.js',
+        'PlacesBackups.jsm',
+        'PlacesDBUtils.jsm',
+    ]
+
 MODULE = 'places'
 
 

diff --git a/toolkit/components/prompts/src/Makefile.in b/toolkit/components/prompts/src/Makefile.in
@@ -14,8 +14,4 @@ DISABLED_EXTRA_COMPONENTS = \
     nsPrompter.manifest \
     $(NULL)
 
-EXTRA_JS_MODULES = \
-    CommonDialog.jsm \
-    $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/prompts/src/moz.build b/toolkit/components/prompts/src/moz.build
@@ -10,3 +10,8 @@ EXTRA_COMPONENTS += [
     'nsPrompter.js',
     'nsPrompter.manifest',
 ]
+
+EXTRA_JS_MODULES += [
+    'CommonDialog.jsm',
+]
+
diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in
@@ -11,10 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsreflect
 
-EXTRA_JS_MODULES = \
-    reflect.jsm \
-    $(NULL)
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1

diff --git a/toolkit/components/reflect/moz.build b/toolkit/components/reflect/moz.build
@@ -12,3 +12,6 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'jsreflect'
 
+EXTRA_JS_MODULES += [
+    'reflect.jsm',
+]
diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in
@@ -25,10 +25,6 @@ DISABLED_EXTRA_COMPONENTS = \
   satchel.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  nsFormAutoCompleteResult.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES = \
   FormHistory.jsm \
 	$(NULL)

diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build
@@ -32,3 +32,6 @@ EXTRA_PP_COMPONENTS += [
 
 LIBRARY_NAME = 'satchel'
 
+EXTRA_JS_MODULES += [
+    'nsFormAutoCompleteResult.jsm',
+]
diff --git a/toolkit/components/social/Makefile.in b/toolkit/components/social/Makefile.in
@@ -9,18 +9,4 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_SOCIAL
-# social is turned off for android
-
-EXTRA_JS_MODULES = \
-  FrameWorker.jsm \
-  MessagePortBase.jsm \
-  MessagePortWorker.js \
-  SocialService.jsm \
-  WorkerAPI.jsm \
-  MozSocialAPI.jsm \
-  $(NULL)
-
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/social/moz.build b/toolkit/components/social/moz.build
@@ -5,3 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
+
+if CONFIG['MOZ_SOCIAL']:
+    # social is turned off for android
+    EXTRA_JS_MODULES = [
+        'FrameWorker.jsm',
+        'MessagePortBase.jsm',
+        'MessagePortWorker.js',
+        'MozSocialAPI.jsm',
+        'SocialService.jsm',
+        'WorkerAPI.jsm',
+    ]
diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in
@@ -26,11 +26,6 @@ DISABLED_EXTRA_COMPONENTS = \
   TelemetryPing.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  TelemetryStopwatch.jsm \
-  ThirdPartyCookieProbe.jsm \
-  $(NULL)
-
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
 

diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build
@@ -31,3 +31,7 @@ EXTRA_PP_COMPONENTS += [
     'TelemetryPing.js',
 ]
 
+EXTRA_JS_MODULES += [
+    'TelemetryStopwatch.jsm',
+    'ThirdPartyCookieProbe.jsm',
+]
diff --git a/toolkit/components/thumbnails/Makefile.in b/toolkit/components/thumbnails/Makefile.in
@@ -14,10 +14,4 @@ DISABLED_EXTRA_COMPONENTS = \
 	PageThumbsProtocol.js \
 	$(NULL)
 
-EXTRA_JS_MODULES = \
-	BackgroundPageThumbs.jsm \
-	PageThumbsWorker.js \
-	PageThumbs.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/thumbnails/moz.build b/toolkit/components/thumbnails/moz.build
@@ -10,3 +10,10 @@ EXTRA_COMPONENTS += [
     'BrowserPageThumbs.manifest',
     'PageThumbsProtocol.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'BackgroundPageThumbs.jsm',
+    'PageThumbs.jsm',
+    'PageThumbsWorker.js',
+]
+
diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in
@@ -25,9 +25,4 @@ DISABLED_EXTRA_COMPONENTS = \
   nsURLClassifier.manifest \
   $(NULL)
 
-# Same as JS components that are run through the pre-processor.
-EXTRA_JS_MODULES = \
-  SafeBrowsing.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build
@@ -44,3 +44,6 @@ EXTRA_PP_COMPONENTS += [
 
 LIBRARY_NAME = 'urlclassifier_s'
 
+EXTRA_JS_MODULES += [
+    'SafeBrowsing.jsm',
+]
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
@@ -45,11 +45,6 @@ DEFINES += -DUNICODE -D_UNICODE
 
 FORCE_STATIC_LIB = 1
 
-EXTRA_JS_MODULES = \
-  CrashSubmit.jsm \
-  KeyValueParser.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build
@@ -67,8 +67,13 @@ CPP_SOURCES += [
     'nsExceptionHandler.cpp',
 ]
 
-
 if CONFIG['OS_ARCH'] == 'Darwin':
     CMMSRCS += [
         'mac_utils.mm',
     ]
+
+EXTRA_JS_MODULES += [
+    'CrashSubmit.jsm',
+    'KeyValueParser.jsm',
+]
+
diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in
@@ -27,8 +27,6 @@ LOCAL_INCLUDES += \
   $(NULL)
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
 
-EXTRA_JS_MODULES = CrashTestUtils.jsm
-
 MOCHITEST_BROWSER_FILES = \
   browser/head.js \
   browser/crashreport.sjs \

diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build
@@ -19,3 +19,6 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'testcrasher'
 
+EXTRA_JS_MODULES += [
+    'CrashTestUtils.jsm',
+]
diff --git a/toolkit/forgetaboutsite/Makefile.in b/toolkit/forgetaboutsite/Makefile.in
@@ -9,8 +9,4 @@ VPATH   := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES := \
-  ForgetAboutSite.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/forgetaboutsite/moz.build b/toolkit/forgetaboutsite/moz.build
@@ -8,3 +8,7 @@ TEST_DIRS += ['test']
 
 MODULE = 'forgetaboutsite'
 
+EXTRA_JS_MODULES += [
+    'ForgetAboutSite.jsm',
+]
+
diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in
@@ -17,18 +17,4 @@ LIBXUL_LIBRARY = 1
 IS_COMPONENT = 1
 EXPORT_LIBRARY = 1
 
-EXTRA_JS_MODULES = \
-	IdentityUtils.jsm \
-	Identity.jsm \
-	IdentityProvider.jsm \
-	IdentityStore.jsm \
-	jwcrypto.jsm \
-	LogUtils.jsm \
-	MinimalIdentity.jsm \
-	RelyingParty.jsm \
-	Sandbox.jsm \
-	$(NULL)
-
-JS_MODULES_PATH = modules/identity
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/identity/moz.build b/toolkit/identity/moz.build
@@ -18,3 +18,16 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'identity'
 
+JS_MODULES_PATH = 'modules/identity'
+
+EXTRA_JS_MODULES += [
+    'Identity.jsm',
+    'IdentityProvider.jsm',
+    'IdentityStore.jsm',
+    'IdentityUtils.jsm',
+    'LogUtils.jsm',
+    'MinimalIdentity.jsm',
+    'RelyingParty.jsm',
+    'Sandbox.jsm',
+    'jwcrypto.jsm',
+]