1 files changed, 37 insertions, 80 deletions
diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh
index acb2483a..580f966f 100755
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -1,97 +1,54 @@
 #!/usr/bin/env bash
-#############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-# shellcheck source=./InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=./SetEnvVar.sh
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"
+
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="1.38.27"
-version_node="8.9.1"
-urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages"
-urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
-targetFolder="/opt/emsdk"
-
-urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz"
-urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
-sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
-
+version="3.1.50"
+versionNode="v16.20.0"
+tarBallVersion="${version//./_}"
 if uname -a |grep -q Darwin; then
-    urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz"
-    urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz"
-    urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz"
-    urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz"
-    sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa"
-    sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7"
-    node_js="$targetFolder/node-v$version_node-darwin-x64/bin"
+    tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
+    sha="c12169ec8d22fc7a9ef1ba98027435bdf3b72729"
 else
-    urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz"
-    urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
-    urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz"
-    urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz"
-    sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
-    sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
-    node_js="$targetFolder/node-v$version_node-linux-x64/bin"
+    tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
+    sha="5d81a8f1ddcb8d74c70ba5608efd4266c857944a"
 fi
+cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
+target="/tmp/${tarBallPackage}"
 
-sudo mkdir "$targetFolder"
+mkdir -p /opt
+cd /opt
+echo "URL: $cacheUrl"
 
-InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
-InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
+if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
+    sudo tar -xzf "$target" -C /opt/
+    sudo rm -f "$target"
+else
+    echo "Emsdk isn't cached. Cloning it"
+    sudo git clone https://github.com/emscripten-core/emsdk.git
+    cd emsdk
+    sudo ./emsdk install "$version"
+    sudo ./emsdk activate "$version"
+fi
 
-sudo chmod -R a+rwx "$targetFolder"
+# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
+if uname -a |grep -q Darwin; then
+    pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
+else
+    pathNodeExecutable="node-$versionNode-linux-x64/bin/node"
+fi
 
-echo "Writing $targetFolder/.emscripten"
-cat <<EOM >"$targetFolder/.emscripten"
-LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
-EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
-BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
-NODE_JS='$node_js/node'
-EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
-SPIDERMONKEY_ENGINE = ''
-V8_ENGINE = ''
-TEMP_DIR = '/tmp'
-COMPILER_ENGINE = NODE_JS
-JS_ENGINES = [NODE_JS]
-EOM
+emsdkPath="/opt/emsdk/"
+emscriptenPath="${emsdkPath}upstream/emscripten/"
 
-SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\""
-SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
-SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
+SetEnvVar "PATH" "\"\$PATH:${emscriptenPath}\""
+SetEnvVar "EMSCRIPTEN" "${emscriptenPath}"
+SetEnvVar "EMSDK" "${emsdkPath}"
+SetEnvVar "EMSDK_NODE" "${emsdkPath}${pathNodeExecutable}"
 
 echo "Emsdk = $version" >> ~/versions.txt
-echo "Emsdk node = $version_node" >> ~/versions.txt