lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-10 04:58:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

wasm: update emscripten to 3.1.37

Browse Source 
Qt 6.6 will require emscripten 3.1.37

Change-Id: I24d172b9ba055c690274a99af109b50cd2f79b88
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
(cherry picked from commit 13c53ef79f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Piotr Wierciński
2023-06-12 12:08:14 +02:00
committed by Qt Cherry-pick Bot
parent 9075653904
commit 2a9e989c97
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/provisioning/common/unix/emsdk.sh
View File

@@ -44,7 +44,7 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh # shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh" source "${BASH_SOURCE%/*}/DownloadURL.sh"
version="3.1.25" version="3.1.37"
versionNode="v14.18.2" versionNode="v14.18.2"
tarBallVersion=$(sed "s/\./\_/g" <<<"$version") tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
if uname -a |grep -q Darwin; then if uname -a |grep -q Darwin; then
@@ -60,15 +60,13 @@ target="/tmp/${tarBallPackage}"
mkdir -p /opt mkdir -p /opt
cd /opt cd /opt
echo "URL: $cacheUrl" echo "URL: $cacheUrl"
DownloadURL "$cacheUrl" "" "$sha" "$target" || (
echo "Emsdk isn't cached. Cloning it"
sudo git clone https://github.com/emscripten-core/emsdk.git
)
if [ -f "$target" ]; then if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
sudo tar -xzf "$target" -C /opt/ sudo tar -xzf "$target" -C /opt/
sudo rm -f "$target" sudo rm -f "$target"
else else
echo "Emsdk isn't cached. Cloning it"
sudo git clone https://github.com/emscripten-core/emsdk.git
cd emsdk cd emsdk
sudo ./emsdk install "$version" sudo ./emsdk install "$version"
sudo ./emsdk activate "$version" sudo ./emsdk activate "$version"

2
coin/provisioning/common/windows/emsdk.ps1
View File

@@ -41,7 +41,7 @@
# This script will install emscripten needed by WebAssembly # This script will install emscripten needed by WebAssembly
$version = "3.1.25" $version = "3.1.37"
$zipVersion = $version -replace '\.', "_" $zipVersion = $version -replace '\.', "_"
$temp = "$env:tmp" $temp = "$env:tmp"
$cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip" $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"