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 1094302 - Move JS module installation into the misc tier; r=glandium

Browse Source 
JS module installation performs simple file copying or preprocessing.
There is no reason it can't occur in parallel. Move it to the misc tier.

As part of this, I recognized that TESTING_JS_MODULES was assigned to a
tier. Since these files are managed by an install manifest, they don't
belong to any tier. So the tier is now listed as None.

--HG--
extra : rebase_source : 963f0813e43802c017837ce9d55f8e666decd76a
This commit is contained in:
Gregory Szorc 2014-11-05 09:47:14 -08:00
parent 300dead6a6
commit ce35427666
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -922,6 +922,7 @@ INSTALL_TARGETS += %(prefix)s
% (prefix, ' '.join(strings)))
backend_file.write('%s_DEST = %s\n' %
(prefix, mozpath.join('$(FINAL_TARGET)', 'modules', path)))
backend_file.write('%s_TARGET := misc\n' % prefix)
backend_file.write('INSTALL_TARGETS += %s\n\n' % prefix)
return
@ -935,6 +936,7 @@ INSTALL_TARGETS += %(prefix)s
% (prefix, ' '.join(strings)))
backend_file.write('%s_PATH = %s\n' %
(prefix, mozpath.join('$(FINAL_TARGET)', 'modules', path)))
backend_file.write('%s_TARGET := misc\n' % prefix)
backend_file.write('PP_TARGETS += %s\n\n' % prefix)
return

6
python/mozbuild/mozbuild/frontend/context.py
View File

@ -518,14 +518,14 @@ VARIABLES = {
This variable contains a list of files to copy into
``$(FINAL_TARGET)/modules.
""", 'libs'),
""", 'misc'),
'EXTRA_PP_JS_MODULES': (HierarchicalStringList, list,
"""Additional JavaScript files to distribute.
This variable contains a list of files to copy into
``$(FINAL_TARGET)/modules``, after preprocessing.
""", 'libs'),
""", 'misc'),
'TESTING_JS_MODULES': (HierarchicalStringList, list,
"""JavaScript modules to install in the test-only destination.
@ -537,7 +537,7 @@ VARIABLES = {
variable to control the final destination. e.g.
``TESTING_JS_MODULES.foo += ['module.jsm']``.
""", 'libs'),
""", None),
'EXTRA_PP_COMPONENTS': (StrictOrderingOnAppendList, list,
"""Javascript XPCOM files.