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

Merge remote-tracking branch 'remotes/gagern/python3'

Browse Source 
Conflicts:
	emsdk
This commit is contained in:
Jukka Jylänki
2015-04-08 16:04:28 +03:00
parent 4957c20d72 a425415003
commit b0dcb8159e
1 changed files with 148 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

288
emsdk
View File

@@ -1,6 +1,14 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys, optparse, subprocess, urllib2, os, os.path, errno, zipfile, string, json, platform, shutil, tarfile, urlparse, tempfile, multiprocessing, re from __future__ import print_function
import sys, optparse, subprocess, os, os.path, errno, zipfile, string, json, platform, shutil, tarfile, tempfile, multiprocessing, re
if sys.version_info >= (3,):
from urllib.parse import urljoin
from urllib.request import urlopen
from urllib.error import HTTPError
else:
from urlparse import urljoin
from urllib2 import urlopen, HTTPError
# EMSDK_DEV is a developer mode flag, which, if true, the SDK is downloaded from a 'staging' online source, # EMSDK_DEV is a developer mode flag, which, if true, the SDK is downloaded from a 'staging' online source,
# instead of the public source. New releases are first deployed to the staging source for testing, before # instead of the public source. New releases are first deployed to the staging source for testing, before
@@ -9,12 +17,12 @@ import sys, optparse, subprocess, urllib2, os, os.path, errno, zipfile, string,
EMSDK_DEV = bool(os.getenv('EMSDK_DEV')) if os.getenv('EMSDK_DEV') != None else False EMSDK_DEV = bool(os.getenv('EMSDK_DEV')) if os.getenv('EMSDK_DEV') != None else False
if EMSDK_DEV: if EMSDK_DEV:
print 'EMSDK_DEV active.' print('EMSDK_DEV active.')
emsdk_master_server = 'http://clb.demon.fi/emscripten_dev/' emsdk_master_server = 'http://clb.demon.fi/emscripten_dev/'
else: else:
emsdk_master_server = 'https://s3.amazonaws.com/mozilla-games/emscripten/' emsdk_master_server = 'https://s3.amazonaws.com/mozilla-games/emscripten/'
emsdk_packages_url = urlparse.urljoin(emsdk_master_server, 'packages/') emsdk_packages_url = urljoin(emsdk_master_server, 'packages/')
emscripten_git_repo = 'git@github.com:kripken/emscripten.git' emscripten_git_repo = 'git@github.com:kripken/emscripten.git'
@@ -60,10 +68,10 @@ def win_get_environment_variable(key, system=True):
else: # Register locally from CURRENT USER section. else: # Register locally from CURRENT USER section.
folder = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER, 'Environment') folder = win32api.RegOpenKey(win32con.HKEY_CURRENT_USER, 'Environment')
value = str(win32api.RegQueryValueEx(folder, key)[0]) value = str(win32api.RegQueryValueEx(folder, key)[0])
except Exception, e: except Exception as e:
if e[0] != 2: # 'The system cannot find the file specified.' if e[0] != 2: # 'The system cannot find the file specified.'
print >> sys.stderr, 'Failed to read environment variable ' + key + ':' print('Failed to read environment variable ' + key + ':', file=sys.stderr)
print >> sys.stderr, str(e) print(str(e), file=sys.stderr)
win32api.RegCloseKey(folder) win32api.RegCloseKey(folder)
os.environ['PATH'] = prev_path os.environ['PATH'] = prev_path
return None return None
@@ -93,7 +101,7 @@ def win_set_environment_variable(key, value, system=True):
value = subprocess.call(['REG', 'DELETE', 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment', '/V', key, '/f'], stdout=subprocess.PIPE) value = subprocess.call(['REG', 'DELETE', 'SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment', '/V', key, '/f'], stdout=subprocess.PIPE)
else: else:
value = subprocess.call(['REG', 'DELETE', 'HKCU\\Environment', '/V', key, '/f'], stdout=subprocess.PIPE) value = subprocess.call(['REG', 'DELETE', 'HKCU\\Environment', '/V', key, '/f'], stdout=subprocess.PIPE)
except Exception, e: except Exception as e:
return return
return return
@@ -104,11 +112,11 @@ def win_set_environment_variable(key, value, system=True):
cmd = ['SETX'] cmd = ['SETX']
retcode = subprocess.call(cmd + [key, value], stdout=subprocess.PIPE) retcode = subprocess.call(cmd + [key, value], stdout=subprocess.PIPE)
if retcode is not 0: if retcode is not 0:
print >> sys.stderr, 'ERROR! Failed to set environment variable ' + key + '=' + value + '. You may need to set it manually.' print('ERROR! Failed to set environment variable ' + key + '=' + value + '. You may need to set it manually.', file=sys.stderr)
except Exception, e: except Exception as e:
print >> sys.stderr, 'ERROR! Failed to set environment variable ' + key + '=' + value + ':' print('ERROR! Failed to set environment variable ' + key + '=' + value + ':', file=sys.stderr)
print >> sys.stderr, str(e) print(str(e), file=sys.stderr)
print >> sys.stderr, 'You may need to set it manually.' print('You may need to set it manually.', file=sys.stderr)
def win_delete_environment_variable(key, system=True): def win_delete_environment_variable(key, system=True):
win_set_environment_variable(key, None, system) win_set_environment_variable(key, None, system)
@@ -167,15 +175,15 @@ def run(cmd, cwd=None):
process = subprocess.Popen(cmd, cwd=cwd, env=os.environ.copy()) process = subprocess.Popen(cmd, cwd=cwd, env=os.environ.copy())
process.communicate() process.communicate()
if process.returncode != 0: if process.returncode != 0:
print str(cmd) + ' failed with error code ' + str(process.returncode) + '!' print(str(cmd) + ' failed with error code ' + str(process.returncode) + '!')
return process.returncode return process.returncode
# 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, unpack_even_if_exists=False): def untargz(source_filename, dest_dir, unpack_even_if_exists=False):
if not unpack_even_if_exists and num_files_in_directory(dest_dir) > 0: if not unpack_even_if_exists and num_files_in_directory(dest_dir) > 0:
print "File '" + source_filename + "' has already been unpacked, skipping." print("File '" + source_filename + "' has already been unpacked, skipping.")
return True return True
print "Unpacking '" + source_filename + "' to '" + dest_dir + "'" print("Unpacking '" + source_filename + "' to '" + dest_dir + "'")
mkdir_p(dest_dir) mkdir_p(dest_dir)
run(['tar', '-xvf', sdk_path(source_filename), '--strip', '1'], cwd=dest_dir) run(['tar', '-xvf', sdk_path(source_filename), '--strip', '1'], cwd=dest_dir)
#tfile = tarfile.open(source_filename, 'r:gz') #tfile = tarfile.open(source_filename, 'r:gz')
@@ -185,9 +193,9 @@ def untargz(source_filename, dest_dir, unpack_even_if_exists=False):
# 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, unpack_even_if_exists=False): def unzip(source_filename, dest_dir, unpack_even_if_exists=False):
if not unpack_even_if_exists and num_files_in_directory(dest_dir) > 0: if not unpack_even_if_exists and num_files_in_directory(dest_dir) > 0:
print "File '" + source_filename + "' has already been unpacked, skipping." print("File '" + source_filename + "' has already been unpacked, skipping.")
return True return True
print "Unpacking '" + source_filename + "' to '" + dest_dir + "'" print("Unpacking '" + source_filename + "' to '" + dest_dir + "'")
mkdir_p(dest_dir) mkdir_p(dest_dir)
common_subdir = None common_subdir = None
try: try:
@@ -231,12 +239,12 @@ def unzip(source_filename, dest_dir, unpack_even_if_exists=False):
shutil.rmtree(unzip_to_dir) shutil.rmtree(unzip_to_dir)
except: except:
pass pass
except zipfile.BadZipfile, e: except zipfile.BadZipfile as e:
print "Unzipping file '" + source_filename + "' failed due to reason: " + str(e) + "! Removing the corrupted zip file." print("Unzipping file '" + source_filename + "' failed due to reason: " + str(e) + "! Removing the corrupted zip file.")
rmfile(source_filename) rmfile(source_filename)
return False return False
except Exception, e: except Exception as e:
print "Unzipping file '" + source_filename + "' failed due to reason: " + str(e) print("Unzipping file '" + source_filename + "' failed due to reason: " + str(e))
return False return False
return True return True
@@ -270,15 +278,15 @@ def download_file(url, dstpath, download_even_if_exists=False):
file_name = sdk_path(file_name) file_name = sdk_path(file_name)
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("File '" + file_name + "' already downloaded, skipping.")
return file_name return file_name
try: try:
u = urllib2.urlopen(url) u = urlopen(url)
mkdir_p(os.path.dirname(file_name)) mkdir_p(os.path.dirname(file_name))
with open(file_name, 'wb') as f: with open(file_name, 'wb') as f:
meta = u.info() meta = u.info()
file_size = int(meta.getheaders("Content-Length")[0]) file_size = int(meta.getheaders("Content-Length")[0])
print "Downloading: %s from %s Bytes: %s" % (file_name, url, file_size) print("Downloading: %s from %s Bytes: %s" % (file_name, url, file_size))
file_size_dl = 0 file_size_dl = 0
block_sz = 8192 block_sz = 8192
@@ -291,13 +299,13 @@ def download_file(url, dstpath, download_even_if_exists=False):
f.write(buffer) f.write(buffer)
status = r"%10d [%3.2f%%]" % (file_size_dl, file_size_dl * 100. / file_size) status = r"%10d [%3.2f%%]" % (file_size_dl, file_size_dl * 100. / file_size)
status = status + chr(8)*(len(status)+1) status = status + chr(8)*(len(status)+1)
print status, print(status, end=' ')
except urllib2.HTTPError, e: except HTTPError as e:
print "HTTP error with URL '" + url + "': " + str(e) print("HTTP error with URL '" + url + "': " + str(e))
rmfile(file_name) rmfile(file_name)
return None return None
except Exception, e: except Exception as e:
print "Error downloading URL '" + url + "': " + str(e) print("Error downloading URL '" + url + "': " + str(e))
rmfile(file_name) rmfile(file_name)
return None return None
return file_name return file_name
@@ -307,7 +315,7 @@ def download_text_file(url, dstpath, download_even_if_exists=False):
fix_lineendings(os.path.join(emsdk_path(), filename)) fix_lineendings(os.path.join(emsdk_path(), filename))
def run_get_output(cmd, cwd=None): def run_get_output(cmd, cwd=None):
process = subprocess.Popen(cmd, cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, env=os.environ.copy()) 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)
@@ -352,13 +360,13 @@ def GIT(must_succeed=True):
pass pass
if must_succeed: if must_succeed:
if WINDOWS: if WINDOWS:
print "ERROR: git executable was not found. Please install it by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH" print("ERROR: git executable was not found. Please install it by typing 'emsdk install git-1.9.4', or alternatively by installing it manually from http://git-scm.com/downloads . If you install git manually, remember to add it to PATH")
elif OSX: elif OSX:
print "ERROR: git executable was not found. Please install git for this operation! This can be done from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools )" print("ERROR: git executable was not found. Please install git for this operation! This can be done from http://git-scm.com/ , or by installing XCode and then the XCode Command Line Tools (see http://stackoverflow.com/questions/9329243/xcode-4-4-command-line-tools )")
elif LINUX: elif LINUX:
print "ERROR: git executable was not found. Please install git for this operation! This can be probably be done using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git" print("ERROR: git executable was not found. Please install git for this operation! This can be probably be done using your package manager, see http://git-scm.com/book/en/Getting-Started-Installing-Git")
else: else:
print "ERROR: git executable was not found. Please install git for this operation!" print("ERROR: git executable was not found. Please install git for this operation!")
sys.exit(1) sys.exit(1)
return '' # Not found return '' # Not found
@@ -371,7 +379,7 @@ def git_repo_version(repo_path):
def git_clone(url, dstpath): def git_clone(url, dstpath):
if os.path.isdir(os.path.join(dstpath, '.git')): if os.path.isdir(os.path.join(dstpath, '.git')):
print "Repository '" + url + "' already cloned to directory '" + dstpath + "', skipping." print("Repository '" + url + "' already cloned to directory '" + dstpath + "', skipping.")
return True return True
mkdir_p(dstpath) mkdir_p(dstpath)
return run([GIT(), 'clone', url, dstpath]) == 0 return run([GIT(), 'clone', url, dstpath]) == 0
@@ -379,16 +387,16 @@ def git_clone(url, dstpath):
def git_checkout_and_pull(repo_path, branch): def git_checkout_and_pull(repo_path, branch):
run([GIT(), 'fetch', 'origin'], repo_path) run([GIT(), 'fetch', 'origin'], repo_path)
try: try:
print "Fetching latest changes to the branch '" + branch + "' for '" + repo_path + "'..." print("Fetching latest changes to the branch '" + branch + "' for '" + repo_path + "'...")
run([GIT(), 'fetch', 'origin'], repo_path) run([GIT(), 'fetch', 'origin'], repo_path)
# run([GIT, 'checkout', '-b', branch, '--track', 'origin/'+branch], repo_path) # run([GIT, 'checkout', '-b', branch, '--track', 'origin/'+branch], repo_path)
run([GIT(), 'checkout', '--quiet', branch], repo_path) # this line assumes that the user has not gone and manually messed with the repo and added new remotes to ambiguate the checkout. run([GIT(), 'checkout', '--quiet', branch], repo_path) # this line assumes that the user has not gone and manually messed with the repo and added new remotes to ambiguate the checkout.
run([GIT(), 'merge', '--ff-only', 'origin/'+branch], repo_path) # this line assumes that the user has not gone and made local changes to the repo run([GIT(), 'merge', '--ff-only', 'origin/'+branch], repo_path) # this line assumes that the user has not gone and made local changes to the repo
except: except:
print 'git operation failed!' print('git operation failed!')
return False return False
print "Successfully updated and checked out branch '" + branch + "' on repository '" + repo_path + "'" print("Successfully updated and checked out branch '" + branch + "' 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): def git_clone_checkout_and_pull(url, dstpath, branch):
@@ -445,9 +453,9 @@ def find_msbuild(sln_file):
def make_build(build_root, build_type): def make_build(build_root, build_type):
global CPU_CORES global CPU_CORES
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:
print 'Performing a singlethreaded build.' print('Performing a singlethreaded build.')
if WINDOWS: if WINDOWS:
if 'Visual Studio' in CMAKE_GENERATOR: if 'Visual Studio' in CMAKE_GENERATOR:
solution_name = subprocess.check_output(['dir', '/b', '*.sln'], shell=True, cwd=build_root).strip() solution_name = subprocess.check_output(['dir', '/b', '*.sln'], shell=True, cwd=build_root).strip()
@@ -459,16 +467,16 @@ 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=make_env) ret = subprocess.check_call(make, cwd=build_root, env=make_env)
if ret != 0: if ret != 0:
print >> sys.stderr, 'Build failed with exit code ' + ret + '!' print('Build failed with exit code ' + ret + '!', file=sys.stderr)
print >> sys.stderr, 'Working directory: ' + build_root print('Working directory: ' + build_root, file=sys.stderr)
return False return False
except Exception, e: except Exception as e:
print >> sys.stderr, 'Build failed due to exception!' print('Build failed due to exception!', file=sys.stderr)
print >> sys.stderr, 'Working directory: ' + build_root print('Working directory: ' + build_root, file=sys.stderr)
print >> sys.stderr, str(e) print(str(e), file=sys.stderr)
return False return False
return True return True
@@ -480,28 +488,28 @@ def cmake_configure(generator, build_root, src_root, build_type, extra_cmake_arg
if generator: generator = ['-G', generator] if generator: generator = ['-G', generator]
else: generator = [] else: generator = []
cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE='+build_type] + extra_cmake_args + [src_root] cmdline = ['cmake'] + generator + ['-DCMAKE_BUILD_TYPE='+build_type] + extra_cmake_args + [src_root]
print 'Running CMake: ' + str(cmdline) print('Running CMake: ' + str(cmdline))
ret = subprocess.check_call(cmdline, cwd=build_root) ret = subprocess.check_call(cmdline, cwd=build_root)
if ret != 0: if ret != 0:
print >> sys.stderr, 'CMake invocation failed with exit code ' + ret + '!' print('CMake invocation failed with exit code ' + ret + '!', file=sys.stderr)
print >> sys.stderr, 'Working directory: ' + build_root print('Working directory: ' + build_root, file=sys.stderr)
return False return False
except OSError, e: except OSError as e:
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
print >> sys.stderr, str(e) print(str(e), file=sys.stderr)
print >> sys.stderr, 'Could not run CMake, perhaps it has not been installed?' print('Could not run CMake, perhaps it has not been installed?', file=sys.stderr)
if WINDOWS: if WINDOWS:
print >> sys.stderr, 'Installing this package requires CMake. Get it from http://www.cmake.org/' print('Installing this package requires CMake. Get it from http://www.cmake.org/', file=sys.stderr)
elif LINUX: elif LINUX:
print >> sys.stderr, 'Installing this package requires CMake. Get it via your system package manager (e.g. sudo apt-get install cmake), or from http://www.cmake.org/' print('Installing this package requires CMake. Get it via your system package manager (e.g. sudo apt-get install cmake), or from http://www.cmake.org/', file=sys.stderr)
elif OSX: elif OSX:
print >> sys.stderr, 'Installing this package requires CMake. Get it via a OSX package manager (Homebrew: "brew install cmake", or MacPorts: "sudo port install cmake"), or from http://www.cmake.org/' print('Installing this package requires CMake. Get it via a OSX package manager (Homebrew: "brew install cmake", or MacPorts: "sudo port install cmake"), or from http://www.cmake.org/', file=sys.stderr)
return False return False
raise raise
except Exception, e: except Exception as e:
print >> sys.stderr, 'CMake invocation failed due to exception!' print('CMake invocation failed due to exception!', file=sys.stderr)
print >> sys.stderr, 'Working directory: ' + build_root print('Working directory: ' + build_root, file=sys.stderr)
print >> sys.stderr, str(e) print(str(e), file=sys.stderr)
return False return False
return True return True
@@ -548,9 +556,9 @@ def build_optimizer_tool(tool):
def download_and_unzip(zipfile, dest_dir, download_even_if_exists=False): 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
dst_file = download_file(urlparse.urljoin(emsdk_packages_url, zipfile), 'zips/', download_even_if_exists) dst_file = download_file(urljoin(emsdk_packages_url, zipfile), 'zips/', download_even_if_exists)
if not dst_file: if not dst_file:
return False return False
if zipfile.endswith('.zip'): if zipfile.endswith('.zip'):
@@ -644,19 +652,19 @@ JS_ENGINES = [NODE_JS]
except: except:
pass pass
print "The Emscripten configuration file " + os.path.normpath(dot_emscripten_path()) + " has been rewritten with the following contents:" print("The Emscripten configuration file " + os.path.normpath(dot_emscripten_path()) + " has been rewritten with the following contents:")
print '' print('')
print cfg.strip() print(cfg.strip())
print '' print('')
path_add = get_required_path(active_tools) path_add = get_required_path(active_tools)
if not WINDOWS: if not WINDOWS:
emsdk_env = os.path.relpath(sdk_path('emsdk_env.sh')) emsdk_env = os.path.relpath(sdk_path('emsdk_env.sh'))
if not '/' in emsdk_env: if not '/' in emsdk_env:
emsdk_env = './emsdk_env.sh' emsdk_env = './emsdk_env.sh'
print "To conveniently access the selected set of tools from the command line, consider adding the following directories to PATH, or call 'source " + emsdk_env + "' to do this for you." print("To conveniently access the selected set of tools from the command line, consider adding the following directories to PATH, or call 'source " + emsdk_env + "' to do this for you.")
print '' print('')
print ' ' + ENVPATH_SEPARATOR.join(path_add) print(' ' + ENVPATH_SEPARATOR.join(path_add))
def find_msbuild_dir(): def find_msbuild_dir():
if 'ProgramFiles' in os.environ and os.environ['ProgramFiles']: if 'ProgramFiles' in os.environ and os.environ['ProgramFiles']:
@@ -686,7 +694,7 @@ class Tool:
def __init__(self, data): def __init__(self, data):
# Convert the dictionary representation of the tool in 'data' to members of this class for convenience. # Convert the dictionary representation of the tool in 'data' to members of this class for convenience.
for key in data: for key in data:
if isinstance(data[key], unicode): if sys.version_info < (3,) and isinstance(data[key], unicode):
setattr(self, key, data[key].encode('Latin-1')) setattr(self, key, data[key].encode('Latin-1'))
else: else:
setattr(self, key, data[key]) setattr(self, key, data[key])
@@ -774,7 +782,7 @@ class Tool:
for tool_name in self.uses: for tool_name in self.uses:
tool = find_tool(tool_name) tool = find_tool(tool_name)
if tool == None: if tool == None:
print "Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!" print("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
@@ -822,7 +830,7 @@ class Tool:
# print 'activated cfg ' + key + ', value: ' + value # print 'activated cfg ' + key + ', value: ' + value
# if dot_emscripten.has_key(key): # if dot_emscripten.has_key(key):
# print 'dot_emscripten ' + dot_emscripten[key] # print 'dot_emscripten ' + dot_emscripten[key]
if dot_emscripten.has_key(key) and dot_emscripten[key] != value: if key in dot_emscripten and dot_emscripten[key] != value:
return False return False
return True return True
@@ -879,19 +887,19 @@ class Tool:
def install(self): def install(self):
if self.can_be_installed() != True: if self.can_be_installed() != True:
print "The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed() print("The tool '" + str(self) + "' is not available due to the reason: " + self.can_be_installed())
return False return False
print "Installing '" + str(self) + "'.." print("Installing '" + str(self) + "'..")
if self.id == 'sdk': if self.id == 'sdk':
for tool_name in self.uses: for tool_name in self.uses:
tool = find_tool(tool_name) tool = find_tool(tool_name)
if tool == None: if tool == None:
print "Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!" print("Manifest error: No tool by name '" + tool_name + "' found! This may indicate an internal SDK error!")
success = tool.install() success = tool.install()
if not success: if not success:
return False return False
print "Done." print("Done.")
return True return True
else: else:
url = self.download_url() url = self.download_url()
@@ -906,21 +914,21 @@ class Tool:
download_even_if_exists = (self.id == 'vs-tool') download_even_if_exists = (self.id == 'vs-tool')
success = download_and_unzip(url, self.installation_path(), download_even_if_exists) success = download_and_unzip(url, self.installation_path(), download_even_if_exists)
else: else:
dst_file = download_file(urlparse.urljoin(emsdk_packages_url, self.download_url()), self.installation_path()) dst_file = download_file(urljoin(emsdk_packages_url, self.download_url()), self.installation_path())
if dst_file: if dst_file:
success = True success = True
else: else:
success = False success = False
if not success: if not success:
print "Installation failed!" print("Installation failed!")
return False return False
print "Done." print("Done.")
# Sanity check that the installation succeeded, and if so, remove unneeded leftover installation files. # Sanity check that the installation succeeded, and if so, remove unneeded leftover installation files.
if self.is_installed(): if self.is_installed():
self.cleanup_temp_install_files() self.cleanup_temp_install_files()
else: else:
print "Warning: The installation of '" + str(self) + "' seems to have failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error." print("Warning: The installation of '" + str(self) + "' seems to have failed, but no error was detected. Either something went wrong with the installation, or this may indicate an internal emsdk error.")
return True return True
def cleanup_temp_install_files(self): def cleanup_temp_install_files(self):
@@ -932,16 +940,16 @@ class Tool:
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("Tool '" + str(self) + "' was not installed. No need to uninstall.")
return return
print "Uninstalling tool '" + str(self) + "'.." print("Uninstalling tool '" + str(self) + "'..")
try: try:
print "Deleting path '" + self.installation_path() + "'" print("Deleting path '" + self.installation_path() + "'")
shutil.rmtree(self.installation_path(), ignore_errors=True) shutil.rmtree(self.installation_path(), ignore_errors=True)
os.remove(self.installation_path()) os.remove(self.installation_path())
except: except:
pass pass
print "Done." print("Done.")
def dependencies(self): def dependencies(self):
if not hasattr(self, 'uses'): if not hasattr(self, 'uses'):
@@ -1021,21 +1029,21 @@ def find_used_python():
def update_emsdk(): def update_emsdk():
if WINDOWS: if WINDOWS:
download_and_unzip(urlparse.urljoin(emsdk_packages_url, 'emsdk_windows_update.zip'), emsdk_path(), download_even_if_exists=True) download_and_unzip(urljoin(emsdk_packages_url, 'emsdk_windows_update.zip'), emsdk_path(), download_even_if_exists=True)
rmfile('zips/emsdk_windows_update.zip') rmfile('zips/emsdk_windows_update.zip')
elif OSX or LINUX: elif OSX or LINUX:
download_and_unzip(urlparse.urljoin(emsdk_packages_url, 'emsdk_unix_update.tar.gz'), emsdk_path(), download_even_if_exists=True) download_and_unzip(urljoin(emsdk_packages_url, 'emsdk_unix_update.tar.gz'), emsdk_path(), download_even_if_exists=True)
rmfile('zips/emsdk_unix_update.tar.gz') rmfile('zips/emsdk_unix_update.tar.gz')
else: else:
print 'Unsupported OS, cannot update!' print('Unsupported OS, cannot update!')
def load_sdk_manifest(): def load_sdk_manifest():
global tools global tools
try: try:
manifest = json.loads(open(sdk_path("emsdk_manifest.json"), "r").read()) manifest = json.loads(open(sdk_path("emsdk_manifest.json"), "r").read())
except Exception, e: except Exception as e:
print 'Error parsing emsdk_manifest.json!' print('Error parsing emsdk_manifest.json!')
print str(e) print(str(e))
return return
for tool in manifest['tools']: for tool in manifest['tools']:
t = Tool(tool) t = Tool(tool)
@@ -1064,7 +1072,7 @@ def remove_nonexisting_tools(tool_list, log_errors=True):
tool = tool_list[i] tool = tool_list[i]
if not tool.is_installed(): if not tool.is_installed():
if log_errors: if log_errors:
print "The SDK/tool '" + str(tool) + "' cannot be activated since it is not installed! Skipping this tool..." print("The SDK/tool '" + str(tool) + "' cannot be activated since it is not installed! Skipping this tool...")
tool_list.pop(i) tool_list.pop(i)
continue continue
i += 1 i += 1
@@ -1121,7 +1129,7 @@ def set_active_tools(tools_to_activate, permanently_activate):
if len(newpath) < 1024: if len(newpath) < 1024:
win_set_environment_variable('PATH', newpath, system=True) win_set_environment_variable('PATH', newpath, system=True)
else: else:
print >> sys.stderr, 'ERROR! The new PATH is more than 1024 characters long! A PATH this long cannot be set via command line: please add the PATHs specified above to system PATH manually via Control Panel.' print('ERROR! The new PATH is more than 1024 characters long! A PATH this long cannot be set via command line: please add the PATHs specified above to system PATH manually via Control Panel.', file=sys.stderr)
return tools_to_activate return tools_to_activate
@@ -1182,10 +1190,10 @@ def construct_env_windows(tools_to_activate, permanent):
if os.environ['PATH'] != newpath: # Don't bother setting the path if there are no changes. if os.environ['PATH'] != newpath: # Don't bother setting the path if there are no changes.
env_string += 'SET PATH=' + newpath + '\n' env_string += 'SET PATH=' + newpath + '\n'
if len(added_path) > 0: if len(added_path) > 0:
print 'Adding directories to PATH:' print('Adding directories to PATH:')
for item in added_path: for item in added_path:
print 'PATH += ' + item print('PATH += ' + item)
print '' print('')
env_vars_to_add = [] env_vars_to_add = []
em_config_path = os.path.normpath(os.path.join(emscripten_config_directory, '.emscripten')) em_config_path = os.path.normpath(os.path.join(emscripten_config_directory, '.emscripten'))
@@ -1205,14 +1213,14 @@ def construct_env_windows(tools_to_activate, permanent):
env_vars_to_add += [(key, value)] env_vars_to_add += [(key, value)]
if len(env_vars_to_add) > 0: if len(env_vars_to_add) > 0:
print 'Setting environment variables:' print('Setting environment variables:')
for key, value in env_vars_to_add: for key, value in env_vars_to_add:
if permanent: if permanent:
env_string += 'SETX ' + key + ' "' + value + '"\n' env_string += 'SETX ' + key + ' "' + value + '"\n'
else: else:
env_string += 'SET ' + key + '=' + value + '\n' env_string += 'SET ' + key + '=' + value + '\n'
print key + ' = ' + value print(key + ' = ' + value)
print '' print('')
return env_string return env_string
def construct_env_unix(tools_to_activate): def construct_env_unix(tools_to_activate):
@@ -1222,10 +1230,10 @@ def construct_env_unix(tools_to_activate):
if os.environ['PATH'] != newpath: # Don't bother setting the path if there are no changes. if os.environ['PATH'] != newpath: # Don't bother setting the path if there are no changes.
env_string += 'export PATH="' + newpath + '"\n' env_string += 'export PATH="' + newpath + '"\n'
if len(added_path) > 0: if len(added_path) > 0:
print 'Adding directories to PATH:' print('Adding directories to PATH:')
for item in added_path: for item in added_path:
print 'PATH += ' + item print('PATH += ' + item)
print '' print('')
env_vars_to_add = [] env_vars_to_add = []
for tool in tools_to_activate: for tool in tools_to_activate:
@@ -1236,11 +1244,11 @@ def construct_env_unix(tools_to_activate):
env_vars_to_add += [(key, value)] env_vars_to_add += [(key, value)]
if len(env_vars_to_add) > 0: if len(env_vars_to_add) > 0:
print 'Setting environment variables:' print('Setting environment variables:')
for key, value in env_vars_to_add: for key, value in env_vars_to_add:
env_string += 'export ' + key + '="' + value + '"\n' env_string += 'export ' + key + '="' + value + '"\n'
print key + ' = ' + value print(key + ' = ' + value)
print '' print('')
return env_string return env_string
@@ -1253,7 +1261,7 @@ def construct_env(tools_to_activate, permanent):
def silentremove(filename): def silentremove(filename):
try: try:
os.remove(filename) os.remove(filename)
except OSError, e: except OSError as e:
if e.errno != errno.ENOENT: raise if e.errno != errno.ENOENT: raise
def main(): def main():
@@ -1263,11 +1271,11 @@ def main():
if len(sys.argv) <= 1 or sys.argv[1] == 'help': if len(sys.argv) <= 1 or sys.argv[1] == 'help':
if len(sys.argv) <= 1: if len(sys.argv) <= 1:
print ' emsdk: No command given. Please call one of the following:' print(' emsdk: No command given. Please call one of the following:')
else: else:
print ' emsdk: Available commands:' print(' emsdk: Available commands:')
print ''' print('''
emsdk list [--old] - Lists all available SDKs and tools and their emsdk list [--old] - Lists all available SDKs and tools and their
current installation status. With the --old current installation status. With the --old
parameter, also historical versions are shown. parameter, also historical versions are shown.
@@ -1285,10 +1293,10 @@ def main():
emsdk uninstall <tool/sdk> - Removes the given tool or SDK from disk. emsdk uninstall <tool/sdk> - Removes the given tool or SDK from disk.
emsdk activate <tool/sdk> - Activates the given tool or SDK in the emsdk activate <tool/sdk> - Activates the given tool or SDK in the
environment of the current shell.''' environment of the current shell.''')
if WINDOWS: if WINDOWS:
print ''' print('''
emsdk activate [--global] [--embedded] <tool/sdk> emsdk activate [--global] [--embedded] <tool/sdk>
- Activates the given tool or SDK in - Activates the given tool or SDK in
@@ -1303,9 +1311,9 @@ def main():
directory rather than the user home directory. directory rather than the user home directory.
emcmdprompt.bat - Spawns a new command prompt window with the emcmdprompt.bat - Spawns a new command prompt window with the
Emscripten environment active.''' Emscripten environment active.''')
else: else:
print ''' print('''
emsdk activate [--embedded] <tool/sdk> emsdk activate [--embedded] <tool/sdk>
- Activates the given tool or SDK in the - Activates the given tool or SDK in the
@@ -1314,7 +1322,7 @@ def main():
configuration files as well as the temp, cache configuration files as well as the temp, cache
and ports directories are located inside the and ports directories are located inside the
Emscripten SDK directory rather than the user Emscripten SDK directory rather than the user
home directory.''' home directory.''')
return 1 return 1
cmd = sys.argv[1] cmd = sys.argv[1]
@@ -1330,11 +1338,11 @@ def main():
sys.argv[i] = str(find_latest_64bit_sdk()) sys.argv[i] = str(find_latest_64bit_sdk())
if cmd == 'list': if cmd == 'list':
print '' print('')
show_old = len(sys.argv) >= 3 and sys.argv[2] == '--old' show_old = len(sys.argv) >= 3 and sys.argv[2] == '--old'
has_partially_active_tools = False has_partially_active_tools = False
if len(tools) > 0: if len(tools) > 0:
print 'The following individual tools exist:' print('The following individual tools exist:')
for tool in tools: for tool in tools:
if tool.is_old and not show_old: if tool.is_old and not show_old:
continue continue
@@ -1349,28 +1357,28 @@ def main():
active = '(*)' active = '(*)'
has_partially_active_tools = True has_partially_active_tools = True
else: active = ' ' else: active = ' '
print ' ' + active + ' {0: <25}'.format(str(tool)) + installed print(' ' + active + ' {0: <25}'.format(str(tool)) + installed)
print '' print('')
else: else:
print "There are no tools available. Run 'emsdk update' to fetch the latest set of tools." print("There are no tools available. Run 'emsdk update' to fetch the latest set of tools.")
print '' print('')
if len(sdks) > 0: if len(sdks) > 0:
print 'The following Emscripten SDK versions are available:' print('The following Emscripten SDK versions are available:')
for sdk in sdks: for sdk in sdks:
if sdk.is_old and not show_old: if sdk.is_old and not show_old:
continue continue
installed = '\tINSTALLED' if sdk.is_installed() else '' installed = '\tINSTALLED' if sdk.is_installed() else ''
active = '*' if sdk.is_active() else ' ' active = '*' if sdk.is_active() else ' '
print ' ' + active + ' {0: <25}'.format(str(sdk)) + installed print(' ' + active + ' {0: <25}'.format(str(sdk)) + installed)
print '' print('')
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: if has_partially_active_tools:
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 --global <name_of_sdk>" to permanently activate them.' 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 --global <name_of_sdk>" to permanently activate them.')
if not show_old: if not show_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'")
return 0 return 0
elif cmd == 'construct_env': elif cmd == 'construct_env':
@@ -1383,7 +1391,7 @@ def main():
tools_to_activate = process_tool_list(tools_to_activate, log_errors=True) tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
env_string = construct_env(tools_to_activate, len(sys.argv) >= 3 and 'perm' in sys.argv[2]) env_string = construct_env(tools_to_activate, len(sys.argv) >= 3 and 'perm' in sys.argv[2])
open(EMSDK_SET_ENV, 'w').write(env_string) open(EMSDK_SET_ENV, 'w').write(env_string)
if LINUX or OSX: os.chmod(EMSDK_SET_ENV, 0755) if LINUX or OSX: os.chmod(EMSDK_SET_ENV, 0o755)
return 0 return 0
elif cmd == 'update': elif cmd == 'update':
update_emsdk() update_emsdk()
@@ -1392,22 +1400,22 @@ def main():
elif cmd == 'activate': elif cmd == 'activate':
permanently_activate = '--global' in sys.argv permanently_activate = '--global' in sys.argv
if permanently_activate: if permanently_activate:
print 'Registering active Emscripten environment globally for all users.' print('Registering active Emscripten environment globally for all users.')
print '' print('')
embed_activation_to_sdk_dir = '--embedded' in sys.argv embed_activation_to_sdk_dir = '--embedded' in sys.argv
if embed_activation_to_sdk_dir: if embed_activation_to_sdk_dir:
# Activating the emsdk tools locally relative to Emscripten SDK directory. # Activating the emsdk tools locally relative to Emscripten SDK directory.
emscripten_config_directory = emsdk_path() emscripten_config_directory = emsdk_path()
print 'Writing .emscripten configuration file to Emscripten SDK directory ' + emscripten_config_directory print('Writing .emscripten configuration file to Emscripten SDK directory ' + emscripten_config_directory)
else: else:
print 'Writing .emscripten configuration file to user home directory ' + emscripten_config_directory print('Writing .emscripten configuration file to user home directory ' + emscripten_config_directory)
# Remove .emscripten from emsdk dir, since its presence is used to detect whether emsdk is activate in embedded mode or not. # Remove .emscripten from emsdk dir, since its presence is used to detect whether emsdk is activate in embedded mode or not.
try: try:
os.remove(os.path.join(emsdk_path(), ".emscripten")) os.remove(os.path.join(emsdk_path(), ".emscripten"))
except: except:
pass pass
sys.argv = filter(lambda x: not x.startswith('--'), sys.argv) sys.argv = [x for x in sys.argv if not x.startswith('--')]
# If called without arguments, activate latest versions of all tools # If called without arguments, activate latest versions of all tools
if len(sys.argv) <= 2: if len(sys.argv) <= 2:
tools_to_activate = list(tools) tools_to_activate = list(tools)
@@ -1419,12 +1427,12 @@ def main():
if tool == None: if tool == None:
tool = find_sdk(sys.argv[i]) tool = find_sdk(sys.argv[i])
if tool == None: if tool == None:
print "Error: No tool or SDK found by name '" + sys.argv[i] + "'." print("Error: No tool or SDK found by name '" + sys.argv[i] + "'.")
return 1 return 1
tools_to_activate += [tool] tools_to_activate += [tool]
tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=permanently_activate) tools_to_activate = set_active_tools(tools_to_activate, permanently_activate=permanently_activate)
if WINDOWS and not permanently_activate: if WINDOWS and not permanently_activate:
print 'To permanently register this environment globally to all users in Windows Registry, rerun the command with the option --global.' print('To permanently register this environment globally to all users in Windows Registry, rerun the command with the option --global.')
return 0 return 0
elif cmd == 'install': elif cmd == 'install':
# Process args # Process args
@@ -1440,28 +1448,28 @@ def main():
return 1 return 1
sys.argv = filter(lambda x: not len(x) == 0, sys.argv) sys.argv = filter(lambda x: not len(x) == 0, sys.argv)
if len(sys.argv) <= 2: if len(sys.argv) <= 2:
print "Missing parameter. Type 'emsdk install <tool name>' to install a tool or an SDK. Type 'emsdk list' to obtain a list of available tools. Type 'emsdk install latest' to automatically install the newest version of the SDK." print("Missing parameter. Type 'emsdk install <tool name>' to install a tool or an SDK. Type 'emsdk list' to obtain a list of available tools. Type 'emsdk install latest' to automatically install the newest version of the SDK.")
return 1 return 1
tool = find_tool(sys.argv[2]) tool = find_tool(sys.argv[2])
if tool == None: if tool == None:
tool = find_sdk(sys.argv[2]) tool = find_sdk(sys.argv[2])
if tool == None: if tool == None:
print "Error: No tool or SDK found by name '" + sys.argv[2] + "'." print("Error: No tool or SDK found by name '" + sys.argv[2] + "'.")
return 1 return 1
success = tool.install() success = tool.install()
if not success: if not success:
return 1 return 1
elif cmd == 'uninstall': elif cmd == 'uninstall':
if len(sys.argv) <= 2: if len(sys.argv) <= 2:
print "Syntax error. Call 'emsdk uninstall <tool name>'. Call 'emsdk list' to obtain a list of available tools." print("Syntax error. Call 'emsdk uninstall <tool name>'. Call 'emsdk list' to obtain a list of available tools.")
return 1 return 1
tool = find_tool(sys.argv[2]) tool = find_tool(sys.argv[2])
if tool == None: if tool == None:
print "Error: Tool by name '" + sys.argv[2] + "' was not found." print("Error: Tool by name '" + sys.argv[2] + "' was not found.")
return 1 return 1
tool.uninstall() tool.uninstall()
else: else:
print "Unknown command '" + cmd + "' given! Type 'emsdk help' to get a list of commands." print("Unknown command '" + cmd + "' given! Type 'emsdk help' to get a list of commands.")
return 1 return 1
if __name__ == '__main__': if __name__ == '__main__':