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 1044162 - part 1 - make EXTRA_{PP_,}JS_MODULES communicate their installation path; r=mshal

Browse Source 
This patch makes EXTRA_{PP_,}JS_MODULES similar in functionality to
TESTING_JS_MODULES: we indicate the path relative to
$(FINAL_TARGET)/modules with an appropriate hierarchy of paths.
This commit is contained in:
Nathan Froyd 2014-07-25 13:40:07 -04:00
parent 8921315aa5
commit 4246e6b6ea
56 changed files with 90 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/jsat/moz.build
View File

@ -4,9 +4,7 @@
# 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/.
JS_MODULES_PATH = 'modules/accessibility'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.accessibility += [
'AccessFu.jsm',
'Constants.jsm',
'ContentControl.jsm',

4
addon-sdk/moz.build
View File

@ -8,8 +8,6 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
DIRS += ["source/modules/system"]
JS_MODULES_PATH = 'modules/sdk'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.sdk += [
'source/app-extension/bootstrap.js',
]

4
addon-sdk/source/modules/system/moz.build
View File

@ -4,8 +4,6 @@
# 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/.
JS_MODULES_PATH = 'modules/sdk/system'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.sdk.system += [
'XulApp.js',
]

4
browser/components/loop/moz.build
View File

@ -6,15 +6,13 @@
JAR_MANIFESTS += ['jar.mn']
JS_MODULES_PATH = 'modules/loop'
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
BROWSER_CHROME_MANIFESTS += [
'test/mochitest/browser.ini',
]
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.loop += [
'MozLoopAPI.jsm',
'MozLoopPushHandler.jsm',
'MozLoopService.jsm',

6
browser/components/sessionstore/moz.build
View File

@ -22,9 +22,7 @@ EXTRA_COMPONENTS += [
'nsSessionStore.manifest',
]
JS_MODULES_PATH = 'modules/sessionstore'
EXTRA_JS_MODULES = [
EXTRA_JS_MODULES.sessionstore = [
'ContentRestore.jsm',
'DocShellCapabilities.jsm',
'FrameTree.jsm',
@ -46,7 +44,7 @@ EXTRA_JS_MODULES = [
'Utils.jsm',
]
EXTRA_PP_JS_MODULES += [
EXTRA_PP_JS_MODULES.sessionstore += [
'SessionSaver.jsm',
'SessionStore.jsm',
]

4
browser/components/tabview/moz.build
View File

@ -4,9 +4,7 @@
# 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 = ['modules/utils.jsm']
JS_MODULES_PATH = 'modules/tabview'
EXTRA_JS_MODULES.tabview = ['modules/utils.jsm']
BROWSER_CHROME_MANIFESTS += [
'test/browser.ini',
]

4
browser/components/translation/moz.build
View File

@ -2,9 +2,7 @@
# 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/.
JS_MODULES_PATH = 'modules/translation'
EXTRA_JS_MODULES = [
EXTRA_JS_MODULES.translation = [
'BingTranslator.jsm',
'cld2/cld-worker.js',
'cld2/cld-worker.js.mem',

4
browser/devtools/app-manager/moz.build
View File

@ -7,9 +7,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
JS_MODULES_PATH = 'modules/devtools/app-manager'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools["app-manager"] += [
'app-projects.js',
'app-validator.js',
'builtin-adb-store.js',

4
browser/devtools/canvasdebugger/moz.build
View File

@ -3,9 +3,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/canvasdebugger'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.canvasdebugger += [
'panel.js'
]

4
browser/devtools/commandline/moz.build
View File

@ -2,9 +2,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/commandline'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.commandline += [
'commands-index.js'
]

4
browser/devtools/debugger/moz.build
View File

@ -3,9 +3,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/debugger'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.debugger += [
'debugger-commands.js',
'panel.js'
]

4
browser/devtools/eyedropper/moz.build
View File

@ -4,9 +4,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/eyedropper'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.eyedropper += [
'commands.js',
'eyedropper.js'
]

4
browser/devtools/inspector/moz.build
View File

@ -2,9 +2,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/inspector'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.inspector += [
'breadcrumbs.js',
'inspector-commands.js',
'inspector-panel.js',

4
browser/devtools/markupview/moz.build
View File

@ -6,9 +6,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
JS_MODULES_PATH = 'modules/devtools/markupview'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.markupview += [
'html-editor.js',
'markup-view.js',
]

4
browser/devtools/moz.build
View File

@ -38,8 +38,6 @@ EXTRA_COMPONENTS += [
JAR_MANIFESTS += ['jar.mn']
JS_MODULES_PATH = 'modules/devtools'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools += [
'main.js',
]

4
browser/devtools/netmonitor/moz.build
View File

@ -3,9 +3,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/netmonitor'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.netmonitor += [
'panel.js'
]

4
browser/devtools/profiler/moz.build
View File

@ -6,9 +6,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
JS_MODULES_PATH = 'modules/devtools/profiler'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.profiler += [
'cleopatra.js',
'commands.js',
'consts.js',

4
browser/devtools/responsivedesign/moz.build
View File

@ -2,9 +2,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools += [
'resize-commands.js'
]

4
browser/devtools/scratchpad/moz.build
View File

@ -4,9 +4,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/scratchpad'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.scratchpad += [
'scratchpad-commands.js',
'scratchpad-panel.js'
]

4
browser/devtools/shadereditor/moz.build
View File

@ -3,9 +3,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/shadereditor'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.shadereditor += [
'panel.js'
]

4
browser/devtools/sourceeditor/moz.build
View File

@ -4,9 +4,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/sourceeditor'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.sourceeditor += [
'autocomplete.js',
'css-autocompleter.js',
'css-tokenizer.js',

4
browser/devtools/styleinspector/moz.build
View File

@ -7,9 +7,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
JS_MODULES_PATH = 'modules/devtools/styleinspector'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.styleinspector += [
'computed-view.js',
'css-parsing-utils.js',
'rule-view.js',

4
browser/devtools/tilt/moz.build
View File

@ -2,9 +2,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/tilt'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.tilt += [
'tilt-commands.js',
'tilt-gl.js',
'tilt-math.js',

4
browser/devtools/webaudioeditor/moz.build
View File

@ -3,9 +3,7 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/webaudioeditor'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.webaudioeditor += [
'panel.js'
]

4
browser/devtools/webconsole/moz.build
View File

@ -6,9 +6,7 @@
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
JS_MODULES_PATH = 'modules/devtools/webconsole'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.webconsole += [
'console-commands.js',
'console-output.js',
'hudservice.js',

4
browser/devtools/webide/moz.build
View File

@ -12,9 +12,7 @@ DIRS += [
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
JS_MODULES_PATH = 'modules/devtools/webide'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.webide += [
'modules/addons.js',
'modules/app-manager.js',
'modules/remote-resources.js',

4
browser/experiments/moz.build
View File

@ -7,9 +7,7 @@ EXTRA_COMPONENTS += [
'ExperimentsService.js',
]
JS_MODULES_PATH = 'modules/experiments'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.experiments += [
'Experiments.jsm',
]

4
dom/media/moz.build
View File

@ -46,9 +46,7 @@ EXTRA_COMPONENTS += [
'PeerConnection.manifest',
]
JS_MODULES_PATH = 'modules/media'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.media += [
'IdpProxy.jsm',
'PeerConnectionIdp.jsm',
'RTCStatsReport.jsm',

30
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -951,8 +951,34 @@ class RecursiveMakeBackend(CommonBackend):
backend_file.write('NO_DIST_INSTALL := 1\n')
def _process_javascript_modules(self, obj, backend_file):
if obj.flavor != 'testing':
raise Exception('We only support testing JavaScriptModules instances.')
if obj.flavor not in ('extra', 'extra_pp', 'testing'):
raise Exception('Unsupported JavaScriptModules instance: %s' % obj.flavor)
if obj.flavor == 'extra':
def onelement(element, namespace):
if not element.get_strings():
return
prefix = 'extra_js_%s' % namespace.replace('/', '_')
backend_file.write('%s_FILES := %s\n'
% (prefix, ' '.join(element.get_strings())))
backend_file.write('%s_DEST = $(FINAL_TARGET)/%s\n' % (prefix, namespace))
backend_file.write('INSTALL_TARGETS += %s\n\n' % prefix)
self._process_hierarchy_elements(obj, obj.modules, 'modules', onelement)
return
if obj.flavor == 'extra_pp':
def onelement(element, namespace):
if not element.get_strings():
return
prefix = 'extra_pp_js_%s' % namespace.replace('/', '_')
backend_file.write('%s := %s\n'
% (prefix, ' '.join(element.get_strings())))
backend_file.write('%s_PATH = $(FINAL_TARGET)/%s\n' % (prefix, namespace))
backend_file.write('PP_TARGETS += %s\n\n' % prefix)
self._process_hierarchy_elements(obj, obj.modules, 'modules', onelement)
return
if not self.environment.substs.get('ENABLE_TESTS', False):
return

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

@ -373,9 +373,7 @@ class TreeMetadataEmitter(LoggingMixin):
'EXTRA_COMPILE_FLAGS',
'EXTRA_COMPONENTS',
'EXTRA_DSO_LDOPTS',
'EXTRA_JS_MODULES',
'EXTRA_PP_COMPONENTS',
'EXTRA_PP_JS_MODULES',
'FAIL_ON_WARNINGS',
'FILES_PER_UNIFIED_FILE',
'USE_STATIC_LIBS',
@ -507,6 +505,14 @@ class TreeMetadataEmitter(LoggingMixin):
'HOST_USE_LIBS' if kind == 'HOST_SIMPLE_PROGRAMS'
else 'USE_LIBS'))
extra_js_modules = sandbox.get('EXTRA_JS_MODULES')
if extra_js_modules:
yield JavaScriptModules(sandbox, extra_js_modules, 'extra')
extra_pp_js_modules = sandbox.get('EXTRA_PP_JS_MODULES')
if extra_pp_js_modules:
yield JavaScriptModules(sandbox, extra_pp_js_modules, 'extra_pp')
test_js_modules = sandbox.get('TESTING_JS_MODULES')
if test_js_modules:
yield JavaScriptModules(sandbox, test_js_modules, 'testing')

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

@ -186,7 +186,7 @@ VARIABLES = {
``$(FINAL_TARGET)/components/``.
""", 'libs'),
'EXTRA_JS_MODULES': (StrictOrderingOnAppendList, list,
'EXTRA_JS_MODULES': (HierarchicalStringList, list,
"""Additional JavaScript files to distribute.
This variable contains a list of files to copy into
@ -194,7 +194,7 @@ VARIABLES = {
to ``modules`` if left undefined.
""", 'libs'),
'EXTRA_PP_JS_MODULES': (StrictOrderingOnAppendList, list,
'EXTRA_PP_JS_MODULES': (HierarchicalStringList, list,
"""Additional JavaScript files to distribute.
This variable contains a list of files to copy into

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

@ -7,9 +7,6 @@ SOURCES += ['bar.s', 'foo.asm']
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']
HOST_SOURCES += ['bar.cpp', 'foo.cpp']
HOST_SOURCES += ['bar.c', 'foo.c']

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

@ -276,14 +276,6 @@ 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',
],
'FAIL_ON_WARNINGS': [
'FAIL_ON_WARNINGS := 1',
],

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

@ -7,9 +7,6 @@ SOURCES += ['fans.asm', 'tans.s']
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']
HOST_SOURCES += ['fans.cpp', 'tans.cpp']
HOST_SOURCES += ['fans.c', 'tans.c']

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

@ -154,8 +154,6 @@ class TestEmitterBasic(unittest.TestCase):
DISABLE_STL_WRAPPING=True,
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'],
FAIL_ON_WARNINGS=True,
HOST_CPPSRCS=['fans.cpp', 'tans.cpp'],
HOST_CSRCS=['fans.c', 'tans.c'],

4
services/metrics/moz.build
View File

@ -6,14 +6,12 @@
TEST_DIRS += ['tests']
EXTRA_PP_JS_MODULES += [
EXTRA_PP_JS_MODULES.services.metrics += [
'dataprovider.jsm',
'providermanager.jsm',
'storage.jsm',
]
JS_MODULES_PATH = 'modules/services/metrics'
TESTING_JS_MODULES.services.metrics += [
'modules-testing/mocks.jsm',
]

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

@ -4,9 +4,7 @@
# 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/.
JS_MODULES_PATH = 'modules/osfile'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.osfile += [
'osfile_async_front.jsm',
'osfile_async_worker.js',
'osfile_native.jsm',

4
toolkit/components/promiseworker/worker/moz.build
View File

@ -4,8 +4,6 @@
# 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/.
JS_MODULES_PATH = 'modules/workers'
EXTRA_JS_MODULES = [
EXTRA_JS_MODULES.workers = [
'PromiseWorker.js',
]

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

@ -6,8 +6,6 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
JS_MODULES_PATH = 'modules/sqlite'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.sqlite += [
'sqlite_internal.js',
]

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

@ -6,8 +6,6 @@
MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
JS_MODULES_PATH = 'modules/workers'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.workers += [
'require.js'
]

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

@ -6,9 +6,7 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
JS_MODULES_PATH = 'modules/workers'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.workers += [
'lz4.js',
'lz4_internal.js',
]

2
toolkit/crashreporter/test/Makefile.in
View File

@ -5,7 +5,7 @@
EXTRA_LIBS += $(NSPR_LIBS)
UNIT_FILES = $(SHARED_LIBRARY) $(EXTRA_JS_MODULES)
UNIT_FILES = $(SHARED_LIBRARY) CrashTestUtils.jsm
UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
INSTALL_TARGETS += UNIT

4
toolkit/devtools/acorn/moz.build
View File

@ -6,9 +6,7 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
JS_MODULES_PATH = 'modules/devtools/acorn'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.acorn += [
'acorn.js',
'acorn_loose.js',
'walk.js',

4
toolkit/devtools/apps/moz.build
View File

@ -5,9 +5,7 @@
TEST_DIRS += ['tests']
JS_MODULES_PATH = 'modules/devtools'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools += [
'app-actor-front.js',
'Devices.jsm',
'Simulator.jsm'

4
toolkit/devtools/discovery/moz.build
View File

@ -6,8 +6,6 @@
TEST_DIRS += ['tests']
JS_MODULES_PATH = 'modules/devtools/discovery'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.discovery += [
'discovery.js',
]

4
toolkit/devtools/jsbeautify/moz.build
View File

@ -6,9 +6,7 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
JS_MODULES_PATH = 'modules/devtools/jsbeautify'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.jsbeautify += [
'beautify.js',
'lib/sanitytest.js',
'lib/urlencode_unpacker.js',

4
toolkit/devtools/pretty-fast/moz.build
View File

@ -6,8 +6,6 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
JS_MODULES_PATH = 'modules/devtools'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools += [
'pretty-fast.js',
]

4
toolkit/devtools/qrcode/decoder/moz.build
View File

@ -4,8 +4,6 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/qrcode/decoder'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.qrcode.decoder += [
'index.js',
]

4
toolkit/devtools/qrcode/encoder/moz.build
View File

@ -4,8 +4,6 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/qrcode/encoder'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.qrcode.encoder += [
'index.js',
]

4
toolkit/devtools/qrcode/moz.build
View File

@ -9,9 +9,7 @@ DIRS += [
'encoder'
]
JS_MODULES_PATH = 'modules/devtools/qrcode'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.qrcode += [
'index.js',
]

4
toolkit/devtools/styleinspector/moz.build
View File

@ -4,8 +4,6 @@
# 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/.
JS_MODULES_PATH = 'modules/devtools/styleinspector'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.styleinspector += [
'css-logic.js'
]

4
toolkit/devtools/tern/moz.build
View File

@ -6,9 +6,7 @@
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
JS_MODULES_PATH = 'modules/devtools/tern'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.tern += [
'browser.js',
'comment.js',
'condense.js',

4
toolkit/devtools/transport/moz.build
View File

@ -6,9 +6,7 @@
TEST_DIRS += ['tests']
JS_MODULES_PATH = 'modules/devtools/transport'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.transport += [
'packets.js',
'stream-utils.js',
'transport.js'

4
toolkit/devtools/webconsole/moz.build
View File

@ -8,9 +8,7 @@ if CONFIG['OS_TARGET'] != 'Android':
MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
JS_MODULES_PATH = 'modules/devtools/toolkit/webconsole'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.devtools.toolkit.webconsole += [
'client.js',
'network-helper.js',
'network-monitor.js',

6
toolkit/identity/moz.build
View File

@ -17,9 +17,7 @@ SOURCES += [
'IdentityCryptoService.cpp',
]
JS_MODULES_PATH = 'modules/identity'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.identity += [
'Identity.jsm',
'IdentityProvider.jsm',
'IdentityStore.jsm',
@ -31,7 +29,7 @@ EXTRA_JS_MODULES += [
'Sandbox.jsm',
]
EXTRA_PP_JS_MODULES += [
EXTRA_PP_JS_MODULES.identity += [
'FirefoxAccounts.jsm',
]

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

@ -4,9 +4,7 @@
# 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/.
JS_MODULES_PATH = 'modules/addons'
EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.addons += [
'AddonLogging.jsm',
'AddonRepository.jsm',
'AddonRepository_SQLiteMigrator.jsm',
@ -18,7 +16,7 @@ EXTRA_JS_MODULES += [
'SpellCheckDictionaryBootstrap.js',
]
EXTRA_PP_JS_MODULES += [
EXTRA_PP_JS_MODULES.addons += [
'XPIProvider.jsm',
'XPIProviderUtils.js',
]