Backed out changeset f9cf33c52739 (bug 1498715) on request by nalexander for local developer failures. a=backout
authorDaniel Varga <dvarga@mozilla.com>
Wed, 17 Oct 2018 22:02:34 +0300
changeset 500198 8d6a97e2a3570e5ed13d404aabcaab41ee53c813
parent 500169 4c944453210c428f505bc2d81b3b7f1c99a262a6
child 500322 bfd23ad81ef4074f395036cc62fa31ff3cd97f96
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1498715
milestone64.0a1
backs outf9cf33c52739b06905c182b286fa2b4d1b0f3890
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f9cf33c52739 (bug 1498715) on request by nalexander for local developer failures. a=backout
python/mozbuild/mozpack/executables.py
--- a/python/mozbuild/mozpack/executables.py
+++ b/python/mozbuild/mozpack/executables.py
@@ -123,18 +123,16 @@ def elfhack(path):
     if subprocess.call(cmd) != 0:
         errors.fatal('Error executing ' + ' '.join(cmd))
 
 
 def xz_compress(path):
     '''
     Execute xz to compress the given path.
     '''
-    path = os.path.abspath(path)
-
     if open(path, 'rb').read(5)[1:] == '7zXZ':
         print('%s is already compressed' % path)
         return
     
     from buildconfig import substs
     xz = substs.get('XZ')
     cmd = [xz, '-zkf', path]
 
@@ -152,33 +150,20 @@ def xz_compress(path):
     elif substs.get('CPU_ARCH') == 'x86':
         bcj = '--x86'
 
     if bcj:
         cmd.extend([bcj])
 
     # We need to explicitly specify the LZMA filter chain to ensure consistent builds
     # across platforms. Note that the dict size must be less then 16MiB per the hardcoded
-    # value in mozglue/linker/XZStream.cpp. See:
+    # value in mozglue/linker/XZStream.cpp. This is the default LZMA filter chain for for
+    # xz-utils version 5.0. See:
     # https://github.com/xz-mirror/xz/blob/v5.0.0/src/liblzma/lzma/lzma_encoder_presets.c
     # https://github.com/xz-mirror/xz/blob/v5.0.0/src/liblzma/api/lzma/container.h#L31
-
-    if not substs.get('DEVELOPER_OPTIONS'):
-        # This is the default LZMA filter chain for for xz-utils version 5.0. See:
-        cmd.extend(['--lzma2=dict=8MiB,lc=3,lp=0,pb=2,mode=normal,nice=64,mf=bt4,depth=0'])
-    else:
-        # This is the filter chain for level=3, which is the highest
-        # compression fast preset.
-        cmd.extend(['--lzma2=dict=8MiB,lc=3,lp=0,pb=2,mode=fast,nice=273,mf=hc4,depth=24'])
-
-    print('xz-compressing %s with "%s"...' % (path, ' '.join(cmd)))
-
-    import time
-    t0 = time.time()
+    cmd.extend(['--lzma2=dict=8MiB,lc=3,lp=0,pb=2,mode=normal,nice=64,mf=bt4,depth=0'])
+    print('xz-compressing %s with %s' % (path, ' '.join(cmd)))
 
     if subprocess.call(cmd) != 0:
         errors.fatal('Error executing ' + ' '.join(cmd))
         return
 
-    elapsed = time.time() - t0
-    print('xz-compressing %s with "%s"... DONE (%.2fs)' % (path, ' '.join(cmd), elapsed))
-
     os.rename(path + '.xz', path)