Bug 1499153 - Remove obsolete manifest check and NO_JS_MANIFEST r=glandium

Bug 1438688 made it so that XPT information is compiled directly into
the binary instead of being shipped separately in interface
files. This means that manifests are no longer necessary for JS
components, which means the manifest check in emitter.py can be
removed.

That check is the only use of NO_JS_MANIFEST, so that can in turn be
removed entirely.

Differential Revision: https://phabricator.services.mozilla.com/D8885

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrew McCreight 2018-10-16 22:35:15 +00:00
Родитель d69003537d
Коммит 7988e5e654
6 изменённых файлов: 0 добавлений и 26 удалений

Просмотреть файл

@ -7,7 +7,6 @@
XPI_NAME = 'mozscreenshots' XPI_NAME = 'mozscreenshots'
USE_EXTENSION_MANIFEST = True USE_EXTENSION_MANIFEST = True
NO_JS_MANIFEST = True
FINAL_TARGET_FILES += [ FINAL_TARGET_FILES += [
'api.js', 'api.js',

Просмотреть файл

@ -113,7 +113,6 @@ MOZBUILD_VARIABLES = [
b'NO_DIST_INSTALL', b'NO_DIST_INSTALL',
b'NO_EXPAND_LIBS', b'NO_EXPAND_LIBS',
b'NO_INTERFACES_MANIFEST', b'NO_INTERFACES_MANIFEST',
b'NO_JS_MANIFEST',
b'OS_LIBS', b'OS_LIBS',
b'PARALLEL_DIRS', b'PARALLEL_DIRS',
b'PREF_JS_EXPORTS', b'PREF_JS_EXPORTS',

Просмотреть файл

@ -1928,17 +1928,6 @@ VARIABLES = {
chrome.manifest. chrome.manifest.
"""), """),
'NO_JS_MANIFEST': (bool, bool,
"""Explicitly disclaims responsibility for manifest listing in EXTRA_COMPONENTS.
Normally, if you have .js files listed in ``EXTRA_COMPONENTS`` or
``EXTRA_PP_COMPONENTS``, you are expected to have a corresponding
.manifest file to go with those .js files. Setting ``NO_JS_MANIFEST``
indicates that the relevant .manifest file and entries for those .js
files are elsehwere (jar.mn, for instance) and this state of affairs
is OK.
"""),
'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({ 'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({
'variables': dict, 'variables': dict,
'input': unicode, 'input': unicode,

Просмотреть файл

@ -1037,7 +1037,6 @@ class TreeMetadataEmitter(LoggingMixin):
'RCINCLUDE', 'RCINCLUDE',
'WIN32_EXE_LDFLAGS', 'WIN32_EXE_LDFLAGS',
'USE_EXTENSION_MANIFEST', 'USE_EXTENSION_MANIFEST',
'NO_JS_MANIFEST',
'HAS_MISC_RULE', 'HAS_MISC_RULE',
] ]
for v in varlist: for v in varlist:
@ -1300,16 +1299,6 @@ class TreeMetadataEmitter(LoggingMixin):
yield cls(context, all_files) yield cls(context, all_files)
# Check for manifest declarations in EXTRA_{PP_,}COMPONENTS.
if any(e.endswith('.js') for e in components) and \
not any(e.endswith('.manifest') for e in components) and \
not context.get('NO_JS_MANIFEST', False):
raise SandboxValidationError('A .js component was specified in EXTRA_COMPONENTS '
'or EXTRA_PP_COMPONENTS without a matching '
'.manifest file. See '
'https://developer.mozilla.org/en/XPCOM/XPCOM_changes_in_Gecko_2.0 .',
context);
for c in components: for c in components:
if c.endswith('.manifest'): if c.endswith('.manifest'):
yield ChromeManifestEntry(context, 'chrome.manifest', yield ChromeManifestEntry(context, 'chrome.manifest',

Просмотреть файл

@ -7,7 +7,6 @@
XPI_NAME = 'specialpowers' XPI_NAME = 'specialpowers'
USE_EXTENSION_MANIFEST = True USE_EXTENSION_MANIFEST = True
NO_JS_MANIFEST = True
FINAL_TARGET_FILES += [ FINAL_TARGET_FILES += [
'api.js', 'api.js',

Просмотреть файл

@ -9,7 +9,6 @@ XPI_NAME = 'quitter'
JAR_MANIFESTS += ['jar.mn'] JAR_MANIFESTS += ['jar.mn']
USE_EXTENSION_MANIFEST = True USE_EXTENSION_MANIFEST = True
NO_JS_MANIFEST = True
FINAL_TARGET_FILES += [ FINAL_TARGET_FILES += [
'bootstrap.js', 'bootstrap.js',