Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #3); r=joey
authorMike Shal <mshal@mozilla.com>
Fri, 28 Jun 2013 15:17:07 -0400
changeset 137243 7099355d3666a3143de09659449b31f49924e81a
parent 137242 c9cc5fb69f073a51eb6776ebb6ad45c69e32c3b9
child 137244 c5f9271afd5647f7b0a824faa21f7741af613f04
push id24916
push userryanvm@gmail.com
push dateWed, 03 Jul 2013 18:15:02 +0000
treeherdermozilla-central@dcbbfcdf7bb4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs880245
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #3); r=joey
browser/components/Makefile.in
browser/components/downloads/src/Makefile.in
browser/components/downloads/src/moz.build
browser/components/moz.build
browser/components/places/src/Makefile.in
browser/components/places/src/moz.build
browser/components/sessionstore/src/Makefile.in
browser/components/sessionstore/src/moz.build
browser/devtools/sourceeditor/Makefile.in
browser/devtools/sourceeditor/moz.build
browser/devtools/webconsole/Makefile.in
browser/devtools/webconsole/moz.build
browser/metro/modules/Makefile.in
browser/metro/modules/moz.build
browser/modules/Makefile.in
browser/modules/moz.build
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -8,11 +8,9 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserComponents.manifest \
   $(NULL)
 
-EXTRA_JS_MODULES = distribution.js
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/downloads/src/Makefile.in
+++ b/browser/components/downloads/src/Makefile.in
@@ -10,14 +10,9 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserDownloads.manifest \
   DownloadsUI.js \
   DownloadsStartup.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  DownloadsCommon.jsm \
-  DownloadsLogger.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/downloads/src/moz.build
+++ b/browser/components/downloads/src/moz.build
@@ -4,8 +4,14 @@
 # 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 += [
     'BrowserDownloads.manifest',
     'DownloadsStartup.js',
     'DownloadsUI.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'DownloadsCommon.jsm',
+    'DownloadsLogger.jsm',
+]
+
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -38,8 +38,13 @@ MODULE = 'browsercomps'
 
 EXTRA_COMPONENTS += [
     'BrowserComponents.manifest',
 ]
 EXTRA_PP_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsBrowserGlue.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'distribution.js',
+]
+
--- a/browser/components/places/src/Makefile.in
+++ b/browser/components/places/src/Makefile.in
@@ -10,14 +10,10 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   BrowserPlaces.manifest \
   PlacesProtocolHandler.js \
   $(NULL)
 
-EXTRA_JS_MODULES = \
-  PlacesUIUtils.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
--- a/browser/components/places/src/moz.build
+++ b/browser/components/places/src/moz.build
@@ -7,8 +7,13 @@
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/browser/components',
 ]
 
 EXTRA_COMPONENTS += [
     'BrowserPlaces.manifest',
     'PlacesProtocolHandler.js',
 ]
+
+EXTRA_JS_MODULES += [
+    'PlacesUIUtils.jsm',
+]
+
--- a/browser/components/sessionstore/src/Makefile.in
+++ b/browser/components/sessionstore/src/Makefile.in
@@ -11,23 +11,13 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 DISABLED_EXTRA_COMPONENTS = \
   nsSessionStore.manifest \
   nsSessionStore.js \
   nsSessionStartup.js \
   $(NULL)
 
-JS_MODULES_PATH := modules/sessionstore
-
-EXTRA_JS_MODULES := \
-  DocumentUtils.jsm \
-  SessionStorage.jsm \
-  SessionMigration.jsm \
-  XPathGenerator.jsm \
-  _SessionFile.jsm \
-  $(NULL)
-
 EXTRA_PP_JS_MODULES := \
 	SessionStore.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/sessionstore/src/moz.build
+++ b/browser/components/sessionstore/src/moz.build
@@ -4,8 +4,18 @@
 # 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 += [
     'nsSessionStartup.js',
     'nsSessionStore.js',
     'nsSessionStore.manifest',
 ]
+
+JS_MODULES_PATH = 'modules/sessionstore'
+
+EXTRA_JS_MODULES = [
+    'DocumentUtils.jsm',
+    'SessionMigration.jsm',
+    'SessionStorage.jsm',
+    'XPathGenerator.jsm',
+    '_SessionFile.jsm',
+]
--- a/browser/devtools/sourceeditor/Makefile.in
+++ b/browser/devtools/sourceeditor/Makefile.in
@@ -5,15 +5,9 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-	source-editor.jsm \
-	source-editor-orion.jsm \
-	source-editor-ui.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
--- a/browser/devtools/sourceeditor/moz.build
+++ b/browser/devtools/sourceeditor/moz.build
@@ -1,7 +1,14 @@
 # -*- 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
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
+
+EXTRA_JS_MODULES += [
+    'source-editor-orion.jsm',
+    'source-editor-ui.jsm',
+    'source-editor.jsm',
+]
+
--- a/browser/devtools/webconsole/Makefile.in
+++ b/browser/devtools/webconsole/Makefile.in
@@ -4,18 +4,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_JS_MODULES = \
-		HUDService.jsm \
-		NetworkPanel.jsm \
-		WebConsolePanel.jsm \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/framework
--- a/browser/devtools/webconsole/moz.build
+++ b/browser/devtools/webconsole/moz.build
@@ -1,8 +1,14 @@
 # -*- 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
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
+EXTRA_JS_MODULES += [
+    'HUDService.jsm',
+    'NetworkPanel.jsm',
+    'WebConsolePanel.jsm',
+]
+
--- a/browser/metro/modules/Makefile.in
+++ b/browser/metro/modules/Makefile.in
@@ -4,13 +4,9 @@
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
-EXTRA_JS_MODULES = \
-  colorUtils.jsm \
-  CrossSlide.jsm \
-  $(NULL)
 include $(topsrcdir)/config/rules.mk
--- a/browser/metro/modules/moz.build
+++ b/browser/metro/modules/moz.build
@@ -1,6 +1,11 @@
 # -*- 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
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+EXTRA_JS_MODULES += [
+    'CrossSlide.jsm',
+    'colorUtils.jsm',
+]
+
--- a/browser/modules/Makefile.in
+++ b/browser/modules/Makefile.in
@@ -6,39 +6,18 @@ DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
-EXTRA_JS_MODULES = \
-	BrowserNewTabPreloader.jsm \
-	openLocationLastURL.jsm \
-	NetworkPrioritizer.jsm \
-	offlineAppCache.jsm \
-	SignInToWebsite.jsm \
-	SitePermissions.jsm \
-	webappsUI.jsm \
-	webrtcUI.jsm \
-	Social.jsm \
-	SharedFrame.jsm \
-	$(NULL)
-
 EXTRA_PP_JS_MODULES = \
 	AboutHomeUtils.jsm \
 	RecentWindow.jsm \
 	$(NULL)
 
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXTRA_JS_MODULES += \
-	WindowsJumpLists.jsm \
-	WindowsPreviewPerTab.jsm \
-	$(NULL)
-endif
-
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL=1
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -1,8 +1,26 @@
 # -*- 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
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
+EXTRA_JS_MODULES += [
+    'BrowserNewTabPreloader.jsm',
+    'NetworkPrioritizer.jsm',
+    'SharedFrame.jsm',
+    'SignInToWebsite.jsm',
+    'SitePermissions.jsm',
+    'Social.jsm',
+    'offlineAppCache.jsm',
+    'openLocationLastURL.jsm',
+    'webappsUI.jsm',
+    'webrtcUI.jsm',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    EXTRA_JS_MODULES += [
+        'WindowsJumpLists.jsm',
+        'WindowsPreviewPerTab.jsm',
+    ]