From 515f46fae8e0d7e76688ebb4e9d524511e5c7957 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 30 May 2019 14:22:07 -0700 Subject: [PATCH] Change default emsdk download location to emscripten-releases/deps (#254) Instead of from mozilla S3. This should make the core python, java, node downloads work, as we have mirrored them to the new location. I think that should be everything - if we missed something, we will get an error, and so know we need to fix something. (The non-deps downloads still use a full url to emscripten-releases in the manifest, which is not changed here.) Also change the download location for old llvm builds to emscripten-releases/old/ --- emsdk | 6 +++--- emsdk_manifest.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/emsdk b/emsdk index fa7bede..0397d01 100755 --- a/emsdk +++ b/emsdk @@ -33,11 +33,11 @@ EMSDK_DEV = bool(os.getenv('EMSDK_DEV')) if os.getenv('EMSDK_DEV') is not None e if EMSDK_DEV: print('EMSDK_DEV active.') - emsdk_master_server = 'http://clb.demon.fi/emscripten_dev/' + emsdk_master_server = 'http://clb.demon.fi/emscripten_dev/packages/' else: - emsdk_master_server = 'https://s3.amazonaws.com/mozilla-games/emscripten/' + emsdk_master_server = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/' -emsdk_packages_url = urljoin(emsdk_master_server, 'packages/') +emsdk_packages_url = emsdk_master_server emscripten_git_repo = 'https://github.com/kripken/emscripten.git' binaryen_git_repo = 'https://github.com/WebAssembly/binaryen.git' diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 2e1974c..9e5e954 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -362,9 +362,9 @@ "id": "clang", "version": "e%precompiled_tag64%", "bitness": 64, - "windows_url": "llvm/tag/win_64bit/emscripten-llvm-e%precompiled_tag64%.zip", - "osx_url": "llvm/tag/osx_64bit/emscripten-llvm-e%precompiled_tag64%.tar.gz", - "linux_url": "llvm/tag/linux_64bit/emscripten-llvm-e%precompiled_tag64%.tar.gz", + "windows_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/win/emscripten-llvm-e%precompiled_tag64%.zip", + "osx_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/mac/emscripten-llvm-e%precompiled_tag64%.tar.gz", + "linux_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/linux/emscripten-llvm-e%precompiled_tag64%.tar.gz", "activated_path": "%installation_dir%", "activated_cfg": "LLVM_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/optimizer%.exe%';BINARYEN_ROOT='%installation_dir%/binaryen'", "activated_env": "LLVM_ROOT=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%/optimizer%.exe%;BINARYEN_ROOT=%installation_dir%/binaryen"