Merge pull request #5873 from def-/devel

Invoke xz -9 explicitly instead of trusting tar to interpret XZ_OPT
This commit is contained in:
Varriount
2017-05-26 02:11:38 -04:00
committed by GitHub

View File

@@ -679,11 +679,14 @@ RunProgram="tools\downloader.exe"
if execShellCmd("7z a -sfx7zS2.sfx -t7z $1.exe $1" % proj) != 0:
echo("External program failed (7z)")
else:
if execShellCmd("XZ_OPT=-9 gtar Jcf $1.tar.xz $1 --exclude=.DS_Store" %
if execShellCmd("gtar cf $1.tar $1 --exclude=.DS_Store" %
proj) != 0:
# try old 'tar' without --exclude feature:
if execShellCmd("XZ_OPT=-9 tar Jcf $1.tar.xz $1" % proj) != 0:
if execShellCmd("tar cf $1.tar $1" % proj) != 0:
echo("External program failed")
if execShellCmd("xz -9f $1.tar" % proj) != 0:
echo("External program failed")
finally:
setCurrentDir(oldDir)