admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optionally keep the downloaded archives (#930)

Browse Source 
Prevent downloading the tool archives all over again, if you
switch some emscripten or tool version.
This commit is contained in:
Jan-Marek Glogowski
2021-12-20 17:52:58 +01:00
committed by GitHub
parent 75ab7cf422
commit bb9a6a326f
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
emsdk.py
View File

@@ -143,6 +143,9 @@ BUILD_FOR_TESTING = False
# Other valid values are 'ON' and 'OFF' # Other valid values are 'ON' and 'OFF'
ENABLE_LLVM_ASSERTIONS = 'auto' ENABLE_LLVM_ASSERTIONS = 'auto'
# If true, keeps the downloaded archive files.
KEEP_DOWNLOADS = bool(os.getenv('EMSDK_KEEP_DOWNLOADS'))
def os_name(): def os_name():
if WINDOWS: if WINDOWS:
@@ -1537,13 +1540,8 @@ def download_and_unzip(zipfile, dest_dir, download_even_if_exists=False,
if not download_even_if_exists and num_files_in_directory(dest_dir) > 0: if not download_even_if_exists and num_files_in_directory(dest_dir) > 0:
print("The contents of file '" + zipfile + "' already exist in destination '" + dest_dir + "', skipping.") print("The contents of file '" + zipfile + "' already exist in destination '" + dest_dir + "', skipping.")
return True return True
# Otherwise, if the archive must be downloaded, always write into the
# target directory, since it may be a new version of a tool that gets
# installed to the same place (that is, a different download name
# indicates different contents).
download_even_if_exists = True
received_download_target = download_file(url, zips_subdir, download_even_if_exists, filename_prefix) received_download_target = download_file(url, zips_subdir, not KEEP_DOWNLOADS, filename_prefix)
if not received_download_target: if not received_download_target:
return False return False
assert received_download_target == download_target assert received_download_target == download_target
@@ -1554,9 +1552,9 @@ def download_and_unzip(zipfile, dest_dir, download_even_if_exists=False,
if clobber: if clobber:
remove_tree(dest_dir) remove_tree(dest_dir)
if zipfile.endswith('.zip'): if zipfile.endswith('.zip'):
return unzip(download_target, dest_dir, unpack_even_if_exists=download_even_if_exists) return unzip(download_target, dest_dir, unpack_even_if_exists=True)
else: else:
return untargz(download_target, dest_dir, unpack_even_if_exists=download_even_if_exists) return untargz(download_target, dest_dir, unpack_even_if_exists=True)
def to_native_path(p): def to_native_path(p):
@@ -2068,6 +2066,8 @@ class Tool(object):
return True return True
def cleanup_temp_install_files(self): def cleanup_temp_install_files(self):
if KEEP_DOWNLOADS:
return
url = self.download_url() url = self.download_url()
if url.endswith(ARCHIVE_SUFFIXES): if url.endswith(ARCHIVE_SUFFIXES):
download_target = get_download_target(url, zips_subdir, getattr(self, 'zipfile_prefix', '')) download_target = get_download_target(url, zips_subdir, getattr(self, 'zipfile_prefix', ''))
@@ -2733,7 +2733,7 @@ def construct_env_with_vars(env_vars_to_add):
# if no such tool is active. # if no such tool is active.
# Ignore certain keys that are inputs to emsdk itself. # Ignore certain keys that are inputs to emsdk itself.
ignore_keys = set(['EMSDK_POWERSHELL', 'EMSDK_CSH', 'EMSDK_CMD', 'EMSDK_BASH', ignore_keys = set(['EMSDK_POWERSHELL', 'EMSDK_CSH', 'EMSDK_CMD', 'EMSDK_BASH',
'EMSDK_NUM_CORES', 'EMSDK_TTY']) 'EMSDK_NUM_CORES', 'EMSDK_NOTTY', 'EMSDK_KEEP_DOWNLOADS'])
env_keys_to_add = set(pair[0] for pair in env_vars_to_add) env_keys_to_add = set(pair[0] for pair in env_vars_to_add)
for key in os.environ: for key in os.environ:
if key.startswith('EMSDK_') or key.startswith('EM_'): if key.startswith('EMSDK_') or key.startswith('EM_'):
@@ -2935,6 +2935,14 @@ def main(args):
'activate' commands and the invocation of 'emsdk_env', or otherwise 'activate' commands and the invocation of 'emsdk_env', or otherwise
these commands will default to operating on the default build type these commands will default to operating on the default build type
which in and RelWithDebInfo.''') which in and RelWithDebInfo.''')
print('''
Environment:
EMSDK_KEEP_DOWNLOADS=1 - if you want to keep the downloaded archives.
EMSDK_NOTTY=1 - override isatty() result (mainly to log progress).
EMSDK_NUM_CORES=n - limit parallelism to n cores.
EMSDK_VERBOSE=1 - very verbose output, useful for debugging.''')
return 0 return 0
# Extracts a boolean command line argument from args and returns True if it was present # Extracts a boolean command line argument from args and returns True if it was present