Provisioning: Bump Emscripten version to 2.0.14

Change-Id: I6345cdc3ffef7f17fa75406a3816d1b59451a05a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

2 files changed, 24 insertions, 20 deletions

diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh
index a2fda735..6eb86a17 100755
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -39,34 +39,36 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="1.39.8"
+version="2.0.14"
+versionTag="fc5562126762ab26c4757147a3b4c24e85a7289e"
+versionNode="v14.15.5"
 urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
 targetFolder="/opt/emsdk"
 
 # cross-platform emscripten SDK
 urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz"
 urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz"
-sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
+sha1Emscripten="5fbdca8ed238b90ab8c3656831fcc5eb1ce08c58"
 
 # platform-specific toolchain and node binaries. urls obtained from "emsdk install"
 if uname -a |grep -q Darwin; then
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
+    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/$versionTag/wasm-binaries.tbz2"
     urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
+    sha1WasmBinaries="86dc16b299543cf593abc6f0137f8d0d723baddb"
 
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
-    urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
-    sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
-    pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-$versionNode-darwin-x64.tar.gz"
+    urlNodeBinariesCache="$urlCache/mac/node-$versionNode-darwin-x64.tar.gz"
+    sha1NodeBinaries="6db16d024ea9e5f2ebdd0c1ef07ea67c2004ce93"
+    pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
 else
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
+    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/$versionTag/wasm-binaries.tbz2"
     urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
+    sha1WasmBinaries="9724185c06c461edec3495e37e034066479b9ccf"
 
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
-    urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
-    sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
-    pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-$versionNode-linux-x64.tar.xz"
+    urlNodeBinariesCache="$urlCache/linux/node-$versionNode-linux-x64.tar.xz"
+    sha1NodeBinaries="ca7ce363ceaf71b65e85243a71252c20cfd97982"
+    pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
 fi
 
 sudo mkdir "$targetFolder"
@@ -89,5 +91,6 @@ EOM
 SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
 SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
 SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
+SetEnvVar "EMSDK" "$targetFolder"
 
 echo "Emsdk = $version" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1
index b3375d07..bd6d23b9 100644
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
@@ -35,8 +35,9 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "1.39.8"
-$versionNode = "12.9.1"
+$version = "2.0.14"
+$versionTag="fc5562126762ab26c4757147a3b4c24e85a7289e"
+$versionNode = "14.15.5"
 $versionWinPython = "3.7.4"
 $versionJre = "8_update_152"
 
@@ -48,13 +49,13 @@ $urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk"
 
 $urlEmscriptenCache="$urlCache/emscripten.$version.zip"
 
-$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip"
+$urlWasmBinariesExternal="$urlEmscripten/win/$versionTag/wasm-binaries.zip"
 $urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip"
-$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603"
+$sha1WasmBinaries="a6f3f49df50fe7c8a0e61065b80fd885b8266bf3"
 
 $urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip"
 $urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip"
-$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D"
+$sha1Node = "7df0af8aa3c128cff43d77dd6f3a163d405d0469"
 
 $urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip"
 $urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip"
@@ -66,7 +67,7 @@ $sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2"
 
 $urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip"
 $urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip"
-$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE"
+$sha1Emscripten = "c34789939b8b35b2225b8c9f1c80495238339d6e"
 
 $installLocationEmsdk = "C:\\Utils\\emsdk"
 $temp = "C:\Windows\Temp"