mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-19 03:26:15 +08:00
Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26.
Conflicts:
coin/platform_configs/default.yaml
Temporarily remove the -no-opengl build.
coin/platform_configs/meta-boot2qt.yaml
coin/platform_configs/qt5.yaml
Temporarily remove the webassembly build on windows.
coin/platform_configs/qtwebkit.yaml
Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
This commit is contained in:
Liang Qi
@@ -1,81 +0,0 @@
|
||||
#!/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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
|
||||
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"
|
||||
urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz"
|
||||
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="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
|
||||
sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
|
||||
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
|
||||
targetFolder="/opt/emsdk"
|
||||
sudo mkdir "$targetFolder"
|
||||
|
||||
InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
|
||||
InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
|
||||
InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
|
||||
|
||||
sudo chmod -R a+rwx "$targetFolder"
|
||||
|
||||
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='$targetFolder/node-v$version_node-linux-x64/bin/node'
|
||||
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
|
||||
SPIDERMONKEY_ENGINE = ''
|
||||
V8_ENGINE = ''
|
||||
TEMP_DIR = '/tmp'
|
||||
COMPILER_ENGINE = NODE_JS
|
||||
JS_ENGINES = [NODE_JS]
|
||||
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
|
||||
@@ -37,6 +37,8 @@
|
||||
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
set -ex
|
||||
|
||||
@@ -81,7 +83,7 @@ function InstallGCC() {
|
||||
sudo make install
|
||||
|
||||
rm -rf "$targetFile"
|
||||
rm -rf "$tmpFolder/gcc-$version"
|
||||
sudo rm -rf "$tmpFolder/gcc-$version"
|
||||
fi
|
||||
|
||||
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
|
||||
@@ -97,6 +99,9 @@ function InstallGCC() {
|
||||
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
|
||||
fi
|
||||
|
||||
echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf
|
||||
echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf
|
||||
sudo ldconfig -v
|
||||
|
||||
echo "GCC = $version" >> ~/versions.txt
|
||||
}
|
||||
|
||||
@@ -35,32 +35,38 @@
|
||||
|
||||
# This script install OpenSSL from sources.
|
||||
# Requires GCC and Perl to be in PATH.
|
||||
|
||||
set -ex
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.0.2p"
|
||||
exports_file="/tmp/export.sh"
|
||||
# source previously made environmental variables.
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
else
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
fi
|
||||
|
||||
version="1.1.1b"
|
||||
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
|
||||
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
|
||||
targetFile="/tmp/openssl-$version.tar.gz"
|
||||
installFolder="/home/qt/"
|
||||
sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
|
||||
# Until every VM doing Linux Android builds have provisioned the env variable
|
||||
# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
|
||||
# QTQAINFRA-1436
|
||||
opensslHome="${installFolder}openssl-1.0.2"
|
||||
|
||||
sha="e9710abf5e95c48ebf47991b10cbb48c09dae102"
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
mkdir -p "${HOME}/openssl/android/"
|
||||
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
|
||||
|
||||
tar -xzf "$targetFile" -C "$installFolder"
|
||||
# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
|
||||
mv "${opensslHome}p" "${opensslHome}"
|
||||
pushd "$opensslHome"
|
||||
|
||||
echo "Running configure"
|
||||
perl Configure shared android
|
||||
TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
|
||||
cd "$opensslHome"
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
|
||||
|
||||
|
||||
@@ -41,8 +41,8 @@ set -ex
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
targetFolder="/opt/"
|
||||
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
|
||||
sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
|
||||
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz"
|
||||
sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621"
|
||||
folderName="qnx700"
|
||||
targetFile="qnx700.tar.xz"
|
||||
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
|
||||
|
||||
Reference in New Issue
Block a user