Backed out 1 changesets (bug 1393817) for failing to repackage the nightly build on Windows a=backout.

Backed out changeset 25f21f22a34b (bug 1393817)
This commit is contained in:
dluca 2017-11-09 15:34:00 +02:00
Родитель 1b0413a887
Коммит 6d9443afa6
2 изменённых файлов: 5 добавлений и 2 удалений

Просмотреть файл

@ -8,6 +8,10 @@
# MinGW does not have (or need) makecab
unset MAKECAB
# These aren't supported on mingw at this time
# Bug 1393817
MOZ_AUTOMATION_L10N_CHECK=0
# Sets:
# build/mozconfig.common
# AUTOCLOBBER=1

Просмотреть файл

@ -9,7 +9,6 @@ import shutil
import sys
import subprocess
import tempfile
import buildconfig
import mozpack.path as mozpath
def archive_exe(pkg_dir, tagfile, sfx_package, package):
@ -19,7 +18,7 @@ def archive_exe(pkg_dir, tagfile, sfx_package, package):
shutil.move(pkg_dir, 'core')
subprocess.check_call(['upx', '--best', '-o', mozpath.join(tmpdir, '7zSD.sfx'), sfx_package])
subprocess.check_call([buildconfig.substs['7Z'], 'a', '-r', '-t7z', mozpath.join(tmpdir, 'app.7z'), '-mx', '-m0=BCJ2', '-m1=LZMA:d25', '-m2=LZMA:d19', '-m3=LZMA:d19', '-mb0:1', '-mb0s1:2', '-mb0s2:3'])
subprocess.check_call(['7z', 'a', '-r', '-t7z', mozpath.join(tmpdir, 'app.7z'), '-mx', '-m0=BCJ2', '-m1=LZMA:d25', '-m2=LZMA:d19', '-m3=LZMA:d19', '-mb0:1', '-mb0s1:2', '-mb0s2:3'])
with open(package, 'wb') as o:
for i in [mozpath.join(tmpdir, '7zSD.sfx'), tagfile, mozpath.join(tmpdir, 'app.7z')]: