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

Bug 1651680 - Replace PKG_SKIP_STRIP with PKG_STRIP. r=nalexander

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D86648
This commit is contained in:
Mike Hommey 2020-08-11 02:44:17 +00:00
parent 23ffaf1a19
commit c9ae9101aa
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moz.configure
View File

@ -682,13 +682,7 @@ set_config('ENABLE_STRIP', True, when='--enable-strip')
js_option('--disable-install-strip', when=may_strip,
help='Enable stripping of libs & executables when packaging')
# The nested depends is because depending on --enable-install-strip needs the
# `when=may_strip`, but we also need to test when may_strip is False.
@depends(depends('--enable-install-strip', when=may_strip)(lambda x: x), may_strip)
def pkg_skip_strip(install_strip, may_strip):
return not install_strip or not may_strip
set_config('PKG_SKIP_STRIP', True, when=pkg_skip_strip)
set_config('PKG_STRIP', True, when='--enable-install-strip')
@depends('--enable-strip', '--enable-install-strip', when=may_strip)

2
python/mozbuild/mozpack/executables.py
View File

@ -86,7 +86,7 @@ def may_strip(path):
Return whether strip() should be called
'''
from buildconfig import substs
return not substs.get('PKG_SKIP_STRIP')
return bool(substs.get('PKG_STRIP'))
def strip(path):

2
testing/testsuite-targets.mk
View File

@ -196,7 +196,7 @@ stage-jstests: make-stage-dir
ifdef OBJCOPY
ifneq ($(OBJCOPY), :) # see build/autoconf/toolchain.m4:102 for why this is necessary
ifndef PKG_SKIP_STRIP
ifdef PKG_STRIP
STRIP_COMPILED_TESTS := 1
endif
endif

2
toolkit/mozapps/installer/l10n-repack.py
View File

@ -50,7 +50,7 @@ def main():
args = parser.parse_args()
buildconfig.substs['USE_ELF_HACK'] = False
buildconfig.substs['PKG_SKIP_STRIP'] = True
buildconfig.substs['PKG_STRIP'] = False
l10n.repack(args.build, args.l10n, extra_l10n=dict(args.extra_l10n),
non_resources=args.non_resource, non_chrome=NON_CHROME)

2
toolkit/mozapps/installer/strip.py
View File

@ -14,7 +14,7 @@ def strip(dir):
copier = FileCopier()
# The FileFinder will give use ExecutableFile instances for files
# that can be stripped, and copying ExecutableFiles defaults to
# stripping them unless buildconfig.substs['PKG_SKIP_STRIP'] is set.
# stripping them when buildconfig.substs['PKG_STRIP'] is set.
for p, f in FileFinder(dir, find_executables=True):
copier.add(p, f)
copier.copy(dir)

2
toolkit/mozapps/installer/unpack.py
View File

@ -18,7 +18,7 @@ def main():
options = parser.parse_args(sys.argv[1:])
buildconfig.substs['USE_ELF_HACK'] = False
buildconfig.substs['PKG_SKIP_STRIP'] = True
buildconfig.substs['PKG_STRIP'] = False
unpack(options.directory, options.omnijar)
if __name__ == "__main__":