Bug 1155776 - move USE_EXTENSION_MANIFEST to moz.build; r=mshal

layout/tools/reftest/Makefile.in

@@ -3,9 +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/.
 
-# Used in install.rdf
-USE_EXTENSION_MANIFEST=1
-
 _DEST_DIR = $(DEPTH)/_tests/reftest
 
 _HARNESS_FILES = \

layout/tools/reftest/moz.build

@@ -19,6 +19,8 @@ else:
 
 JAR_MANIFESTS += ['jar.mn']
 
+USE_EXTENSION_MANIFEST = True
+
 XPI_NAME = 'reftest'
 
 DIST_FILES += ['install.rdf']

python/mozbuild/mozbuild/backend/recursivemake.py

@@ -114,6 +114,8 @@ MOZBUILD_VARIABLES = [
     'STATIC_LIBRARY_NAME',
     'TEST_DIRS',
     'TOOL_DIRS',
+    # XXX config/Makefile.in specifies this in a make invocation
+    #'USE_EXTENSION_MANIFEST',
     'XPCSHELL_TESTS',
     'XPIDL_MODULE',
 ]

python/mozbuild/mozbuild/frontend/context.py

@@ -1245,6 +1245,14 @@ VARIABLES = {
         the $(DIST_SUBDIR) directory of the otherwise default value is used.
         """, None),
 
+    'USE_EXTENSION_MANIFEST': (bool, bool,
+        """Controls the name of the manifest for JAR files.
+
+        By default, the name of the manifest is ${JAR_MANIFEST}.manifest.
+        Setting this variable to ``True`` changes the name of the manifest to
+        chrome.manifest.
+        """, None),
+
     'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({
             'variables': dict,
             'input': unicode,

python/mozbuild/mozbuild/frontend/emitter.py

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

testing/mochitest/Makefile.in

@@ -6,9 +6,6 @@
 NO_JS_MANIFEST = 1
 MOZ_CHROME_FILE_FORMAT = jar
 
-# Used in install.rdf
-USE_EXTENSION_MANIFEST = 1
-
 _DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir)
 
 include $(topsrcdir)/config/rules.mk

testing/mochitest/moz.build

@@ -18,6 +18,8 @@ XPI_NAME = 'mochijar'
 
 JAR_MANIFESTS += ['jar.mn']
 
+USE_EXTENSION_MANIFEST = True
+
 DIST_FILES += ['install.rdf']
 
 MOCHITEST_MANIFESTS += [

testing/specialpowers/Makefile.in

@@ -6,9 +6,6 @@
 NO_JS_MANIFEST = 1
 MOZ_CHROME_FILE_FORMAT = flat
 
-# Used in install.rdf
-USE_EXTENSION_MANIFEST=1
-
 TEST_EXTENSIONS_DIR = $(DEPTH)/testing/specialpowers
 
 include $(topsrcdir)/config/rules.mk

testing/specialpowers/moz.build

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

tools/quitter/Makefile.in

@@ -5,6 +5,3 @@
 
 XPI_PKGNAME = quitter@mozilla.org
 NO_JS_MANIFEST = 1
-
-# Used in install.rdf
-USE_EXTENSION_MANIFEST=1

tools/quitter/moz.build

@@ -12,6 +12,8 @@ XPI_NAME = 'quitter'
 
 JAR_MANIFESTS += ['jar.mn']
 
+USE_EXTENSION_MANIFEST = True
+
 DIST_FILES += [
     'chrome.manifest',
     'install.rdf',