diff options
Diffstat (limited to 'coin/provisioning/common/linux')
-rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 4 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/emsdk.sh | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..7ccfe0a5 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## 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. @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.27" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" -sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" @@ -76,3 +76,6 @@ EOM SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" + +echo "Emsdk = $version" >> ~/versions.txt +echo "Emsdk node = $version_node" >> ~/versions.txt |