Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Froyd 2015-04-17 13:51:42 -04:00
parent 8cbff2f82a
commit d264a57b76
11 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/tools/reftest/Makefile.in
View File

@ -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 = \

2
layout/tools/reftest/moz.build
View File

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

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

@ -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',
]

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

@ -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,

1
python/mozbuild/mozbuild/frontend/emitter.py
View File

@ -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]:

3
testing/mochitest/Makefile.in
View File

@ -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

2
testing/mochitest/moz.build
View File

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

3
testing/specialpowers/Makefile.in
View File

@ -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

2
testing/specialpowers/moz.build
View File

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

3
tools/quitter/Makefile.in
View File

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

2
tools/quitter/moz.build
View File

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