wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 897458 - Move EXTRA_PP_JS_MODULES to moz.build; r=gps

Browse Source
This commit is contained in:
Ms2ger 2013-08-02 09:03:25 +02:00
parent 501ddf3329
commit ad06681e97
38 changed files with 111 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/migration/src/Makefile.in
View File

@ -22,9 +22,5 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DEFINES += -DHAS_SAFARI_MIGRATOR
endif
EXTRA_PP_JS_MODULES = \
MigrationUtils.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
browser/components/migration/src/moz.build
View File

@ -38,3 +38,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
LIBRARY_NAME = 'migration_s'
EXTRA_PP_JS_MODULES += [
'MigrationUtils.jsm',
]

17
browser/components/sessionstore/src/Makefile.in
View File

@ -1,17 +0,0 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
EXTRA_PP_JS_MODULES := \
SessionStore.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
browser/components/sessionstore/src/moz.build
View File

@ -20,3 +20,8 @@ EXTRA_JS_MODULES = [
'XPathGenerator.jsm',
'_SessionFile.jsm',
]
EXTRA_PP_JS_MODULES += [
'SessionStore.jsm',
]

5
browser/modules/Makefile.in
View File

@ -11,11 +11,6 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
EXTRA_PP_JS_MODULES = \
AboutHomeUtils.jsm \
RecentWindow.jsm \
$(NULL)
ifdef MOZILLA_OFFICIAL
DEFINES += -DMOZILLA_OFFICIAL=1
endif

6
browser/modules/moz.build
View File

@ -24,3 +24,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'WindowsJumpLists.jsm',
'WindowsPreviewPerTab.jsm',
]
EXTRA_PP_JS_MODULES += [
'AboutHomeUtils.jsm',
'RecentWindow.jsm',
]

1
config/rules.mk
View File

@ -18,6 +18,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
CPP_UNIT_TESTS \
DIRS \
EXTRA_PP_COMPONENTS \
EXTRA_PP_JS_MODULES \
GTEST_CMMSRCS \
GTEST_CPPSRCS \
GTEST_CSRCS \

18
dom/apps/src/Makefile.in
View File

@ -1,18 +0,0 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_PP_JS_MODULES += \
Webapps.jsm \
AppsUtils.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

6
dom/apps/src/moz.build
View File

@ -22,3 +22,9 @@ EXTRA_JS_MODULES += [
'PermissionsInstaller.jsm',
'PermissionsTable.jsm',
]
EXTRA_PP_JS_MODULES += [
'AppsUtils.jsm',
'Webapps.jsm',
]

19
dom/identity/Makefile.in
View File

@ -1,19 +0,0 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_PP_JS_MODULES = \
DOMIdentity.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
dom/identity/moz.build
View File

@ -11,3 +11,8 @@ EXTRA_COMPONENTS += [
'nsDOMIdentity.js',
'nsIDService.js',
]
EXTRA_PP_JS_MODULES += [
'DOMIdentity.jsm',
]

16
dom/phonenumberutils/Makefile.in
View File

@ -1,16 +0,0 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_PP_JS_MODULES = \
PhoneNumberUtils.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
dom/phonenumberutils/moz.build
View File

@ -12,3 +12,7 @@ EXTRA_JS_MODULES += [
'mcc_iso3166_table.jsm',
]
EXTRA_PP_JS_MODULES += [
'PhoneNumberUtils.jsm',
]

1
js/src/config/rules.mk
View File

@ -18,6 +18,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
CPP_UNIT_TESTS \
DIRS \
EXTRA_PP_COMPONENTS \
EXTRA_PP_JS_MODULES \
GTEST_CMMSRCS \
GTEST_CPPSRCS \
GTEST_CSRCS \

1
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -89,6 +89,7 @@ class TreeMetadataEmitter(object):
EXTRA_COMPONENTS='EXTRA_COMPONENTS',
EXTRA_JS_MODULES='EXTRA_JS_MODULES',
EXTRA_PP_COMPONENTS='EXTRA_PP_COMPONENTS',
EXTRA_PP_JS_MODULES='EXTRA_PP_JS_MODULES',
GTEST_CMMSRCS='GTEST_CMM_SOURCES',
GTEST_CPPSRCS='GTEST_CPP_SOURCES',
GTEST_CSRCS='GTEST_C_SOURCES',

8
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
View File

@ -112,6 +112,14 @@ VARIABLES = {
"modules" if left undefined.
"""),
'EXTRA_PP_JS_MODULES': (StrictOrderingOnAppendList, list, [],
"""Additional JavaScript files to distribute.
This variable contains a list of files to copy into
$(FINAL_TARGET)/$(JS_MODULES_PATH), after preprocessing.
JS_MODULES_PATH defaults to "modules" if left undefined.
"""),
'EXTRA_PP_COMPONENTS': (StrictOrderingOnAppendList, list, [],
"""Javascript XPCOM files.

3
python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
View File

@ -13,6 +13,9 @@ DEFINES = ['-Dbar', '-Dfoo']
EXTRA_COMPONENTS = ['bar.js', 'foo.js']
EXTRA_PP_COMPONENTS = ['bar.pp.js', 'foo.pp.js']
EXTRA_JS_MODULES = ['bar.jsm', 'foo.jsm']
EXTRA_PP_JS_MODULES = ['bar.pp.jsm', 'foo.pp.jsm']
CPP_UNIT_TESTS = ['foo.cpp']
GTEST_C_SOURCES = ['test1.c', 'test2.c']

8
python/mozbuild/mozbuild/test/backend/test_recursivemake.py
View File

@ -166,6 +166,14 @@ class TestRecursiveMakeBackend(BackendTester):
'EXTRA_PP_COMPONENTS += bar.pp.js',
'EXTRA_PP_COMPONENTS += foo.pp.js',
],
'EXTRA_JS_MODULES': [
'EXTRA_JS_MODULES += bar.jsm',
'EXTRA_JS_MODULES += foo.jsm',
],
'EXTRA_PP_JS_MODULES': [
'EXTRA_PP_JS_MODULES += bar.pp.jsm',
'EXTRA_PP_JS_MODULES += foo.pp.jsm',
],
'GTEST_CMMSRCS': [
'GTEST_CMMSRCS += test1.mm',
'GTEST_CMMSRCS += test2.mm',

3
python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
View File

@ -13,6 +13,9 @@ DEFINES=['-Dfans', '-Dtans']
EXTRA_COMPONENTS=['fans.js', 'tans.js']
EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js']
EXTRA_JS_MODULES = ['bar.jsm', 'foo.jsm']
EXTRA_PP_JS_MODULES = ['bar.pp.jsm', 'foo.pp.jsm']
CPP_UNIT_TESTS = ['foo.cpp']
GTEST_C_SOURCES = ['test1.c', 'test2.c']

2
python/mozbuild/mozbuild/test/frontend/test_emitter.py
View File

@ -133,6 +133,8 @@ class TestEmitterBasic(unittest.TestCase):
DEFINES=['-Dfans', '-Dtans'],
EXTRA_COMPONENTS=['fans.js', 'tans.js'],
EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js'],
EXTRA_JS_MODULES=['bar.jsm', 'foo.jsm'],
EXTRA_PP_JS_MODULES=['bar.pp.jsm', 'foo.pp.jsm'],
GTEST_CSRCS=['test1.c', 'test2.c'],
GTEST_CMMSRCS=['test1.mm', 'test2.mm'],
GTEST_CPPSRCS=['test1.cpp', 'test2.cpp'],

7
services/metrics/Makefile.in
View File

@ -9,12 +9,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
modules := \
dataprovider.jsm \
providermanager.jsm \
storage.jsm \
$(NULL)
testing_modules := \
mocks.jsm \
$(NULL)
@ -25,7 +19,6 @@ MAIN_JS_MODULE := Metrics.jsm
MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules
PP_TARGETS += MAIN_JS_MODULE
EXTRA_PP_JS_MODULES := $(modules)
JS_MODULES_PATH = modules/services/metrics
TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))

7
services/metrics/moz.build
View File

@ -5,3 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
TEST_DIRS += ['tests']
EXTRA_PP_JS_MODULES += [
'dataprovider.jsm',
'providermanager.jsm',
'storage.jsm',
]

17
toolkit/components/jsdownloads/src/Makefile.in
View File

@ -1,17 +0,0 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
EXTRA_PP_JS_MODULES = \
DownloadIntegration.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
toolkit/components/jsdownloads/src/moz.build
View File

@ -17,3 +17,7 @@ EXTRA_JS_MODULES += [
'Downloads.jsm',
]
EXTRA_PP_JS_MODULES += [
'DownloadIntegration.jsm',
]

4
toolkit/components/osfile/Makefile.in
View File

@ -11,10 +11,6 @@ include $(DEPTH)/config/autoconf.mk
LIBXUL_LIBRARY = 1
EXTRA_PP_JS_MODULES = \
osfile.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs::

4
toolkit/components/osfile/moz.build
View File

@ -10,3 +10,7 @@ MODULE = 'osfile'
LIBRARY_NAME = 'osfile_s'
EXTRA_PP_JS_MODULES += [
'osfile.jsm',
]

11
toolkit/components/places/Makefile.in
View File

@ -19,17 +19,6 @@ IS_COMPONENT = 1
LOCAL_INCLUDES += -I$(srcdir)/../build
ifdef MOZ_XUL
endif
EXTRA_PP_JS_MODULES = \
BookmarkHTMLUtils.jsm \
PlacesUtils.jsm \
$(NULL)
include $(topsrcdir)/config/config.mk
endif
include $(topsrcdir)/config/rules.mk

5
toolkit/components/places/moz.build
View File

@ -60,6 +60,11 @@ if CONFIG['MOZ_PLACES']:
'PlacesDBUtils.jsm',
]
EXTRA_PP_JS_MODULES += [
'BookmarkHTMLUtils.jsm',
'PlacesUtils.jsm',
]
MODULE = 'places'

4
toolkit/components/satchel/Makefile.in
View File

@ -19,8 +19,4 @@ LOCAL_INCLUDES = \
$(NULL)
EXTRA_PP_JS_MODULES = \
FormHistory.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
toolkit/components/satchel/moz.build
View File

@ -35,3 +35,8 @@ LIBRARY_NAME = 'satchel'
EXTRA_JS_MODULES += [
'nsFormAutoCompleteResult.jsm',
]
EXTRA_PP_JS_MODULES += [
'FormHistory.jsm',
]

13
toolkit/modules/Makefile.in
View File

@ -18,17 +18,4 @@ DEFINES += \
-DMOZ_BUILD_APP=$(MOZ_BUILD_APP) \
$(NULL)
EXTRA_PP_JS_MODULES = \
CertUtils.jsm \
ResetProfile.jsm \
Services.jsm \
Troubleshoot.jsm \
UpdateChannel.jsm \
WindowDraggingUtils.jsm \
$(NULL)
ifneq (Android,$(OS_TARGET))
EXTRA_PP_JS_MODULES += LightweightThemeConsumer.jsm
endif
include $(topsrcdir)/config/rules.mk

14
toolkit/modules/moz.build
View File

@ -30,3 +30,17 @@ EXTRA_JS_MODULES += [
'debug.js',
]
EXTRA_PP_JS_MODULES += [
'CertUtils.jsm',
'ResetProfile.jsm',
'Services.jsm',
'Troubleshoot.jsm',
'UpdateChannel.jsm',
'WindowDraggingUtils.jsm',
]
if 'Android' != CONFIG['OS_TARGET']:
EXTRA_PP_JS_MODULES += [
'LightweightThemeConsumer.jsm',
]

16
toolkit/mozapps/downloads/Makefile.in
View File

@ -1,16 +0,0 @@
#
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(topsrcdir)/config/config.mk
EXTRA_PP_JS_MODULES = DownloadTaskbarProgress.jsm
include $(topsrcdir)/config/rules.mk

4
toolkit/mozapps/downloads/moz.build
View File

@ -22,3 +22,7 @@ EXTRA_JS_MODULES += [
'DownloadUtils.jsm',
]
EXTRA_PP_JS_MODULES += [
'DownloadTaskbarProgress.jsm',
]

6
toolkit/mozapps/extensions/Makefile.in
View File

@ -26,12 +26,6 @@ DEFINES += -DMOZ_EM_DEBUG=1
endif
EXTRA_PP_JS_MODULES = \
AddonManager.jsm \
XPIProvider.jsm \
XPIProviderUtils.js \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_JS_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \

6
toolkit/mozapps/extensions/moz.build
View File

@ -39,3 +39,9 @@ EXTRA_JS_MODULES += [
'SpellCheckDictionaryBootstrap.js',
]
EXTRA_PP_JS_MODULES += [
'AddonManager.jsm',
'XPIProvider.jsm',
'XPIProviderUtils.js',
]

19
toolkit/webapps/Makefile.in
View File

@ -1,19 +0,0 @@
# 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/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
EXTRA_PP_JS_MODULES = \
WebappOSUtils.jsm \
WebappsInstaller.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk

5
toolkit/webapps/moz.build
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_PP_JS_MODULES += [
'WebappOSUtils.jsm',
'WebappsInstaller.jsm',
]