From d264a57b766ecfc45f115e320bd74331f5514a5f Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 17 Apr 2015 13:51:42 -0400
Subject: [PATCH] Bug 1155776 - move USE_EXTENSION_MANIFEST to moz.build;
 r=mshal

---
 layout/tools/reftest/Makefile.in                  | 3 ---
 layout/tools/reftest/moz.build                    | 2 ++
 python/mozbuild/mozbuild/backend/recursivemake.py | 2 ++
 python/mozbuild/mozbuild/frontend/context.py      | 8 ++++++++
 python/mozbuild/mozbuild/frontend/emitter.py      | 1 +
 testing/mochitest/Makefile.in                     | 3 ---
 testing/mochitest/moz.build                       | 2 ++
 testing/specialpowers/Makefile.in                 | 3 ---
 testing/specialpowers/moz.build                   | 2 ++
 tools/quitter/Makefile.in                         | 3 ---
 tools/quitter/moz.build                           | 2 ++
 11 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in
index 8c649b94d7a7..f318ca328b23 100644
--- a/layout/tools/reftest/Makefile.in
+++ b/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 = \
diff --git a/layout/tools/reftest/moz.build b/layout/tools/reftest/moz.build
index f6209bd9465f..c3ded8748699 100644
--- a/layout/tools/reftest/moz.build
+++ b/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']
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 4f44a9fad99a..85199ea6bcbe 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/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',
 ]
diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
index 4fde1823c9c1..9e3bd35eb0f1 100644
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/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,
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 5afb73cab76d..70695d516dd0 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/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]:
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 91cf8099c587..4b26118c167b 100644
--- a/testing/mochitest/Makefile.in
+++ b/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
diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build
index c24c07a092cc..36b0d9816395 100644
--- a/testing/mochitest/moz.build
+++ b/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 += [
diff --git a/testing/specialpowers/Makefile.in b/testing/specialpowers/Makefile.in
index dc77bc76c0ad..2bfc84ab887c 100644
--- a/testing/specialpowers/Makefile.in
+++ b/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
diff --git a/testing/specialpowers/moz.build b/testing/specialpowers/moz.build
index 9b2d85a8fe21..ace86c6a8f06 100644
--- a/testing/specialpowers/moz.build
+++ b/testing/specialpowers/moz.build
@@ -12,4 +12,6 @@ XPI_NAME = 'specialpowers'
 
 JAR_MANIFESTS += ['jar.mn']
 
+USE_EXTENSION_MANIFEST = True
+
 DIST_FILES += ['install.rdf']
diff --git a/tools/quitter/Makefile.in b/tools/quitter/Makefile.in
index f65e3d1e4ca7..264c6ca21a0c 100644
--- a/tools/quitter/Makefile.in
+++ b/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
diff --git a/tools/quitter/moz.build b/tools/quitter/moz.build
index 763a63cb0c96..1265617d36bc 100644
--- a/tools/quitter/moz.build
+++ b/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',