|
|
|
@@ -5,7 +5,6 @@
|
|
|
|
# found in the LICENSE file.
|
|
|
|
# found in the LICENSE file.
|
|
|
|
|
|
|
|
|
|
|
|
import copy
|
|
|
|
import copy
|
|
|
|
from collections import OrderedDict
|
|
|
|
|
|
|
|
import errno
|
|
|
|
import errno
|
|
|
|
import json
|
|
|
|
import json
|
|
|
|
import multiprocessing
|
|
|
|
import multiprocessing
|
|
|
|
@@ -20,16 +19,17 @@ import sys
|
|
|
|
import sysconfig
|
|
|
|
import sysconfig
|
|
|
|
import tarfile
|
|
|
|
import tarfile
|
|
|
|
import zipfile
|
|
|
|
import zipfile
|
|
|
|
|
|
|
|
from collections import OrderedDict
|
|
|
|
|
|
|
|
|
|
|
|
if os.name == 'nt':
|
|
|
|
if os.name == 'nt':
|
|
|
|
import winreg
|
|
|
|
|
|
|
|
import ctypes.wintypes
|
|
|
|
import ctypes.wintypes
|
|
|
|
|
|
|
|
import winreg
|
|
|
|
|
|
|
|
|
|
|
|
from urllib.parse import urljoin
|
|
|
|
from urllib.parse import urljoin
|
|
|
|
from urllib.request import urlopen
|
|
|
|
from urllib.request import urlopen
|
|
|
|
import functools
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if sys.version_info < (3, 0):
|
|
|
|
if sys.version_info < (3, 2): # noqa: UP036
|
|
|
|
print(f'error: emsdk requires python 3.0 or above ({sys.executable} {sys.version})', file=sys.stderr)
|
|
|
|
print(f'error: emsdk requires python 3.2 or above ({sys.executable} {sys.version})', file=sys.stderr)
|
|
|
|
sys.exit(1)
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
|
|
|
|
emsdk_packages_url = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/'
|
|
|
|
emsdk_packages_url = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/'
|
|
|
|
@@ -51,7 +51,10 @@ extra_release_tag = None
|
|
|
|
# being run. Useful for debugging.
|
|
|
|
# being run. Useful for debugging.
|
|
|
|
VERBOSE = int(os.getenv('EMSDK_VERBOSE', '0'))
|
|
|
|
VERBOSE = int(os.getenv('EMSDK_VERBOSE', '0'))
|
|
|
|
QUIET = int(os.getenv('EMSDK_QUIET', '0'))
|
|
|
|
QUIET = int(os.getenv('EMSDK_QUIET', '0'))
|
|
|
|
TTY_OUTPUT = not os.getenv('EMSDK_NOTTY', not sys.stdout.isatty())
|
|
|
|
if os.getenv('EMSDK_NOTTY'):
|
|
|
|
|
|
|
|
TTY_OUTPUT = False
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
TTY_OUTPUT = sys.stdout.isatty()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def info(msg):
|
|
|
|
def info(msg):
|
|
|
|
@@ -132,7 +135,7 @@ else:
|
|
|
|
|
|
|
|
|
|
|
|
# platform.machine() may return AMD64 on windows, so standardize the case.
|
|
|
|
# platform.machine() may return AMD64 on windows, so standardize the case.
|
|
|
|
machine = os.getenv('EMSDK_ARCH', platform.machine().lower())
|
|
|
|
machine = os.getenv('EMSDK_ARCH', platform.machine().lower())
|
|
|
|
if machine.startswith('x64') or machine.startswith('amd64') or machine.startswith('x86_64'):
|
|
|
|
if machine.startswith(('x64', 'amd64', 'x86_64')):
|
|
|
|
ARCH = 'x86_64'
|
|
|
|
ARCH = 'x86_64'
|
|
|
|
elif machine.endswith('86'):
|
|
|
|
elif machine.endswith('86'):
|
|
|
|
ARCH = 'x86'
|
|
|
|
ARCH = 'x86'
|
|
|
|
@@ -203,17 +206,17 @@ def parse_github_url_and_refspec(url):
|
|
|
|
return ('', '', None)
|
|
|
|
return ('', '', None)
|
|
|
|
|
|
|
|
|
|
|
|
if url.endswith(('/tree/', '/tree', '/commit/', '/commit')):
|
|
|
|
if url.endswith(('/tree/', '/tree', '/commit/', '/commit')):
|
|
|
|
raise Exception('Malformed git URL and refspec ' + url + '!')
|
|
|
|
raise Exception(f'Malformed git URL and refspec {url}!')
|
|
|
|
|
|
|
|
|
|
|
|
if '/tree/' in url:
|
|
|
|
if '/tree/' in url:
|
|
|
|
if url.endswith('/'):
|
|
|
|
if url.endswith('/'):
|
|
|
|
raise Exception('Malformed git URL and refspec ' + url + '!')
|
|
|
|
raise Exception(f'Malformed git URL and refspec {url}!')
|
|
|
|
url, refspec = url.split('/tree/')
|
|
|
|
url, refspec = url.split('/tree/')
|
|
|
|
remote_name = url.split('/')[-2]
|
|
|
|
remote_name = url.split('/')[-2]
|
|
|
|
return (url, refspec, remote_name)
|
|
|
|
return (url, refspec, remote_name)
|
|
|
|
elif '/commit/' in url:
|
|
|
|
elif '/commit/' in url:
|
|
|
|
if url.endswith('/'):
|
|
|
|
if url.endswith('/'):
|
|
|
|
raise Exception('Malformed git URL and refspec ' + url + '!')
|
|
|
|
raise Exception(f'Malformed git URL and refspec {url}!')
|
|
|
|
url, refspec = url.split('/commit/')
|
|
|
|
url, refspec = url.split('/commit/')
|
|
|
|
remote_name = url.split('/')[-2]
|
|
|
|
remote_name = url.split('/')[-2]
|
|
|
|
return (url, refspec, remote_name)
|
|
|
|
return (url, refspec, remote_name)
|
|
|
|
@@ -324,7 +327,7 @@ def remove_tree(d):
|
|
|
|
os.chmod(path, stat.S_IWRITE)
|
|
|
|
os.chmod(path, stat.S_IWRITE)
|
|
|
|
func(path)
|
|
|
|
func(path)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
raise
|
|
|
|
raise exc_info[1]
|
|
|
|
shutil.rmtree(d, onerror=remove_readonly_and_try_again)
|
|
|
|
shutil.rmtree(d, onerror=remove_readonly_and_try_again)
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
debug_print('remove_tree threw an exception, ignoring: ' + str(e))
|
|
|
|
debug_print('remove_tree threw an exception, ignoring: ' + str(e))
|
|
|
|
@@ -340,13 +343,13 @@ def win_set_environment_variable_direct(key, value, system=True):
|
|
|
|
# Register locally from CURRENT USER section.
|
|
|
|
# Register locally from CURRENT USER section.
|
|
|
|
folder = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, 'Environment', 0, winreg.KEY_ALL_ACCESS)
|
|
|
|
folder = winreg.OpenKeyEx(winreg.HKEY_CURRENT_USER, 'Environment', 0, winreg.KEY_ALL_ACCESS)
|
|
|
|
winreg.SetValueEx(folder, key, 0, winreg.REG_EXPAND_SZ, value)
|
|
|
|
winreg.SetValueEx(folder, key, 0, winreg.REG_EXPAND_SZ, value)
|
|
|
|
debug_print('Set key=' + key + ' with value ' + value + ' in registry.')
|
|
|
|
debug_print(f'Set key={key} with value {value} in registry.')
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
# 'Access is denied.'
|
|
|
|
# 'Access is denied.'
|
|
|
|
if e.args[3] == 5:
|
|
|
|
if e.args[3] == 5:
|
|
|
|
exit_with_error('failed to set the environment variable \'' + key + '\'! Setting environment variables permanently requires administrator access. Please rerun this command with administrative privileges. This can be done for example by holding down the Ctrl and Shift keys while opening a command prompt in start menu.')
|
|
|
|
exit_with_error(f'failed to set the environment variable \'{key}\'! Setting environment variables permanently requires administrator access. Please rerun this command with administrative privileges. This can be done for example by holding down the Ctrl and Shift keys while opening a command prompt in start menu.')
|
|
|
|
errlog('Failed to write environment variable ' + key + ':')
|
|
|
|
errlog(f'Failed to write environment variable {key}:')
|
|
|
|
errlog(str(e))
|
|
|
|
errlog(str(e))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
finally:
|
|
|
|
finally:
|
|
|
|
@@ -384,7 +387,7 @@ def win_get_environment_variable(key, system=True, user=True, fallback=True):
|
|
|
|
# this catch is if both the registry key threw an exception and the key is not in os.environ
|
|
|
|
# this catch is if both the registry key threw an exception and the key is not in os.environ
|
|
|
|
if e.args[0] != 2:
|
|
|
|
if e.args[0] != 2:
|
|
|
|
# 'The system cannot find the file specified.'
|
|
|
|
# 'The system cannot find the file specified.'
|
|
|
|
errlog('Failed to read environment variable ' + key + ':')
|
|
|
|
errlog(f'Failed to read environment variable {key}:')
|
|
|
|
errlog(str(e))
|
|
|
|
errlog(str(e))
|
|
|
|
return None
|
|
|
|
return None
|
|
|
|
return value
|
|
|
|
return value
|
|
|
|
@@ -416,16 +419,16 @@ def win_set_environment_variable(key, value, system, user):
|
|
|
|
# Escape % signs so that we don't expand references to environment variables.
|
|
|
|
# Escape % signs so that we don't expand references to environment variables.
|
|
|
|
value = value.replace('%', '^%')
|
|
|
|
value = value.replace('%', '^%')
|
|
|
|
if len(value) >= 1024:
|
|
|
|
if len(value) >= 1024:
|
|
|
|
exit_with_error('the new environment variable ' + key + ' is more than 1024 characters long! A value this long cannot be set via command line: please add the environment variable specified above to system environment manually via Control Panel.')
|
|
|
|
exit_with_error(f'the new environment variable {key} is more than 1024 characters long! A value this long cannot be set via command line: please add the environment variable specified above to system environment manually via Control Panel.')
|
|
|
|
cmd = ['SETX', key, value]
|
|
|
|
cmd = ['SETX', key, value]
|
|
|
|
debug_print(str(cmd))
|
|
|
|
debug_print(str(cmd))
|
|
|
|
retcode = subprocess.call(cmd, stdout=subprocess.PIPE)
|
|
|
|
retcode = subprocess.call(cmd, stdout=subprocess.PIPE)
|
|
|
|
if retcode != 0:
|
|
|
|
if retcode != 0:
|
|
|
|
errlog('ERROR! Failed to set environment variable ' + key + '=' + value + '. You may need to set it manually.')
|
|
|
|
errlog(f'ERROR! Failed to set environment variable {key}={value}. You may need to set it manually.')
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
errlog('ERROR! Failed to set environment variable ' + key + '=' + value + ':')
|
|
|
|
errlog(f'ERROR! Failed to set environment variable {key}={value}:')
|
|
|
|
errlog(str(e))
|
|
|
|
errlog(str(e))
|
|
|
|
errlog('You may need to set it manually.')
|
|
|
|
errlog('You may need to set it manually.')
|
|
|
|
|
|
|
|
|
|
|
|
@@ -467,7 +470,7 @@ def win_set_environment_variables(env_vars_to_add, system, user):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def win_delete_environment_variable(key, system=True, user=True):
|
|
|
|
def win_delete_environment_variable(key, system=True, user=True):
|
|
|
|
debug_print('win_delete_environment_variable(key=' + key + ', system=' + str(system) + ')')
|
|
|
|
debug_print(f'win_delete_environment_variable(key={key}, system={system})')
|
|
|
|
return win_set_environment_variable(key, None, system, user)
|
|
|
|
return win_set_environment_variable(key, None, system, user)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -481,19 +484,14 @@ def sdk_path(path):
|
|
|
|
|
|
|
|
|
|
|
|
# Removes a single file, suppressing exceptions on failure.
|
|
|
|
# Removes a single file, suppressing exceptions on failure.
|
|
|
|
def rmfile(filename):
|
|
|
|
def rmfile(filename):
|
|
|
|
debug_print('rmfile(' + filename + ')')
|
|
|
|
debug_print(f'rmfile({filename})')
|
|
|
|
if os.path.lexists(filename):
|
|
|
|
if os.path.lexists(filename):
|
|
|
|
os.remove(filename)
|
|
|
|
os.remove(filename)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# http://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python
|
|
|
|
|
|
|
|
def mkdir_p(path):
|
|
|
|
def mkdir_p(path):
|
|
|
|
debug_print('mkdir_p(' + path + ')')
|
|
|
|
debug_print(f'mkdir_p({path})')
|
|
|
|
try:
|
|
|
|
os.makedirs(path, exist_ok=True)
|
|
|
|
os.makedirs(path)
|
|
|
|
|
|
|
|
except OSError as exc: # Python >2.5
|
|
|
|
|
|
|
|
if exc.errno != errno.EEXIST or not os.path.isdir(path):
|
|
|
|
|
|
|
|
raise
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_nonempty_directory(path):
|
|
|
|
def is_nonempty_directory(path):
|
|
|
|
@@ -513,7 +511,7 @@ def run(cmd, cwd=None, quiet=False):
|
|
|
|
|
|
|
|
|
|
|
|
# http://pythonicprose.blogspot.fi/2009/10/python-extract-targz-archive.html
|
|
|
|
# http://pythonicprose.blogspot.fi/2009/10/python-extract-targz-archive.html
|
|
|
|
def untargz(source_filename, dest_dir):
|
|
|
|
def untargz(source_filename, dest_dir):
|
|
|
|
print("Unpacking '" + source_filename + "' to '" + dest_dir + "'")
|
|
|
|
print(f"Unpacking '{source_filename}' to '{dest_dir}'")
|
|
|
|
mkdir_p(dest_dir)
|
|
|
|
mkdir_p(dest_dir)
|
|
|
|
returncode = run(['tar', '-xvf' if VERBOSE else '-xf', sdk_path(source_filename), '--strip', '1'], cwd=dest_dir)
|
|
|
|
returncode = run(['tar', '-xvf' if VERBOSE else '-xf', sdk_path(source_filename), '--strip', '1'], cwd=dest_dir)
|
|
|
|
# tfile = tarfile.open(source_filename, 'r:gz')
|
|
|
|
# tfile = tarfile.open(source_filename, 'r:gz')
|
|
|
|
@@ -531,7 +529,7 @@ def fix_potentially_long_windows_pathname(pathname):
|
|
|
|
# Test if emsdk calls fix_potentially_long_windows_pathname() with long
|
|
|
|
# Test if emsdk calls fix_potentially_long_windows_pathname() with long
|
|
|
|
# relative paths (which is problematic)
|
|
|
|
# relative paths (which is problematic)
|
|
|
|
if not os.path.isabs(pathname) and len(pathname) > 200:
|
|
|
|
if not os.path.isabs(pathname) and len(pathname) > 200:
|
|
|
|
errlog('Warning: Seeing a relative path "' + pathname + '" which is dangerously long for being referenced as a short Windows path name. Refactor emsdk to be able to handle this!')
|
|
|
|
errlog(f'Warning: Seeing a relative path "{pathname}" which is dangerously long for being referenced as a short Windows path name. Refactor emsdk to be able to handle this!')
|
|
|
|
if pathname.startswith('\\\\?\\'):
|
|
|
|
if pathname.startswith('\\\\?\\'):
|
|
|
|
return pathname
|
|
|
|
return pathname
|
|
|
|
pathname = os.path.normpath(pathname.replace('/', '\\'))
|
|
|
|
pathname = os.path.normpath(pathname.replace('/', '\\'))
|
|
|
|
@@ -554,7 +552,7 @@ def move_with_overwrite(src, dest):
|
|
|
|
|
|
|
|
|
|
|
|
# http://stackoverflow.com/questions/12886768/simple-way-to-unzip-file-in-python-on-all-oses
|
|
|
|
# http://stackoverflow.com/questions/12886768/simple-way-to-unzip-file-in-python-on-all-oses
|
|
|
|
def unzip(source_filename, dest_dir):
|
|
|
|
def unzip(source_filename, dest_dir):
|
|
|
|
print("Unpacking '" + source_filename + "' to '" + dest_dir + "'")
|
|
|
|
print(f"Unpacking '{source_filename}' to '{dest_dir}'")
|
|
|
|
mkdir_p(dest_dir)
|
|
|
|
mkdir_p(dest_dir)
|
|
|
|
common_subdir = None
|
|
|
|
common_subdir = None
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
@@ -609,11 +607,11 @@ def unzip(source_filename, dest_dir):
|
|
|
|
if common_subdir:
|
|
|
|
if common_subdir:
|
|
|
|
remove_tree(unzip_to_dir)
|
|
|
|
remove_tree(unzip_to_dir)
|
|
|
|
except zipfile.BadZipfile as e:
|
|
|
|
except zipfile.BadZipfile as e:
|
|
|
|
errlog("Unzipping file '" + source_filename + "' failed due to reason: " + str(e) + "! Removing the corrupted zip file.")
|
|
|
|
errlog(f"Unzipping file '{source_filename}' failed due to reason: {e}! Removing the corrupted zip file.")
|
|
|
|
rmfile(source_filename)
|
|
|
|
rmfile(source_filename)
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
errlog("Unzipping file '" + source_filename + "' failed due to reason: " + str(e))
|
|
|
|
errlog(f"Unzipping file '{source_filename}' failed due to reason: {e}")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
@@ -724,12 +722,12 @@ def download_with_urllib(url, file_name):
|
|
|
|
# On success, returns the filename on the disk pointing to the destination file that was produced
|
|
|
|
# On success, returns the filename on the disk pointing to the destination file that was produced
|
|
|
|
# On failure, returns None.
|
|
|
|
# On failure, returns None.
|
|
|
|
def download_file(url, dstpath, download_even_if_exists=False,
|
|
|
|
def download_file(url, dstpath, download_even_if_exists=False,
|
|
|
|
filename_prefix='', silent=False):
|
|
|
|
filename_prefix=''):
|
|
|
|
debug_print('download_file(url=' + url + ', dstpath=' + dstpath + ')')
|
|
|
|
debug_print(f'download_file(url={url}, dstpath={dstpath})')
|
|
|
|
file_name = get_download_target(url, dstpath, filename_prefix)
|
|
|
|
file_name = get_download_target(url, dstpath, filename_prefix)
|
|
|
|
|
|
|
|
|
|
|
|
if os.path.exists(file_name) and not download_even_if_exists:
|
|
|
|
if os.path.exists(file_name) and not download_even_if_exists:
|
|
|
|
print("File '" + file_name + "' already downloaded, skipping.")
|
|
|
|
print(f"File '{file_name}' already downloaded, skipping.")
|
|
|
|
return file_name
|
|
|
|
return file_name
|
|
|
|
|
|
|
|
|
|
|
|
mkdir_p(os.path.dirname(file_name))
|
|
|
|
mkdir_p(os.path.dirname(file_name))
|
|
|
|
@@ -744,7 +742,7 @@ def download_file(url, dstpath, download_even_if_exists=False,
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
download_with_urllib(url, file_name)
|
|
|
|
download_with_urllib(url, file_name)
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
errlog("Error: Downloading URL '" + url + "': " + str(e))
|
|
|
|
errlog(f"Error: Downloading URL '{url}': {e}")
|
|
|
|
return None
|
|
|
|
return None
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
except KeyboardInterrupt:
|
|
|
|
rmfile(file_name)
|
|
|
|
rmfile(file_name)
|
|
|
|
@@ -754,7 +752,7 @@ def download_file(url, dstpath, download_even_if_exists=False,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def run_get_output(cmd, cwd=None):
|
|
|
|
def run_get_output(cmd, cwd=None):
|
|
|
|
debug_print('run_get_output(cmd=' + str(cmd) + ', cwd=' + str(cwd) + ')')
|
|
|
|
debug_print(f'run_get_output(cmd={cmd}, cwd={cwd})')
|
|
|
|
process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=os.environ.copy(), universal_newlines=True)
|
|
|
|
process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=os.environ.copy(), universal_newlines=True)
|
|
|
|
stdout, stderr = process.communicate()
|
|
|
|
stdout, stderr = process.communicate()
|
|
|
|
return (process.returncode, stdout, stderr)
|
|
|
|
return (process.returncode, stdout, stderr)
|
|
|
|
@@ -822,31 +820,31 @@ def get_git_remotes(repo_path):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def git_clone(url, dstpath, branch, remote_name='origin'):
|
|
|
|
def git_clone(url, dstpath, branch, remote_name='origin'):
|
|
|
|
debug_print('git_clone(url=' + url + ', dstpath=' + dstpath + ')')
|
|
|
|
debug_print(f'git_clone(url={url}, dstpath={dstpath})')
|
|
|
|
if os.path.isdir(os.path.join(dstpath, '.git')):
|
|
|
|
if os.path.isdir(os.path.join(dstpath, '.git')):
|
|
|
|
remotes = get_git_remotes(dstpath)
|
|
|
|
remotes = get_git_remotes(dstpath)
|
|
|
|
if remote_name in remotes:
|
|
|
|
if remote_name in remotes:
|
|
|
|
debug_print('Repository ' + url + ' with remote "' + remote_name + '" already cloned to directory ' + dstpath + ', skipping.')
|
|
|
|
debug_print(f'Repository {url} with remote "{remote_name}" already cloned to directory {dstpath}, skipping.')
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
debug_print('Repository ' + url + ' with remote "' + remote_name + '" already cloned to directory ' + dstpath + ', but remote has not yet been added. Creating.')
|
|
|
|
debug_print(f'Repository {url} with remote "{remote_name}" already cloned to directory {dstpath}, but remote has not yet been added. Creating.')
|
|
|
|
return run([GIT(), 'remote', 'add', remote_name, url], cwd=dstpath) == 0
|
|
|
|
return run([GIT(), 'remote', 'add', remote_name, url], cwd=dstpath) == 0
|
|
|
|
|
|
|
|
|
|
|
|
mkdir_p(dstpath)
|
|
|
|
mkdir_p(dstpath)
|
|
|
|
git_clone_args = ['--recurse-submodules', '--branch', branch] # Do not check out a branch (installer will issue a checkout command right after)
|
|
|
|
git_clone_args = ['--recurse-submodules', '--branch', branch] # Do not check out a branch (installer will issue a checkout command right after)
|
|
|
|
if GIT_CLONE_SHALLOW:
|
|
|
|
if GIT_CLONE_SHALLOW:
|
|
|
|
git_clone_args += ['--depth', '1']
|
|
|
|
git_clone_args += ['--depth', '1']
|
|
|
|
print('Cloning from ' + url + '...')
|
|
|
|
print(f'Cloning from {url}...')
|
|
|
|
return run([GIT(), 'clone', '-o', remote_name] + git_clone_args + [url, dstpath]) == 0
|
|
|
|
return run([GIT(), 'clone', '-o', remote_name] + git_clone_args + [url, dstpath]) == 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def git_pull(repo_path, branch_or_tag, remote_name='origin'):
|
|
|
|
def git_pull(repo_path, branch_or_tag, remote_name='origin'):
|
|
|
|
debug_print('git_pull(repo_path=' + repo_path + ', branch/tag=' + branch_or_tag + ', remote_name=' + remote_name + ')')
|
|
|
|
debug_print(f'git_pull(repo_path={repo_path}, branch/tag={branch_or_tag}, remote_name={remote_name})')
|
|
|
|
ret = run([GIT(), 'fetch', '--quiet', remote_name], repo_path)
|
|
|
|
ret = run([GIT(), 'fetch', '--quiet', remote_name], repo_path)
|
|
|
|
if ret != 0:
|
|
|
|
if ret != 0:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
print("Fetching latest changes to the branch/tag '" + branch_or_tag + "' for '" + repo_path + "'...")
|
|
|
|
print(f"Fetching latest changes to the branch/tag '{branch_or_tag}' for '{repo_path}'...")
|
|
|
|
ret = run([GIT(), 'fetch', '--quiet', remote_name], repo_path)
|
|
|
|
ret = run([GIT(), 'fetch', '--quiet', remote_name], repo_path)
|
|
|
|
if ret != 0:
|
|
|
|
if ret != 0:
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
@@ -871,13 +869,13 @@ def git_pull(repo_path, branch_or_tag, remote_name='origin'):
|
|
|
|
except Exception:
|
|
|
|
except Exception:
|
|
|
|
errlog('git operation failed!')
|
|
|
|
errlog('git operation failed!')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
print("Successfully updated and checked out branch/tag '" + branch_or_tag + "' on repository '" + repo_path + "'")
|
|
|
|
print(f"Successfully updated and checked out branch/tag '{branch_or_tag}' on repository '{repo_path}'")
|
|
|
|
print("Current repository version: " + git_repo_version(repo_path))
|
|
|
|
print("Current repository version: " + git_repo_version(repo_path))
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def git_clone_checkout_and_pull(url, dstpath, branch, override_remote_name='origin'):
|
|
|
|
def git_clone_checkout_and_pull(url, dstpath, branch, override_remote_name='origin'):
|
|
|
|
debug_print('git_clone_checkout_and_pull(url=' + url + ', dstpath=' + dstpath + ', branch=' + branch + ', override_remote_name=' + override_remote_name + ')')
|
|
|
|
debug_print(f'git_clone_checkout_and_pull(url={url}, dstpath={dstpath}, branch={branch}, override_remote_name={override_remote_name})')
|
|
|
|
|
|
|
|
|
|
|
|
# Make sure the repository is cloned first
|
|
|
|
# Make sure the repository is cloned first
|
|
|
|
success = git_clone(url, dstpath, branch, override_remote_name)
|
|
|
|
success = git_clone(url, dstpath, branch, override_remote_name)
|
|
|
|
@@ -940,19 +938,19 @@ def llvm_build_bin_dir(tool):
|
|
|
|
return os.path.join(build_dir, 'bin')
|
|
|
|
return os.path.join(build_dir, 'bin')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def build_env(generator):
|
|
|
|
def build_env():
|
|
|
|
build_env = os.environ.copy()
|
|
|
|
env = os.environ.copy()
|
|
|
|
|
|
|
|
|
|
|
|
# To work around a build issue with older Mac OS X builds, add -stdlib=libc++ to all builds.
|
|
|
|
# To work around a build issue with older Mac OS X builds, add -stdlib=libc++ to all builds.
|
|
|
|
# See https://groups.google.com/forum/#!topic/emscripten-discuss/5Or6QIzkqf0
|
|
|
|
# See https://groups.google.com/forum/#!topic/emscripten-discuss/5Or6QIzkqf0
|
|
|
|
if MACOS:
|
|
|
|
if MACOS:
|
|
|
|
build_env['CXXFLAGS'] = ((build_env['CXXFLAGS'] + ' ') if hasattr(build_env, 'CXXFLAGS') else '') + '-stdlib=libc++'
|
|
|
|
env['CXXFLAGS'] = ((env['CXXFLAGS'] + ' ') if hasattr(env, 'CXXFLAGS') else '') + '-stdlib=libc++'
|
|
|
|
if WINDOWS:
|
|
|
|
if WINDOWS:
|
|
|
|
# MSBuild.exe has an internal mechanism to avoid N^2 oversubscription of threads in its two-tier build model, see
|
|
|
|
# MSBuild.exe has an internal mechanism to avoid N^2 oversubscription of threads in its two-tier build model, see
|
|
|
|
# https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
|
|
|
|
# https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
|
|
|
|
build_env['UseMultiToolTask'] = 'true'
|
|
|
|
env['UseMultiToolTask'] = 'true'
|
|
|
|
build_env['EnforceProcessCountAcrossBuilds'] = 'true'
|
|
|
|
env['EnforceProcessCountAcrossBuilds'] = 'true'
|
|
|
|
return build_env
|
|
|
|
return env
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Find path to cmake executable, as one of the activated tools, in PATH, or from installed tools.
|
|
|
|
# Find path to cmake executable, as one of the activated tools, in PATH, or from installed tools.
|
|
|
|
@@ -970,13 +968,13 @@ def find_cmake():
|
|
|
|
if tool.id == 'cmake' and tool.is_active():
|
|
|
|
if tool.id == 'cmake' and tool.is_active():
|
|
|
|
cmake_exe = locate_cmake_from_tool(tool)
|
|
|
|
cmake_exe = locate_cmake_from_tool(tool)
|
|
|
|
if cmake_exe:
|
|
|
|
if cmake_exe:
|
|
|
|
info('Found installed+activated CMake tool at "' + cmake_exe + '"')
|
|
|
|
info(f'Found installed+activated CMake tool at "{cmake_exe}"')
|
|
|
|
return cmake_exe
|
|
|
|
return cmake_exe
|
|
|
|
|
|
|
|
|
|
|
|
# 2. If cmake already exists in PATH, then use that cmake to configure the build.
|
|
|
|
# 2. If cmake already exists in PATH, then use that cmake to configure the build.
|
|
|
|
cmake_exe = which('cmake')
|
|
|
|
cmake_exe = which('cmake')
|
|
|
|
if cmake_exe:
|
|
|
|
if cmake_exe:
|
|
|
|
info('Found CMake from PATH at "' + cmake_exe + '"')
|
|
|
|
info(f'Found CMake from PATH at "{cmake_exe}"')
|
|
|
|
return cmake_exe
|
|
|
|
return cmake_exe
|
|
|
|
|
|
|
|
|
|
|
|
# 3. Finally, if user has installed a cmake tool, but has not activated that, then use
|
|
|
|
# 3. Finally, if user has installed a cmake tool, but has not activated that, then use
|
|
|
|
@@ -987,14 +985,14 @@ def find_cmake():
|
|
|
|
if tool.id == 'cmake' and tool.is_installed():
|
|
|
|
if tool.id == 'cmake' and tool.is_installed():
|
|
|
|
cmake_exe = locate_cmake_from_tool(tool)
|
|
|
|
cmake_exe = locate_cmake_from_tool(tool)
|
|
|
|
if cmake_exe:
|
|
|
|
if cmake_exe:
|
|
|
|
info('Found installed CMake tool at "' + cmake_exe + '"')
|
|
|
|
info(f'Found installed CMake tool at "{cmake_exe}"')
|
|
|
|
return cmake_exe
|
|
|
|
return cmake_exe
|
|
|
|
|
|
|
|
|
|
|
|
exit_with_error('Unable to find "cmake" in PATH, or as installed/activated tool! Please install CMake first')
|
|
|
|
exit_with_error('Unable to find "cmake" in PATH, or as installed/activated tool! Please install CMake first')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def make_build(build_root, build_type):
|
|
|
|
def make_build(build_root, build_type):
|
|
|
|
debug_print('make_build(build_root=' + build_root + ', build_type=' + build_type + ')')
|
|
|
|
debug_print(f'make_build(build_root={build_root}, build_type={build_type})')
|
|
|
|
if CPU_CORES > 1:
|
|
|
|
if CPU_CORES > 1:
|
|
|
|
print('Performing a parallel build with ' + str(CPU_CORES) + ' cores.')
|
|
|
|
print('Performing a parallel build with ' + str(CPU_CORES) + ' cores.')
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
@@ -1016,9 +1014,9 @@ def make_build(build_root, build_type):
|
|
|
|
# Build
|
|
|
|
# Build
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
print('Running build: ' + str(make))
|
|
|
|
print('Running build: ' + str(make))
|
|
|
|
ret = subprocess.check_call(make, cwd=build_root, env=build_env(CMAKE_GENERATOR))
|
|
|
|
ret = subprocess.check_call(make, cwd=build_root, env=build_env())
|
|
|
|
if ret != 0:
|
|
|
|
if ret != 0:
|
|
|
|
errlog('Build failed with exit code ' + ret + '!')
|
|
|
|
errlog('Build failed with exit code {ret}!')
|
|
|
|
errlog('Working directory: ' + build_root)
|
|
|
|
errlog('Working directory: ' + build_root)
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
@@ -1030,7 +1028,7 @@ def make_build(build_root, build_type):
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_args=[]):
|
|
|
|
def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_args):
|
|
|
|
debug_print('cmake_configure(generator=' + str(generator) + ', build_root=' + str(build_root) + ', src_root=' + str(src_root) + ', build_type=' + str(build_type) + ', extra_cmake_args=' + str(extra_cmake_args) + ')')
|
|
|
|
debug_print('cmake_configure(generator=' + str(generator) + ', build_root=' + str(build_root) + ', src_root=' + str(src_root) + ', build_type=' + str(build_type) + ', extra_cmake_args=' + str(extra_cmake_args) + ')')
|
|
|
|
# Configure
|
|
|
|
# Configure
|
|
|
|
if not os.path.isdir(build_root):
|
|
|
|
if not os.path.isdir(build_root):
|
|
|
|
@@ -1063,9 +1061,9 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
|
|
|
|
# Create a file 'recmake.bat/sh' in the build root that user can call to
|
|
|
|
# Create a file 'recmake.bat/sh' in the build root that user can call to
|
|
|
|
# manually recmake the build tree with the previous build params
|
|
|
|
# manually recmake the build tree with the previous build params
|
|
|
|
open(os.path.join(build_root, 'recmake.' + ('bat' if WINDOWS else 'sh')), 'w').write(' '.join(map(quote_parens, cmdline)))
|
|
|
|
open(os.path.join(build_root, 'recmake.' + ('bat' if WINDOWS else 'sh')), 'w').write(' '.join(map(quote_parens, cmdline)))
|
|
|
|
ret = subprocess.check_call(cmdline, cwd=build_root, env=build_env(CMAKE_GENERATOR))
|
|
|
|
ret = subprocess.check_call(cmdline, cwd=build_root, env=build_env())
|
|
|
|
if ret != 0:
|
|
|
|
if ret != 0:
|
|
|
|
errlog('CMake invocation failed with exit code ' + ret + '!')
|
|
|
|
errlog('CMake invocation failed with exit code {ret}!')
|
|
|
|
errlog('Working directory: ' + build_root)
|
|
|
|
errlog('Working directory: ' + build_root)
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
except OSError as e:
|
|
|
|
except OSError as e:
|
|
|
|
@@ -1091,9 +1089,7 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
|
|
|
|
|
|
|
|
|
|
|
|
def xcode_sdk_version():
|
|
|
|
def xcode_sdk_version():
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
output = subprocess.check_output(['xcrun', '--show-sdk-version'])
|
|
|
|
output = subprocess.check_output(['xcrun', '--show-sdk-version'], universal_newlines=True)
|
|
|
|
if sys.version_info >= (3,):
|
|
|
|
|
|
|
|
output = output.decode('utf8')
|
|
|
|
|
|
|
|
return output.strip().split('.')
|
|
|
|
return output.strip().split('.')
|
|
|
|
except Exception:
|
|
|
|
except Exception:
|
|
|
|
return subprocess.checkplatform.mac_ver()[0].split('.')
|
|
|
|
return subprocess.checkplatform.mac_ver()[0].split('.')
|
|
|
|
@@ -1120,7 +1116,7 @@ def cmake_host_platform():
|
|
|
|
'arm64': 'ARM64',
|
|
|
|
'arm64': 'ARM64',
|
|
|
|
'arm': 'ARM',
|
|
|
|
'arm': 'ARM',
|
|
|
|
'x86_64': 'x64',
|
|
|
|
'x86_64': 'x64',
|
|
|
|
'x86': 'x86'
|
|
|
|
'x86': 'x86',
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return arch_to_cmake_host_platform[ARCH]
|
|
|
|
return arch_to_cmake_host_platform[ARCH]
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1158,7 +1154,7 @@ def build_llvm(tool):
|
|
|
|
|
|
|
|
|
|
|
|
enable_assertions = ENABLE_LLVM_ASSERTIONS.lower() == 'on' or (ENABLE_LLVM_ASSERTIONS == 'auto' and build_type.lower() != 'release' and build_type.lower() != 'minsizerel')
|
|
|
|
enable_assertions = ENABLE_LLVM_ASSERTIONS.lower() == 'on' or (ENABLE_LLVM_ASSERTIONS == 'auto' and build_type.lower() != 'release' and build_type.lower() != 'minsizerel')
|
|
|
|
|
|
|
|
|
|
|
|
if ARCH == 'x86' or ARCH == 'x86_64':
|
|
|
|
if ARCH in ('x86', 'x86_64'):
|
|
|
|
targets_to_build = 'WebAssembly;X86'
|
|
|
|
targets_to_build = 'WebAssembly;X86'
|
|
|
|
elif ARCH == 'arm':
|
|
|
|
elif ARCH == 'arm':
|
|
|
|
targets_to_build = 'WebAssembly;ARM'
|
|
|
|
targets_to_build = 'WebAssembly;ARM'
|
|
|
|
@@ -1387,13 +1383,13 @@ def download_firefox(tool):
|
|
|
|
|
|
|
|
|
|
|
|
# Abort if detaching was not successful
|
|
|
|
# Abort if detaching was not successful
|
|
|
|
if os.path.exists(mount_point):
|
|
|
|
if os.path.exists(mount_point):
|
|
|
|
raise Exception('Previous mount of Firefox already exists at "' + mount_point + '", unable to proceed.')
|
|
|
|
raise Exception(f'Previous mount of Firefox already exists at "{mount_point}", unable to proceed.')
|
|
|
|
|
|
|
|
|
|
|
|
# Mount the archive
|
|
|
|
# Mount the archive
|
|
|
|
run(['hdiutil', 'attach', filename])
|
|
|
|
run(['hdiutil', 'attach', filename])
|
|
|
|
firefox_dir = os.path.join(mount_point, app_name)
|
|
|
|
firefox_dir = os.path.join(mount_point, app_name)
|
|
|
|
if not os.path.isdir(firefox_dir):
|
|
|
|
if not os.path.isdir(firefox_dir):
|
|
|
|
raise Exception('Unable to find Firefox directory "' + firefox_dir + '" inside app image.')
|
|
|
|
raise Exception(f'Unable to find Firefox directory "{firefox_dir}" inside app image.')
|
|
|
|
|
|
|
|
|
|
|
|
# And install by copying the files from the archive
|
|
|
|
# And install by copying the files from the archive
|
|
|
|
shutil.copytree(firefox_dir, root)
|
|
|
|
shutil.copytree(firefox_dir, root)
|
|
|
|
@@ -1512,7 +1508,7 @@ def emscripten_npm_install(tool, directory):
|
|
|
|
# Binaryen build scripts:
|
|
|
|
# Binaryen build scripts:
|
|
|
|
def binaryen_build_root(tool):
|
|
|
|
def binaryen_build_root(tool):
|
|
|
|
build_root = tool.installation_path().strip()
|
|
|
|
build_root = tool.installation_path().strip()
|
|
|
|
if build_root.endswith('/') or build_root.endswith('\\'):
|
|
|
|
if build_root.endswith(('/', '\\')):
|
|
|
|
build_root = build_root[:-1]
|
|
|
|
build_root = build_root[:-1]
|
|
|
|
generator_prefix = cmake_generator_prefix()
|
|
|
|
generator_prefix = cmake_generator_prefix()
|
|
|
|
build_root = build_root + generator_prefix + '_' + str(tool.bitness) + 'bit_binaryen'
|
|
|
|
build_root = build_root + generator_prefix + '_' + str(tool.bitness) + 'bit_binaryen'
|
|
|
|
@@ -1522,7 +1518,7 @@ def binaryen_build_root(tool):
|
|
|
|
def uninstall_binaryen(tool):
|
|
|
|
def uninstall_binaryen(tool):
|
|
|
|
debug_print('uninstall_binaryen(' + str(tool) + ')')
|
|
|
|
debug_print('uninstall_binaryen(' + str(tool) + ')')
|
|
|
|
build_root = binaryen_build_root(tool)
|
|
|
|
build_root = binaryen_build_root(tool)
|
|
|
|
print("Deleting path '" + build_root + "'")
|
|
|
|
print(f"Deleting path '{build_root}'")
|
|
|
|
remove_tree(build_root)
|
|
|
|
remove_tree(build_root)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1563,23 +1559,22 @@ def build_binaryen_tool(tool):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def download_and_extract(archive, dest_dir, filename_prefix='', clobber=True):
|
|
|
|
def download_and_extract(archive, dest_dir, filename_prefix='', clobber=True):
|
|
|
|
debug_print('download_and_extract(archive=' + archive + ', dest_dir=' + dest_dir + ')')
|
|
|
|
debug_print('download_and_extract(archive={archive}, dest_dir={dest_dir})')
|
|
|
|
|
|
|
|
|
|
|
|
url = urljoin(emsdk_packages_url, archive)
|
|
|
|
url = urljoin(emsdk_packages_url, archive)
|
|
|
|
|
|
|
|
|
|
|
|
def try_download(url, silent=False):
|
|
|
|
def try_download(url):
|
|
|
|
return download_file(url, download_dir, not KEEP_DOWNLOADS,
|
|
|
|
return download_file(url, download_dir, not KEEP_DOWNLOADS, filename_prefix)
|
|
|
|
filename_prefix, silent=silent)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Special hack for the wasm-binaries we transitioned from `.bzip2` to
|
|
|
|
# Special hack for the wasm-binaries we transitioned from `.bzip2` to
|
|
|
|
# `.xz`, but we can't tell from the version/url which one to use, so
|
|
|
|
# `.xz`, but we can't tell from the version/url which one to use, so
|
|
|
|
# try one and then fall back to the other.
|
|
|
|
# try one and then fall back to the other.
|
|
|
|
success = False
|
|
|
|
success = False
|
|
|
|
if 'wasm-binaries' in archive and os.path.splitext(archive)[1] == '.xz':
|
|
|
|
if 'wasm-binaries' in archive and os.path.splitext(archive)[1] == '.xz':
|
|
|
|
success = try_download(url, silent=True)
|
|
|
|
success = try_download(url)
|
|
|
|
if not success:
|
|
|
|
if not success:
|
|
|
|
alt_url = url.replace('.tar.xz', '.tbz2')
|
|
|
|
alt_url = url.replace('.tar.xz', '.tbz2')
|
|
|
|
success = try_download(alt_url, silent=True)
|
|
|
|
success = try_download(alt_url)
|
|
|
|
if success:
|
|
|
|
if success:
|
|
|
|
url = alt_url
|
|
|
|
url = alt_url
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1653,7 +1648,7 @@ def load_em_config():
|
|
|
|
EM_CONFIG_DICT.clear()
|
|
|
|
EM_CONFIG_DICT.clear()
|
|
|
|
lines = []
|
|
|
|
lines = []
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
lines = open(EM_CONFIG_PATH, "r").read().split('\n')
|
|
|
|
lines = open(EM_CONFIG_PATH).read().split('\n')
|
|
|
|
except Exception:
|
|
|
|
except Exception:
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
for line in lines:
|
|
|
|
for line in lines:
|
|
|
|
@@ -1723,7 +1718,7 @@ def extract_newest_node_nightly_version(versions):
|
|
|
|
def download_node_nightly(tool):
|
|
|
|
def download_node_nightly(tool):
|
|
|
|
nightly_versions = fetch_nightly_node_versions()
|
|
|
|
nightly_versions = fetch_nightly_node_versions()
|
|
|
|
latest_nightly = extract_newest_node_nightly_version(nightly_versions)
|
|
|
|
latest_nightly = extract_newest_node_nightly_version(nightly_versions)
|
|
|
|
print('Latest Node.js Nightly download available is "' + latest_nightly + '"')
|
|
|
|
print('Latest Node.js Nightly download available is "{latest_nightly}"')
|
|
|
|
|
|
|
|
|
|
|
|
output_dir = os.path.abspath('node/nightly-' + latest_nightly)
|
|
|
|
output_dir = os.path.abspath('node/nightly-' + latest_nightly)
|
|
|
|
# Node.js zip structure quirk: Linux and macOS archives have a /bin,
|
|
|
|
# Node.js zip structure quirk: Linux and macOS archives have a /bin,
|
|
|
|
@@ -1794,9 +1789,9 @@ def generate_em_config(active_tools, permanently_activate, system):
|
|
|
|
|
|
|
|
|
|
|
|
for name, value in activated_config.items():
|
|
|
|
for name, value in activated_config.items():
|
|
|
|
if value.startswith('['):
|
|
|
|
if value.startswith('['):
|
|
|
|
cfg += name + " = " + value + "\n"
|
|
|
|
cfg += f'{name} = {value}\n'
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
cfg += name + " = '" + value + "'\n"
|
|
|
|
cfg += f"{name} = '{value}'\n"
|
|
|
|
|
|
|
|
|
|
|
|
emroot = find_emscripten_root(active_tools)
|
|
|
|
emroot = find_emscripten_root(active_tools)
|
|
|
|
if emroot:
|
|
|
|
if emroot:
|
|
|
|
@@ -1856,14 +1851,11 @@ def find_msbuild_dir():
|
|
|
|
return ''
|
|
|
|
return ''
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Tool(object):
|
|
|
|
class Tool:
|
|
|
|
def __init__(self, data):
|
|
|
|
def __init__(self, data):
|
|
|
|
# Convert the dictionary representation of the tool in 'data' to members of
|
|
|
|
# Convert the dictionary representation of the tool in 'data' to members of
|
|
|
|
# this class for convenience.
|
|
|
|
# this class for convenience.
|
|
|
|
for key, value in data.items():
|
|
|
|
for key, value in data.items():
|
|
|
|
# Python2 compat, convert unicode to str
|
|
|
|
|
|
|
|
if sys.version_info < (3,) and isinstance(value, unicode): # noqa
|
|
|
|
|
|
|
|
value = value.encode('Latin-1')
|
|
|
|
|
|
|
|
setattr(self, key, value)
|
|
|
|
setattr(self, key, value)
|
|
|
|
|
|
|
|
|
|
|
|
# Cache the name ID of this Tool (these are read very often)
|
|
|
|
# Cache the name ID of this Tool (these are read very often)
|
|
|
|
@@ -1916,7 +1908,7 @@ class Tool(object):
|
|
|
|
for tool_name in self.uses:
|
|
|
|
for tool_name in self.uses:
|
|
|
|
tool = find_tool(tool_name)
|
|
|
|
tool = find_tool(tool_name)
|
|
|
|
if not tool:
|
|
|
|
if not tool:
|
|
|
|
debug_print('Tool ' + str(self) + ' depends on ' + tool_name + ' which does not exist!')
|
|
|
|
debug_print(f'Tool {self} depends on {tool_name} which does not exist!')
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
if tool.needs_compilation():
|
|
|
|
if tool.needs_compilation():
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
@@ -2008,14 +2000,13 @@ class Tool(object):
|
|
|
|
def is_installed_version(self):
|
|
|
|
def is_installed_version(self):
|
|
|
|
version_file_path = self.get_version_file_path()
|
|
|
|
version_file_path = self.get_version_file_path()
|
|
|
|
if os.path.isfile(version_file_path):
|
|
|
|
if os.path.isfile(version_file_path):
|
|
|
|
with open(version_file_path, 'r') as version_file:
|
|
|
|
with open(version_file_path) as version_file:
|
|
|
|
return version_file.read().strip() == self.name
|
|
|
|
return version_file.read().strip() == self.name
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
def update_installed_version(self):
|
|
|
|
def update_installed_version(self):
|
|
|
|
with open(self.get_version_file_path(), 'w') as version_file:
|
|
|
|
with open(self.get_version_file_path(), 'w') as version_file:
|
|
|
|
version_file.write(self.name + '\n')
|
|
|
|
version_file.write(self.name + '\n')
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_installed(self, skip_version_check=False):
|
|
|
|
def is_installed(self, skip_version_check=False):
|
|
|
|
# If this tool/sdk depends on other tools, require that all dependencies are
|
|
|
|
# If this tool/sdk depends on other tools, require that all dependencies are
|
|
|
|
@@ -2024,7 +2015,7 @@ class Tool(object):
|
|
|
|
for tool_name in self.uses:
|
|
|
|
for tool_name in self.uses:
|
|
|
|
tool = find_tool(tool_name)
|
|
|
|
tool = find_tool(tool_name)
|
|
|
|
if tool is None:
|
|
|
|
if tool is None:
|
|
|
|
errlog("Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
|
|
|
|
errlog(f"Manifest error: No tool by name '{tool_name}' found! This may indicate an internal SDK error!")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
if not tool.is_installed():
|
|
|
|
if not tool.is_installed():
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
@@ -2072,7 +2063,7 @@ class Tool(object):
|
|
|
|
|
|
|
|
|
|
|
|
for key, value in activated_cfg.items():
|
|
|
|
for key, value in activated_cfg.items():
|
|
|
|
if key not in EM_CONFIG_DICT:
|
|
|
|
if key not in EM_CONFIG_DICT:
|
|
|
|
debug_print(str(self) + ' is not active, because key="' + key + '" does not exist in .emscripten')
|
|
|
|
debug_print(f'{self} is not active, because key="{key}" does not exist in .emscripten')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
# all paths are stored dynamically relative to the emsdk root, so
|
|
|
|
# all paths are stored dynamically relative to the emsdk root, so
|
|
|
|
@@ -2080,7 +2071,7 @@ class Tool(object):
|
|
|
|
config_value = EM_CONFIG_DICT[key].replace("emsdk_path + '", "'" + EMSDK_PATH)
|
|
|
|
config_value = EM_CONFIG_DICT[key].replace("emsdk_path + '", "'" + EMSDK_PATH)
|
|
|
|
config_value = config_value.strip("'")
|
|
|
|
config_value = config_value.strip("'")
|
|
|
|
if config_value != value:
|
|
|
|
if config_value != value:
|
|
|
|
debug_print(str(self) + ' is not active, because key="' + key + '" has value "' + config_value + '" but should have value "' + value + '"')
|
|
|
|
debug_print(f'{self} is not active, because key="{key}" has value "{config_value}" but should have value "{value}"')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2090,7 +2081,7 @@ class Tool(object):
|
|
|
|
for env in envs:
|
|
|
|
for env in envs:
|
|
|
|
key, value = parse_key_value(env)
|
|
|
|
key, value = parse_key_value(env)
|
|
|
|
if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
|
|
|
|
if key not in os.environ or to_unix_path(os.environ[key]) != to_unix_path(value):
|
|
|
|
debug_print(str(self) + ' is not active, because environment variable key="' + key + '" has value "' + str(os.getenv(key)) + '" but should have value "' + value + '"')
|
|
|
|
debug_print(f'{self} is not active, because environment variable key="{key}" has value "{os.getenv(key)}" but should have value "{value}"')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
if hasattr(self, 'activated_path'):
|
|
|
|
if hasattr(self, 'activated_path'):
|
|
|
|
@@ -2098,7 +2089,7 @@ class Tool(object):
|
|
|
|
for p in path:
|
|
|
|
for p in path:
|
|
|
|
path_items = os.environ['PATH'].replace('\\', '/').split(ENVPATH_SEPARATOR)
|
|
|
|
path_items = os.environ['PATH'].replace('\\', '/').split(ENVPATH_SEPARATOR)
|
|
|
|
if not normalized_contains(path_items, p):
|
|
|
|
if not normalized_contains(path_items, p):
|
|
|
|
debug_print(str(self) + ' is not active, because environment variable PATH item "' + p + '" is not present (PATH=' + os.environ['PATH'] + ')')
|
|
|
|
debug_print(f'{self} is not active, because environment variable PATH item "{p}" is not present (PATH={os.environ["PATH"]})')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2130,7 +2121,7 @@ class Tool(object):
|
|
|
|
already being installed.
|
|
|
|
already being installed.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if self.can_be_installed() is not True:
|
|
|
|
if self.can_be_installed() is not True:
|
|
|
|
exit_with_error("The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed())
|
|
|
|
exit_with_error(f"The tool '{self}' is not available due to the reason: {self.can_be_installed()}")
|
|
|
|
|
|
|
|
|
|
|
|
if self.id == 'sdk':
|
|
|
|
if self.id == 'sdk':
|
|
|
|
return self.install_sdk()
|
|
|
|
return self.install_sdk()
|
|
|
|
@@ -2141,17 +2132,17 @@ class Tool(object):
|
|
|
|
"""Returns True if any SDK component was installed of False all componented
|
|
|
|
"""Returns True if any SDK component was installed of False all componented
|
|
|
|
were already installed.
|
|
|
|
were already installed.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
print("Installing SDK '" + str(self) + "'..")
|
|
|
|
print(f"Installing SDK '{self}'..")
|
|
|
|
installed = False
|
|
|
|
installed = False
|
|
|
|
|
|
|
|
|
|
|
|
for tool_name in self.uses:
|
|
|
|
for tool_name in self.uses:
|
|
|
|
tool = find_tool(tool_name)
|
|
|
|
tool = find_tool(tool_name)
|
|
|
|
if tool is None:
|
|
|
|
if tool is None:
|
|
|
|
exit_with_error("manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
|
|
|
|
exit_with_error(f"manifest error: No tool by name '{tool_name}' found! This may indicate an internal SDK error!")
|
|
|
|
installed |= tool.install()
|
|
|
|
installed |= tool.install()
|
|
|
|
|
|
|
|
|
|
|
|
if not installed:
|
|
|
|
if not installed:
|
|
|
|
print("All SDK components already installed: '" + str(self) + "'.")
|
|
|
|
print(f"All SDK components already installed: '{self}'.")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
if getattr(self, 'custom_install_script', None) == 'emscripten_npm_install':
|
|
|
|
if getattr(self, 'custom_install_script', None) == 'emscripten_npm_install':
|
|
|
|
@@ -2164,7 +2155,7 @@ class Tool(object):
|
|
|
|
if not emscripten_npm_install(self, emscripten_dir):
|
|
|
|
if not emscripten_npm_install(self, emscripten_dir):
|
|
|
|
exit_with_error('post-install step failed: emscripten_npm_install')
|
|
|
|
exit_with_error('post-install step failed: emscripten_npm_install')
|
|
|
|
|
|
|
|
|
|
|
|
print("Done installing SDK '" + str(self) + "'.")
|
|
|
|
print(f"Done installing SDK '{self}'.")
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def install_tool(self):
|
|
|
|
def install_tool(self):
|
|
|
|
@@ -2176,10 +2167,10 @@ class Tool(object):
|
|
|
|
# installed every time when requested, since the install step is then used to git
|
|
|
|
# installed every time when requested, since the install step is then used to git
|
|
|
|
# pull the tool to a newer version.
|
|
|
|
# pull the tool to a newer version.
|
|
|
|
if self.is_installed() and not hasattr(self, 'git_branch'):
|
|
|
|
if self.is_installed() and not hasattr(self, 'git_branch'):
|
|
|
|
print("Skipped installing " + self.name + ", already installed.")
|
|
|
|
print(f"Skipped installing {self.name}, already installed.")
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
print("Installing tool '" + str(self) + "'..")
|
|
|
|
print(f"Installing tool '{self}'..")
|
|
|
|
url = self.download_url()
|
|
|
|
url = self.download_url()
|
|
|
|
|
|
|
|
|
|
|
|
custom_install_scripts = {
|
|
|
|
custom_install_scripts = {
|
|
|
|
@@ -2187,7 +2178,7 @@ class Tool(object):
|
|
|
|
'build_ninja': build_ninja,
|
|
|
|
'build_ninja': build_ninja,
|
|
|
|
'build_ccache': build_ccache,
|
|
|
|
'build_ccache': build_ccache,
|
|
|
|
'download_node_nightly': download_node_nightly,
|
|
|
|
'download_node_nightly': download_node_nightly,
|
|
|
|
'download_firefox': download_firefox
|
|
|
|
'download_firefox': download_firefox,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if hasattr(self, 'custom_install_script') and self.custom_install_script in custom_install_scripts:
|
|
|
|
if hasattr(self, 'custom_install_script') and self.custom_install_script in custom_install_scripts:
|
|
|
|
success = custom_install_scripts[self.custom_install_script](self)
|
|
|
|
success = custom_install_scripts[self.custom_install_script](self)
|
|
|
|
@@ -2227,12 +2218,12 @@ class Tool(object):
|
|
|
|
with open(emscripten_version_file_path, 'w') as f:
|
|
|
|
with open(emscripten_version_file_path, 'w') as f:
|
|
|
|
f.write('"%s"\n' % version)
|
|
|
|
f.write('"%s"\n' % version)
|
|
|
|
|
|
|
|
|
|
|
|
print("Done installing tool '" + str(self) + "'.")
|
|
|
|
print(f"Done installing tool '{self}'.")
|
|
|
|
|
|
|
|
|
|
|
|
# Sanity check that the installation succeeded, and if so, remove unneeded
|
|
|
|
# Sanity check that the installation succeeded, and if so, remove unneeded
|
|
|
|
# leftover installation files.
|
|
|
|
# leftover installation files.
|
|
|
|
if not self.is_installed(skip_version_check=True):
|
|
|
|
if not self.is_installed(skip_version_check=True):
|
|
|
|
exit_with_error("installation of '" + str(self) + "' failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error.")
|
|
|
|
exit_with_error(f"installation of '{self}' failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error.")
|
|
|
|
|
|
|
|
|
|
|
|
self.cleanup_temp_install_files()
|
|
|
|
self.cleanup_temp_install_files()
|
|
|
|
self.update_installed_version()
|
|
|
|
self.update_installed_version()
|
|
|
|
@@ -2244,22 +2235,22 @@ class Tool(object):
|
|
|
|
url = self.download_url()
|
|
|
|
url = self.download_url()
|
|
|
|
if url.endswith(ARCHIVE_SUFFIXES):
|
|
|
|
if url.endswith(ARCHIVE_SUFFIXES):
|
|
|
|
download_target = get_download_target(url, download_dir, getattr(self, 'download_prefix', ''))
|
|
|
|
download_target = get_download_target(url, download_dir, getattr(self, 'download_prefix', ''))
|
|
|
|
debug_print("Deleting temporary download: " + download_target)
|
|
|
|
debug_print(f"Deleting temporary download: {download_target}")
|
|
|
|
rmfile(download_target)
|
|
|
|
rmfile(download_target)
|
|
|
|
|
|
|
|
|
|
|
|
def uninstall(self):
|
|
|
|
def uninstall(self):
|
|
|
|
if not self.is_installed():
|
|
|
|
if not self.is_installed():
|
|
|
|
print("Tool '" + str(self) + "' was not installed. No need to uninstall.")
|
|
|
|
print(f"Tool '{self}' was not installed. No need to uninstall.")
|
|
|
|
return
|
|
|
|
return
|
|
|
|
print("Uninstalling tool '" + str(self) + "'..")
|
|
|
|
print(f"Uninstalling tool '{self}'..")
|
|
|
|
if hasattr(self, 'custom_uninstall_script'):
|
|
|
|
if hasattr(self, 'custom_uninstall_script'):
|
|
|
|
if self.custom_uninstall_script == 'uninstall_binaryen':
|
|
|
|
if self.custom_uninstall_script == 'uninstall_binaryen':
|
|
|
|
uninstall_binaryen(self)
|
|
|
|
uninstall_binaryen(self)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
raise Exception('Unknown custom_uninstall_script directive "' + self.custom_uninstall_script + '"!')
|
|
|
|
raise Exception(f'Unknown custom_uninstall_script directive "{self.custom_uninstall_script}"!')
|
|
|
|
print("Deleting path '" + self.installation_path() + "'")
|
|
|
|
print(f"Deleting path '{self.installation_path()}'")
|
|
|
|
remove_tree(self.installation_path())
|
|
|
|
remove_tree(self.installation_path())
|
|
|
|
print("Done uninstalling '" + str(self) + "'.")
|
|
|
|
print(f"Done uninstalling '{self}'.")
|
|
|
|
|
|
|
|
|
|
|
|
def dependencies(self):
|
|
|
|
def dependencies(self):
|
|
|
|
if not hasattr(self, 'uses'):
|
|
|
|
if not hasattr(self, 'uses'):
|
|
|
|
@@ -2412,22 +2403,13 @@ def get_emscripten_releases_tot():
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_release_hash(arg, releases_info):
|
|
|
|
def get_release_hash(arg, releases_info):
|
|
|
|
return releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit')
|
|
|
|
return releases_info.get(arg, None) or releases_info.get(f'sdk-{arg}-64bit')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def version_key(ver):
|
|
|
|
def version_key(ver):
|
|
|
|
return tuple(map(int, re.split('[._-]', ver)[:3]))
|
|
|
|
return tuple(map(int, re.split('[._-]', ver)[:3]))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# A sort function that is compatible with both Python 2 and Python 3 using a
|
|
|
|
|
|
|
|
# custom comparison function.
|
|
|
|
|
|
|
|
def python_2_3_sorted(arr, cmp):
|
|
|
|
|
|
|
|
if sys.version_info >= (3,):
|
|
|
|
|
|
|
|
return sorted(arr, key=functools.cmp_to_key(cmp))
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
return sorted(arr, cmp=cmp)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_emsdk_sourced_from_github():
|
|
|
|
def is_emsdk_sourced_from_github():
|
|
|
|
return os.path.exists(os.path.join(EMSDK_PATH, '.git'))
|
|
|
|
return os.path.exists(os.path.join(EMSDK_PATH, '.git'))
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2443,11 +2425,11 @@ def update_emsdk():
|
|
|
|
# Lists all legacy (pre-emscripten-releases) tagged versions directly in the Git
|
|
|
|
# Lists all legacy (pre-emscripten-releases) tagged versions directly in the Git
|
|
|
|
# repositories. These we can pull and compile from source.
|
|
|
|
# repositories. These we can pull and compile from source.
|
|
|
|
def load_legacy_emscripten_tags():
|
|
|
|
def load_legacy_emscripten_tags():
|
|
|
|
return open(sdk_path('legacy-emscripten-tags.txt'), 'r').read().split('\n')
|
|
|
|
return open(sdk_path('legacy-emscripten-tags.txt')).read().split('\n')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def load_legacy_binaryen_tags():
|
|
|
|
def load_legacy_binaryen_tags():
|
|
|
|
return open(sdk_path('legacy-binaryen-tags.txt'), 'r').read().split('\n')
|
|
|
|
return open(sdk_path('legacy-binaryen-tags.txt')).read().split('\n')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def remove_prefix(s, prefix):
|
|
|
|
def remove_prefix(s, prefix):
|
|
|
|
@@ -2479,7 +2461,7 @@ def load_file_index_list(filename):
|
|
|
|
def load_releases_info():
|
|
|
|
def load_releases_info():
|
|
|
|
if not hasattr(load_releases_info, 'cached_info'):
|
|
|
|
if not hasattr(load_releases_info, 'cached_info'):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
text = open(sdk_path('emscripten-releases-tags.json'), 'r').read()
|
|
|
|
text = open(sdk_path('emscripten-releases-tags.json')).read()
|
|
|
|
load_releases_info.cached_info = json.loads(text)
|
|
|
|
load_releases_info.cached_info = json.loads(text)
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
print('Error parsing emscripten-releases-tags.json!')
|
|
|
|
print('Error parsing emscripten-releases-tags.json!')
|
|
|
|
@@ -2502,7 +2484,7 @@ def load_releases_tags():
|
|
|
|
tags = []
|
|
|
|
tags = []
|
|
|
|
info = load_releases_info()
|
|
|
|
info = load_releases_info()
|
|
|
|
|
|
|
|
|
|
|
|
for version, sha in sorted(info['releases'].items(), key=lambda x: version_key(x[0])):
|
|
|
|
for _version, sha in sorted(info['releases'].items(), key=lambda x: version_key(x[0])):
|
|
|
|
tags.append(sha)
|
|
|
|
tags.append(sha)
|
|
|
|
|
|
|
|
|
|
|
|
if extra_release_tag:
|
|
|
|
if extra_release_tag:
|
|
|
|
@@ -2524,15 +2506,9 @@ def load_releases_versions():
|
|
|
|
return versions
|
|
|
|
return versions
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_string(s):
|
|
|
|
|
|
|
|
if sys.version_info[0] >= 3:
|
|
|
|
|
|
|
|
return isinstance(s, str)
|
|
|
|
|
|
|
|
return isinstance(s, basestring) # noqa
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def load_sdk_manifest():
|
|
|
|
def load_sdk_manifest():
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
manifest = json.loads(open(sdk_path("emsdk_manifest.json"), "r").read())
|
|
|
|
manifest = json.loads(open(sdk_path("emsdk_manifest.json")).read())
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
print('Error parsing emsdk_manifest.json!')
|
|
|
|
print('Error parsing emsdk_manifest.json!')
|
|
|
|
print(str(e))
|
|
|
|
print(str(e))
|
|
|
|
@@ -2566,7 +2542,7 @@ def load_sdk_manifest():
|
|
|
|
return version_key(ver) == version_key(reference)
|
|
|
|
return version_key(ver) == version_key(reference)
|
|
|
|
if cmp_operand == '!=':
|
|
|
|
if cmp_operand == '!=':
|
|
|
|
return version_key(ver) != version_key(reference)
|
|
|
|
return version_key(ver) != version_key(reference)
|
|
|
|
raise Exception('Invalid cmp_operand "' + cmp_operand + '"!')
|
|
|
|
raise Exception(f'Invalid cmp_operand "{cmp_operand}"!')
|
|
|
|
|
|
|
|
|
|
|
|
def passes_filters(param, ver, filters):
|
|
|
|
def passes_filters(param, ver, filters):
|
|
|
|
for v in filters:
|
|
|
|
for v in filters:
|
|
|
|
@@ -2583,7 +2559,7 @@ def load_sdk_manifest():
|
|
|
|
t2 = copy.copy(t)
|
|
|
|
t2 = copy.copy(t)
|
|
|
|
found_param = False
|
|
|
|
found_param = False
|
|
|
|
for p, v in vars(t2).items():
|
|
|
|
for p, v in vars(t2).items():
|
|
|
|
if is_string(v) and param in v:
|
|
|
|
if isinstance(v, str) and param in v:
|
|
|
|
t2.__dict__[p] = v.replace(param, ver)
|
|
|
|
t2.__dict__[p] = v.replace(param, ver)
|
|
|
|
found_param = True
|
|
|
|
found_param = True
|
|
|
|
if not found_param:
|
|
|
|
if not found_param:
|
|
|
|
@@ -2703,7 +2679,7 @@ def set_active_tools(tools_to_activate, permanently_activate, system):
|
|
|
|
|
|
|
|
|
|
|
|
if tools_to_activate:
|
|
|
|
if tools_to_activate:
|
|
|
|
tools = [x for x in tools_to_activate if not x.is_sdk]
|
|
|
|
tools = [x for x in tools_to_activate if not x.is_sdk]
|
|
|
|
print('Setting the following tools as active:\n ' + '\n '.join(map(lambda x: str(x), tools)))
|
|
|
|
print('Setting the following tools as active:\n ' + '\n '.join([str(t) for t in tools]))
|
|
|
|
print('')
|
|
|
|
print('')
|
|
|
|
|
|
|
|
|
|
|
|
generate_em_config(tools_to_activate, permanently_activate, system)
|
|
|
|
generate_em_config(tools_to_activate, permanently_activate, system)
|
|
|
|
@@ -2889,15 +2865,15 @@ def construct_env_with_vars(env_vars_to_add):
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
info(key + ' = ' + value)
|
|
|
|
info(key + ' = ' + value)
|
|
|
|
if POWERSHELL:
|
|
|
|
if POWERSHELL:
|
|
|
|
env_string += '$env:' + key + '="' + value + '"\n'
|
|
|
|
env_string += f'$env:{key}="{value}"\n'
|
|
|
|
elif CMD:
|
|
|
|
elif CMD:
|
|
|
|
env_string += 'SET ' + key + '=' + value + '\n'
|
|
|
|
env_string += f'SET {key}={value}\n'
|
|
|
|
elif CSH:
|
|
|
|
elif CSH:
|
|
|
|
env_string += 'setenv ' + key + ' "' + value + '";\n'
|
|
|
|
env_string += f'setenv {key} "{value}";\n'
|
|
|
|
elif FISH:
|
|
|
|
elif FISH:
|
|
|
|
env_string += 'set -gx ' + key + ' "' + value + '";\n'
|
|
|
|
env_string += f'set -gx {key} "{value}";\n'
|
|
|
|
elif BASH:
|
|
|
|
elif BASH:
|
|
|
|
env_string += 'export ' + key + '="' + value + '";\n'
|
|
|
|
env_string += f'export {key}="{value}";\n'
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
assert False
|
|
|
|
assert False
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2913,9 +2889,9 @@ def construct_env_with_vars(env_vars_to_add):
|
|
|
|
# of the SDK but we want to remove that from the current environment
|
|
|
|
# of the SDK but we want to remove that from the current environment
|
|
|
|
# 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', 'EMSDK_FISH',
|
|
|
|
ignore_keys = {'EMSDK_POWERSHELL', 'EMSDK_CSH', 'EMSDK_CMD', 'EMSDK_BASH', 'EMSDK_FISH',
|
|
|
|
'EMSDK_NUM_CORES', 'EMSDK_NOTTY', 'EMSDK_KEEP_DOWNLOADS'])
|
|
|
|
'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 = {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 in ('EM_CACHE', 'EM_CONFIG'):
|
|
|
|
if key.startswith('EMSDK_') or key in ('EM_CACHE', 'EM_CONFIG'):
|
|
|
|
if key not in env_keys_to_add and key not in ignore_keys:
|
|
|
|
if key not in env_keys_to_add and key not in ignore_keys:
|
|
|
|
@@ -2979,7 +2955,7 @@ def expand_sdk_name(name, activating):
|
|
|
|
return name
|
|
|
|
return name
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def main(args):
|
|
|
|
def main(args): # noqa: C901, PLR0911, PLR0912, PLR0915
|
|
|
|
if not args:
|
|
|
|
if not args:
|
|
|
|
errlog("Missing command; Type 'emsdk help' to get a list of commands.")
|
|
|
|
errlog("Missing command; Type 'emsdk help' to get a list of commands.")
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
@@ -3162,11 +3138,11 @@ def main(args):
|
|
|
|
tool_name, url_and_refspec = forked_url.split('@')
|
|
|
|
tool_name, url_and_refspec = forked_url.split('@')
|
|
|
|
t = find_tool(tool_name)
|
|
|
|
t = find_tool(tool_name)
|
|
|
|
if not t:
|
|
|
|
if not t:
|
|
|
|
errlog('Failed to find tool ' + tool_name + '!')
|
|
|
|
errlog('Failed to find tool {tool_name}!')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
t.url, t.git_branch, t.remote_name = parse_github_url_and_refspec(url_and_refspec)
|
|
|
|
t.url, t.git_branch, t.remote_name = parse_github_url_and_refspec(url_and_refspec)
|
|
|
|
debug_print('Reading git repository URL "' + t.url + '" and git branch "' + t.git_branch + '" for Tool "' + tool_name + '".')
|
|
|
|
debug_print(f'Reading git repository URL "{t.url}" and git branch "{t.git_branch}" for Tool "{tool_name}".')
|
|
|
|
|
|
|
|
|
|
|
|
forked_url = extract_string_arg('--override-repository')
|
|
|
|
forked_url = extract_string_arg('--override-repository')
|
|
|
|
|
|
|
|
|
|
|
|
@@ -3179,7 +3155,7 @@ def main(args):
|
|
|
|
CMAKE_GENERATOR = build_generator.group(1)
|
|
|
|
CMAKE_GENERATOR = build_generator.group(1)
|
|
|
|
args[i] = ''
|
|
|
|
args[i] = ''
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
errlog("Cannot parse CMake generator string: " + args[i] + ". Try wrapping generator string with quotes")
|
|
|
|
errlog(f"Cannot parse CMake generator string: {args[i]}. Try wrapping generator string with quotes")
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
elif args[i].startswith('--build='):
|
|
|
|
elif args[i].startswith('--build='):
|
|
|
|
build_type = re.match(r'^--build=(.+)$', args[i])
|
|
|
|
build_type = re.match(r'^--build=(.+)$', args[i])
|
|
|
|
@@ -3192,10 +3168,10 @@ def main(args):
|
|
|
|
CMAKE_BUILD_TYPE_OVERRIDE = build_types[build_type_index]
|
|
|
|
CMAKE_BUILD_TYPE_OVERRIDE = build_types[build_type_index]
|
|
|
|
args[i] = ''
|
|
|
|
args[i] = ''
|
|
|
|
except Exception:
|
|
|
|
except Exception:
|
|
|
|
errlog('Unknown CMake build type "' + build_type + '" specified! Please specify one of ' + str(build_types))
|
|
|
|
errlog(f'Unknown CMake build type "{build_type}" specified! Please specify one of {build_types}')
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
errlog("Invalid command line parameter " + args[i] + ' specified!')
|
|
|
|
errlog(f'Invalid command line parameter {args[i]} specified!')
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
args = [x for x in args if x]
|
|
|
|
args = [x for x in args if x]
|
|
|
|
|
|
|
|
|
|
|
|
@@ -3206,7 +3182,7 @@ def main(args):
|
|
|
|
sdk = find_sdk(name)
|
|
|
|
sdk = find_sdk(name)
|
|
|
|
return 'INSTALLED' if sdk and sdk.is_installed() else ''
|
|
|
|
return 'INSTALLED' if sdk and sdk.is_installed() else ''
|
|
|
|
|
|
|
|
|
|
|
|
if (LINUX or MACOS or WINDOWS) and (ARCH == 'x86' or ARCH == 'x86_64'):
|
|
|
|
if (LINUX or MACOS or WINDOWS) and ARCH in ('x86', 'x86_64'):
|
|
|
|
print('The *recommended* precompiled SDK download is %s (%s).' % (find_latest_version(), find_latest_hash()))
|
|
|
|
print('The *recommended* precompiled SDK download is %s (%s).' % (find_latest_version(), find_latest_hash()))
|
|
|
|
print()
|
|
|
|
print()
|
|
|
|
print('To install/activate it use:')
|
|
|
|
print('To install/activate it use:')
|
|
|
|
@@ -3301,7 +3277,7 @@ def main(args):
|
|
|
|
print('Items marked with * are activated for the current user.')
|
|
|
|
print('Items marked with * are activated for the current user.')
|
|
|
|
if has_partially_active_tools[0]:
|
|
|
|
if has_partially_active_tools[0]:
|
|
|
|
env_cmd = 'emsdk_env.bat' if WINDOWS else 'source ./emsdk_env.sh'
|
|
|
|
env_cmd = 'emsdk_env.bat' if WINDOWS else 'source ./emsdk_env.sh'
|
|
|
|
print('Items marked with (*) are selected for use, but your current shell environment is not configured to use them. Type "' + env_cmd + '" to set up your current shell to use them' + (', or call "emsdk activate --permanent <name_of_sdk>" to permanently activate them.' if WINDOWS else '.'))
|
|
|
|
print(f'Items marked with (*) are selected for use, but your current shell environment is not configured to use them. Type "{env_cmd}" to set up your current shell to use them' + (', or call "emsdk activate --permanent <name_of_sdk>" to permanently activate them.' if WINDOWS else '.'))
|
|
|
|
if not arg_old:
|
|
|
|
if not arg_old:
|
|
|
|
print('')
|
|
|
|
print('')
|
|
|
|
print("To access the historical archived versions, type 'emsdk list --old'")
|
|
|
|
print("To access the historical archived versions, type 'emsdk list --old'")
|
|
|
|
@@ -3334,7 +3310,7 @@ def main(args):
|
|
|
|
elif cmd == 'update-tags':
|
|
|
|
elif cmd == 'update-tags':
|
|
|
|
errlog('`update-tags` is not longer needed. To install the latest tot release just run `install tot`')
|
|
|
|
errlog('`update-tags` is not longer needed. To install the latest tot release just run `install tot`')
|
|
|
|
return 0
|
|
|
|
return 0
|
|
|
|
elif cmd == 'activate' or cmd == 'deactivate':
|
|
|
|
elif cmd in ('activate', 'deactivate'):
|
|
|
|
if arg_permanent:
|
|
|
|
if arg_permanent:
|
|
|
|
print('Registering active Emscripten environment permanently')
|
|
|
|
print('Registering active Emscripten environment permanently')
|
|
|
|
print('')
|
|
|
|
print('')
|
|
|
|
@@ -3353,7 +3329,7 @@ def main(args):
|
|
|
|
print('Deactivating tool ' + str(tool) + '.')
|
|
|
|
print('Deactivating tool ' + str(tool) + '.')
|
|
|
|
tools_to_activate.remove(tool)
|
|
|
|
tools_to_activate.remove(tool)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
print('Tool "' + arg + '" was not active, no need to deactivate.')
|
|
|
|
print(f'Tool "{arg}" was not active, no need to deactivate.')
|
|
|
|
if not tools_to_activate:
|
|
|
|
if not tools_to_activate:
|
|
|
|
errlog('No tools/SDKs specified to activate! Usage:\n emsdk activate tool/sdk1 [tool/sdk2] [...]')
|
|
|
|
errlog('No tools/SDKs specified to activate! Usage:\n emsdk activate tool/sdk1 [tool/sdk2] [...]')
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
@@ -3375,7 +3351,7 @@ def main(args):
|
|
|
|
CPU_CORES = int(multicore.group(1))
|
|
|
|
CPU_CORES = int(multicore.group(1))
|
|
|
|
args[i] = ''
|
|
|
|
args[i] = ''
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
errlog("Invalid command line parameter " + args[i] + ' specified!')
|
|
|
|
errlog(f'Invalid command line parameter {args[i]} specified!')
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
elif args[i] == '--shallow':
|
|
|
|
elif args[i] == '--shallow':
|
|
|
|
GIT_CLONE_SHALLOW = True
|
|
|
|
GIT_CLONE_SHALLOW = True
|
|
|
|
@@ -3412,12 +3388,12 @@ def main(args):
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
tool = find_tool(args[0])
|
|
|
|
tool = find_tool(args[0])
|
|
|
|
if tool is None:
|
|
|
|
if tool is None:
|
|
|
|
errlog("Error: Tool by name '" + args[0] + "' was not found.")
|
|
|
|
errlog(f"Error: Tool by name '{args[0]}' was not found.")
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
tool.uninstall()
|
|
|
|
tool.uninstall()
|
|
|
|
return 0
|
|
|
|
return 0
|
|
|
|
|
|
|
|
|
|
|
|
errlog("Unknown command '" + cmd + "' given! Type 'emsdk help' to get a list of commands.")
|
|
|
|
errlog(f"Unknown command '{cmd}' given! Type 'emsdk help' to get a list of commands.")
|
|
|
|
return 1
|
|
|
|
return 1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
