Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #3); r=joey

This commit is contained in:
Mike Shal 2013-06-28 15:17:07 -04:00
parent 8f2fc50e46
commit d2ead9d919
16 changed files with 62 additions and 58 deletions

View File

@ -13,6 +13,4 @@ DISABLED_EXTRA_COMPONENTS = \
BrowserComponents.manifest \
$(NULL)
EXTRA_JS_MODULES = distribution.js
include $(topsrcdir)/config/rules.mk

View File

@ -15,9 +15,4 @@ DISABLED_EXTRA_COMPONENTS = \
DownloadsStartup.js \
$(NULL)
EXTRA_JS_MODULES = \
DownloadsCommon.jsm \
DownloadsLogger.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -9,3 +9,9 @@ EXTRA_COMPONENTS += [
'DownloadsStartup.js',
'DownloadsUI.js',
]
EXTRA_JS_MODULES += [
'DownloadsCommon.jsm',
'DownloadsLogger.jsm',
]

View File

@ -43,3 +43,8 @@ EXTRA_PP_COMPONENTS += [
'nsBrowserContentHandler.js',
'nsBrowserGlue.js',
]
EXTRA_JS_MODULES += [
'distribution.js',
]

View File

@ -15,9 +15,5 @@ DISABLED_EXTRA_COMPONENTS = \
PlacesProtocolHandler.js \
$(NULL)
EXTRA_JS_MODULES = \
PlacesUIUtils.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -12,3 +12,8 @@ EXTRA_COMPONENTS += [
'BrowserPlaces.manifest',
'PlacesProtocolHandler.js',
]
EXTRA_JS_MODULES += [
'PlacesUIUtils.jsm',
]

View File

@ -16,16 +16,6 @@ DISABLED_EXTRA_COMPONENTS = \
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)

View File

@ -9,3 +9,13 @@ EXTRA_COMPONENTS += [
'nsSessionStore.js',
'nsSessionStore.manifest',
]
JS_MODULES_PATH = 'modules/sessionstore'
EXTRA_JS_MODULES = [
'DocumentUtils.jsm',
'SessionMigration.jsm',
'SessionStorage.jsm',
'XPathGenerator.jsm',
'_SessionFile.jsm',
]

View File

@ -10,10 +10,4 @@ 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

View File

@ -5,3 +5,10 @@
# 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',
]

View File

@ -9,12 +9,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_JS_MODULES = \
HUDService.jsm \
NetworkPanel.jsm \
WebConsolePanel.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs::

View File

@ -6,3 +6,9 @@
TEST_DIRS += ['test']
EXTRA_JS_MODULES += [
'HUDService.jsm',
'NetworkPanel.jsm',
'WebConsolePanel.jsm',
]

View File

@ -9,8 +9,4 @@ 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

View File

@ -4,3 +4,8 @@
# 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',
]

View File

@ -11,32 +11,11 @@ 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

View File

@ -6,3 +6,21 @@
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',
]