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

Add emsdk_packages_url variable to point to directory where actual downloadable SDK packages reside. Improve SDK update to fetch a package file.

Browse Source
This commit is contained in:
Jukka Jylänki
2013-09-30 14:02:58 +03:00
parent 1c6adfdb68
commit 703cfab158
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
emsdk
View File

@@ -13,6 +13,9 @@ if EMSDK_DEV and not 'active_path' in sys.argv:
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')
emscripten_git_repo = 'git@github.com:kripken/emscripten.git' emscripten_git_repo = 'git@github.com:kripken/emscripten.git'
WINDOWS = False WINDOWS = False
@@ -237,14 +240,17 @@ def git_clone_checkout_and_pull(url, dstpath, branch):
success = git_checkout_and_pull(dstpath, branch) success = git_checkout_and_pull(dstpath, branch)
return success return success
def download_and_unzip(zipfile, dst): def download_and_unzip(zipfile, dest_dir, download_even_if_exists=False):
success = download_file(urlparse.urljoin(emsdk_master_server, zipfile), 'zips/') 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."
return True
success = download_file(urlparse.urljoin(emsdk_packages_url, zipfile), 'zips/', download_even_if_exists)
if not success: if not success:
return False return False
if zipfile.endswith('.zip'): if zipfile.endswith('.zip'):
return unzip('zips/'+zipfile, dst) return unzip('zips/'+zipfile, dest_dir)
else: else:
return untargz('zips/'+zipfile, dst) return untargz('zips/'+zipfile, dest_dir)
def to_unix_path(p): def to_unix_path(p):
return p.replace('\\', '/') return p.replace('\\', '/')
@@ -496,7 +502,7 @@ class Tool:
elif url.endswith('zip') or url.endswith('.tar') or url.endswith('.gz'): elif url.endswith('zip') or url.endswith('.tar') or url.endswith('.gz'):
success = download_and_unzip(url, self.installation_path()) success = download_and_unzip(url, self.installation_path())
else: else:
success = download_file(urlparse.urljoin(emsdk_master_server, self.download_url()), self.installation_path()) success = download_file(urlparse.urljoin(emsdk_packages_url, self.download_url()), self.installation_path())
if not success: if not success:
print "Installation failed!" print "Installation failed!"
return False return False
@@ -566,17 +572,12 @@ def find_latest_sdk():
return sdks[-1] # Newest SDK is always at the end of the list. return sdks[-1] # Newest SDK is always at the end of the list.
def update_emsdk(): def update_emsdk():
download_text_file(urlparse.urljoin(emsdk_master_server, 'emsdk_manifest.json'), emsdk_path(), download_even_if_exists=True)
if not EMSDK_DEV:
download_text_file(urlparse.urljoin(emsdk_master_server, 'emsdk'), emsdk_path(), download_even_if_exists=True)
download_text_file(urlparse.urljoin(emsdk_master_server, 'README.md'), emsdk_path(), download_even_if_exists=True)
if WINDOWS: if WINDOWS:
download_text_file(urlparse.urljoin(emsdk_master_server, 'emsdk_add_path.bat'), emsdk_path(), download_even_if_exists=True) download_and_unzip(urlparse.urljoin(emsdk_packages_url, 'emsdk_windows_update.zip'), emsdk_path(), download_even_if_exists=True)
download_text_file(urlparse.urljoin(emsdk_master_server, 'emcmdprompt.bat'), emsdk_path(), download_even_if_exists=True) elif OSX:
download_text_file(urlparse.urljoin(emsdk_master_server, 'emsdk.bat'), emsdk_path(), download_even_if_exists=True) download_and_unzip(urlparse.urljoin(emsdk_packages_url, 'emsdk_osx_update.tar.gz'), emsdk_path(), download_even_if_exists=True)
else: else:
download_text_file(urlparse.urljoin(emsdk_master_server, 'emsdk_add_path'), emsdk_path(), download_even_if_exists=True) print 'Unsupported OS, cannot update!'
print 'Update complete.'
def load_sdk_manifest(): def load_sdk_manifest():
global tools global tools