Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #4); r=joey
authorMike Shal <mshal@mozilla.com>
Mon, 01 Jul 2013 11:34:30 -0400
changeset 137244 c5f9271afd5647f7b0a824faa21f7741af613f04
parent 137243 7099355d3666a3143de09659449b31f49924e81a
child 137245 df08a8c32fcc71674f8d569ee9a3c1837d5cb110
push id1824
push userryanvm@gmail.com
push dateWed, 03 Jul 2013 18:16:56 +0000
treeherderfx-team@dcbbfcdf7bb4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs880245
milestone25.0a1
Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #4); r=joey
b2g/components/Makefile.in
b2g/components/moz.build
content/base/src/Makefile.in
content/base/src/moz.build
editor/Makefile.in
editor/moz.build
intl/locale/src/Makefile.in
intl/locale/src/moz.build
js/ductwork/debugger/Makefile.in
js/ductwork/debugger/moz.build
js/xpconnect/loader/Makefile.in
js/xpconnect/loader/moz.build
netwerk/base/src/Makefile.in
netwerk/base/src/moz.build
netwerk/protocol/http/Makefile.in
netwerk/protocol/http/moz.build
toolkit/components/passwordmgr/Makefile.in
toolkit/components/passwordmgr/moz.build
tools/profiler/Makefile.in
tools/profiler/moz.build
webapprt/Makefile.in
webapprt/moz.build
--- a/b2g/components/Makefile.in
+++ b/b2g/components/Makefile.in
@@ -4,16 +4,9 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-	Keyboard.jsm \
-	TelURIParser.jsm \
-	SignInToWebsite.jsm \
-	ErrorPage.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -30,8 +30,15 @@ EXTRA_PP_COMPONENTS += [
     'TelProtocolHandler.js',
     'YoutubeProtocolHandler.js',
 ]
 
 if CONFIG['MOZ_UPDATER']:
     EXTRA_PP_COMPONENTS += [
         'UpdatePrompt.js',
     ]
+
+EXTRA_JS_MODULES += [
+    'ErrorPage.jsm',
+    'Keyboard.jsm',
+    'SignInToWebsite.jsm',
+    'TelURIParser.jsm',
+]
--- 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)
 
-EXTRA_JS_MODULES = \
-		CSPUtils.jsm \
-		$(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/content/html/content/src \
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -152,8 +152,12 @@ CPP_SOURCES += [
     'nsXMLContentSerializer.cpp',
     'nsXMLHttpRequest.cpp',
     'nsXMLNameSpaceMap.cpp',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'contentSecurityPolicy.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'CSPUtils.jsm',
+]
--- a/editor/Makefile.in
+++ b/editor/Makefile.in
@@ -6,14 +6,10 @@
 DEPTH            := @DEPTH@
 topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-  AsyncSpellCheckTestHelper.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/moz.build
+++ b/editor/moz.build
@@ -10,8 +10,11 @@ PARALLEL_DIRS += [
     'txtsvc',
     'libeditor',
     'txmgr',
     'composer',
 ]
 
 MODULE = 'editor'
 
+EXTRA_JS_MODULES += [
+    'AsyncSpellCheckTestHelper.jsm',
+]
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -17,20 +17,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
 
 EXPORT_RESOURCE = \
 		$(srcdir)/langGroups.properties \
 		$(srcdir)/language.properties \
 		$(NULL)
 
-EXTRA_JS_MODULES = \
-  PluralForm.jsm \
-  $(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/uconv/src \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -26,8 +26,11 @@ CPP_SOURCES += [
     'nsLocale.cpp',
     'nsLocaleService.cpp',
     'nsScriptableDateFormat.cpp',
     'nsUConvPropertySearch.cpp',
 ]
 
 LIBRARY_NAME = 'nslocale_s'
 
+EXTRA_JS_MODULES += [
+    'PluralForm.jsm',
+]
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -16,13 +16,9 @@ LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  jsdebugger.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -13,8 +13,11 @@ MODULE = 'jsdebugger'
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 CPP_SOURCES += [
     'JSDebugger.cpp',
 ]
 
 LIBRARY_NAME = 'jsdebugger'
 
+EXTRA_JS_MODULES += [
+    'jsdebugger.jsm',
+]
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -14,16 +14,14 @@ MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/../src \
   -I$(srcdir)/../wrappers \
   -I$(topsrcdir)/content/base/src \
   $(NULL)
 
-EXTRA_JS_MODULES = XPCOMUtils.jsm ISO8601DateUtils.jsm
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
   -DJSFILE \
   -DJS_THREADSAFE \
   $(NULL)
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -9,8 +9,12 @@ MODULE = 'jsloader'
 CPP_SOURCES += [
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',
     'mozJSSubScriptLoader.cpp',
 ]
 
 LIBRARY_NAME = 'jsloader_s'
 
+EXTRA_JS_MODULES += [
+    'ISO8601DateUtils.jsm',
+    'XPCOMUtils.jsm',
+]
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -23,20 +23,16 @@ ifdef MOZ_ENABLE_LIBCONIC
 	LOCAL_INCLUDES += -I$(srcdir)/../../system/maemo
 endif
 ifdef MOZ_ENABLE_QTNETWORK
 	LOCAL_INCLUDES += -I$(srcdir)/../../system/qt
 	OS_INCLUDES += $(MOZ_QT_CFLAGS)
 endif
 endif
 
-EXTRA_JS_MODULES = \
-		NetUtil.jsm \
-		$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -98,8 +98,12 @@ if CONFIG['MOZ_PLATFORM_MAEMO']:
     if CONFIG['MOZ_ENABLE_LIBCONIC']:
         CPP_SOURCES += [
             'nsAutodialMaemo.cpp',
         ]
     if CONFIG['MOZ_ENABLE_QTNETWORK']:
         CPP_SOURCES += [
             'nsAutodialQt.cpp',
         ]
+
+EXTRA_JS_MODULES += [
+    'NetUtil.jsm',
+]
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -18,18 +18,14 @@ FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  UserAgentOverrides.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -72,8 +72,11 @@ CPP_SOURCES += [
     'nsHttpHeaderArray.cpp',
     'nsHttpNTLMAuth.cpp',
     'nsHttpPipeline.cpp',
     'nsHttpRequestHead.cpp',
     'nsHttpResponseHead.cpp',
     'nsHttpTransaction.cpp',
 ]
 
+EXTRA_JS_MODULES += [
+    'UserAgentOverrides.jsm',
+]
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -13,13 +13,9 @@ DISABLED_EXTRA_COMPONENTS = \
   crypto-SDR.js \
   nsLoginInfo.js \
   nsLoginManager.js \
   nsLoginManagerPrompter.js \
   passwordmgr.manifest \
   storage-Legacy.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  LoginManagerContent.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@@ -25,8 +25,12 @@ EXTRA_COMPONENTS += [
     'nsLoginManagerPrompter.js',
     'passwordmgr.manifest',
     'storage-Legacy.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'storage-mozStorage.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'LoginManagerContent.jsm',
+]
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -29,20 +29,16 @@ LIBXUL_LIBRARY  = 1
 IS_COMPONENT    = 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 # Uncomment for better debugging in opt builds
 #MOZ_OPTIMIZE_FLAGS += -O0 -g
 
-EXTRA_JS_MODULES = \
-  Profiler.jsm \
-  $(NULL)
-
 ifeq ($(OS_TARGET),Darwin)
 CMMSRCS += \
   shim_mac_dump_syms.mm
 endif
 
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -12,16 +12,19 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
         'nsIProfiler.idl',
     ]
     EXPORTS += [
         'GeckoProfilerFunc.h',
         'GeckoProfilerImpl.h',
         'PseudoStack.h',
         'shared-libraries.h',
     ]
+    EXTRA_JS_MODULES = [
+        'Profiler.jsm',
+    ]
     CPP_SOURCES += [
         'platform.cpp',
         'nsProfilerFactory.cpp',
         'nsProfiler.cpp',
         'TableTicker.cpp',
         'SaveProfileTask.cpp',
         'BreakpadSampler.cpp',
         'UnwinderThread2.cpp',
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -18,22 +18,16 @@ DIST_SUBDIR = webapprt
 EXTRA_COMPONENTS := \
   components.manifest \
   CommandLineHandler.js \
   ContentPermission.js \
   ContentPolicy.js \
   DirectoryProvider.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  Startup.jsm \
-  WebappRT.jsm \
-  WebappsHandler.jsm \
-  $(NULL)
-
 PREF_JS_EXPORTS = $(srcdir)/prefs.js \
                   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -8,8 +8,14 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['win']
 elif CONFIG['OS_ARCH'] == 'Darwin':
     DIRS += ['mac']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     DIRS += ['gtk2']
 
 DIRS += ['locales']
 TEST_DIRS += ['test']
+
+EXTRA_JS_MODULES += [
+    'Startup.jsm',
+    'WebappRT.jsm',
+    'WebappsHandler.jsm',
+]