bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add new CEF_COMMAND_7ZIP_FORMAT env var to support different compression formats (issue #1067)

This commit is contained in:
Marshall Greenblatt 2016-05-17 13:52:31 -04:00
parent ca928bd3f7
commit 0b3d93cc8f
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/make_distrib.py
View File

@ -14,8 +14,9 @@ import git_util as git
import sys import sys
import zipfile import zipfile
def create_archive(input_dir, zip_file): def create_archive(input_dir):
""" Creates a zip archive of the specified input directory. """ """ Creates a zip archive of the specified input directory. """
zip_file = input_dir + '.zip'
zf = zipfile.ZipFile(zip_file, 'w', zipfile.ZIP_DEFLATED, True) zf = zipfile.ZipFile(zip_file, 'w', zipfile.ZIP_DEFLATED, True)
def addDir(dir): def addDir(dir):
for f in os.listdir(dir): for f in os.listdir(dir):
@ -28,10 +29,30 @@ def create_archive(input_dir, zip_file):
addDir(input_dir) addDir(input_dir)
zf.close() zf.close()
def create_7z_archive(input_dir, zip_file): def create_7z_archive(input_dir, format):
""" Creates a 7z archive of the specified input directory. """ """ Creates a 7z archive of the specified input directory. """
# CEF_COMMAND_7ZIP might be "c:\Program Files (x86)\7Zip\7z.exe" or /usr/bin/7za
# or simply 7z if the user knows that it's in the PATH var. Supported formats
# depend on the 7za version -- check the 7-zip documentation for details.
command = os.environ['CEF_COMMAND_7ZIP'] command = os.environ['CEF_COMMAND_7ZIP']
run('"' + command + '" a -y ' + zip_file + ' ' + input_dir, os.path.split(zip_file)[0]) working_dir = os.path.abspath(os.path.join(input_dir, os.pardir))
tar_file = None
if format in ('xz', 'gzip', 'bzip2'):
# These formats only support one file per archive. Create a tar file first.
tar_file = input_dir + '.tar'
run('"%s" a -ttar -y %s %s' % (command, tar_file, input_dir), working_dir)
zip_file = tar_file + '.' + format
zip_input = tar_file
else:
zip_file = input_dir + '.' + format
zip_input = input_dir
# Create the compressed archive.
run('"%s" a -t%s -y %s %s' % (command, format, zip_file, zip_input), working_dir)
if not tar_file is None:
remove_file(tar_file)
def create_output_dir(name, parent_dir): def create_output_dir(name, parent_dir):
""" Creates an output directory and adds the path to the archive list. """ """ Creates an output directory and adds the path to the archive list. """
@ -722,14 +743,14 @@ elif platform == 'linux':
if not options.noarchive: if not options.noarchive:
# create an archive for each output directory # create an archive for each output directory
archive_extension = '.zip' archive_format = 'zip'
if os.getenv('CEF_COMMAND_7ZIP', '') != '': if os.getenv('CEF_COMMAND_7ZIP', '') != '':
archive_extension = '.7z' archive_format = os.getenv('CEF_COMMAND_7ZIP_FORMAT', '7z')
for dir in archive_dirs: for dir in archive_dirs:
zip_file = os.path.split(dir)[1] + archive_extension
if not options.quiet: if not options.quiet:
sys.stdout.write('Creating '+zip_file+"...\n") sys.stdout.write("Creating archive for %s...\n" % os.path.split(dir)[1])
if archive_extension == '.zip': if archive_format == 'zip':
create_archive(dir, os.path.join(dir, os.pardir, zip_file)) create_archive(dir)
else: else:
create_7z_archive(dir, os.path.join(dir, os.pardir, zip_file)) create_7z_archive(dir, archive_format)