Bug 1155816 - part 1 - move NO_JS_MANIFEST to moz.build; r=mshal

python/mozbuild/mozbuild/backend/recursivemake.py

@@ -99,6 +99,7 @@ MOZBUILD_VARIABLES = [
     'MODULE',
     'MSVC_ENABLE_PGO',
     'NO_DIST_INSTALL',
+    'NO_JS_MANIFEST',
     'OS_LIBS',
     'PARALLEL_DIRS',
     'PREF_JS_EXPORTS',

python/mozbuild/mozbuild/frontend/context.py

@@ -1253,6 +1253,17 @@ VARIABLES = {
         chrome.manifest.
         """, None),
 
+    '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.
+        """, None),
+
     'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({
             'variables': dict,
             'input': unicode,

python/mozbuild/mozbuild/frontend/emitter.py

@@ -552,6 +552,7 @@ class TreeMetadataEmitter(LoggingMixin):
             'WIN32_EXE_LDFLAGS',
             'LD_VERSION_SCRIPT',
             'USE_EXTENSION_MANIFEST',
+            'NO_JS_MANIFEST',
         ]
         for v in varlist:
             if v in context and context[v]:

testing/specialpowers/Makefile.in

@@ -3,7 +3,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/.
 
-NO_JS_MANIFEST = 1
 MOZ_CHROME_FILE_FORMAT = flat
 
 TEST_EXTENSIONS_DIR = $(DEPTH)/testing/specialpowers

testing/specialpowers/moz.build

@@ -13,5 +13,6 @@ XPI_NAME = 'specialpowers'
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
+NO_JS_MANIFEST = True
 
 DIST_FILES += ['install.rdf']

tools/quitter/Makefile.in

@@ -4,4 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPI_PKGNAME = quitter@mozilla.org
-NO_JS_MANIFEST = 1

tools/quitter/moz.build

@@ -13,6 +13,7 @@ XPI_NAME = 'quitter'
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
+NO_JS_MANIFEST = True
 
 DIST_FILES += [
     'chrome.manifest',