mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-22 04:46:45 +08:00
Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into common/platform folders. Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
This commit is contained in:
Liang Qi
@@ -37,9 +37,9 @@
|
||||
|
||||
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
|
||||
|
||||
targetFolder="/opt/android"
|
||||
sdkTargetFolder="$targetFolder/sdk"
|
||||
@@ -38,7 +38,7 @@
|
||||
# CMake is needed for autotests that verify that Qt can be built with CMake
|
||||
|
||||
# shellcheck source=InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
version="3.6.2"
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
|
||||
@@ -34,7 +34,7 @@
|
||||
#############################################################################
|
||||
|
||||
# This script installs FBX SDK
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
#s script installs FBX SDK
|
||||
|
||||
set -e
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
# This script installs INTEGRITY
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
version="11.4.4"
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
|
||||
@@ -36,8 +36,8 @@
|
||||
# This script install OpenSSL from sources.
|
||||
# Requires GCC and Perl to be in PATH.
|
||||
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
|
||||
version="1.0.2g"
|
||||
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
|
||||
@@ -38,9 +38,9 @@
|
||||
# to /Applications/. This can be overridden by a target parameter.
|
||||
|
||||
# shellcheck source=try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
# shellcheck source=DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
|
||||
ExceptionDownload=99
|
||||
ExceptionCreateTmpFile=100
|
||||
@@ -34,7 +34,7 @@
|
||||
#############################################################################
|
||||
|
||||
# shellcheck source=try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
|
||||
ExceptionCreateTmpFile=100
|
||||
ExceptionDownloadPrimaryUrl=101
|
||||
@@ -34,8 +34,8 @@
|
||||
|
||||
# This script installs FBX SDK
|
||||
|
||||
# shellcheck source=./try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
# shellcheck source=./../unix/try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
|
||||
fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
|
||||
targetFolder="/opt/fbx"
|
||||
@@ -32,8 +32,8 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
set -ex
|
||||
|
||||
# Command line tools is need by homebrew
|
||||
@@ -44,8 +44,8 @@
|
||||
|
||||
|
||||
|
||||
# shellcheck source=../common/try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/try_catch.sh"
|
||||
# shellcheck source=../common/unix/try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
|
||||
function InstallXCode()
|
||||
{
|
||||
@@ -40,10 +40,10 @@
|
||||
# In case of Linux, we expect to get the values as args
|
||||
set -e
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
|
||||
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
. $BASEDIR/sw_versions.txt
|
||||
. $BASEDIR/../sw_versions.txt
|
||||
url=$1
|
||||
sha1=$2
|
||||
version=$3
|
||||
@@ -35,8 +35,8 @@
|
||||
|
||||
# This script installs paho testing broker
|
||||
|
||||
# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=./InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
|
||||
PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Dependency Walker 2.2.6000
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# Install Git version 2.13.0
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Java SE
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
function InstallMinGW
|
||||
{
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Notepad++
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Ruby
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs 7-Zip
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs Strawberry Perl
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
param([Int32]$archVer=32)
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
|
||||
# The Clang library (C-bindings), version 3.9 or higher is required for building.
|
||||
|
||||
Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object {
|
||||
Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object {
|
||||
$var = $_.Split('=')
|
||||
New-Variable -Name $var[0] -Value $var[1]
|
||||
$libclang_version = $libclang_version -replace '["."]'
|
||||
@@ -30,7 +30,7 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$version = "11_2_2"
|
||||
$package = "C:\Windows\temp\opengl32sw.7z"
|
||||
@@ -30,7 +30,7 @@
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# Install Cumulative Servicing Release Visual Studio 2015 update 3
|
||||
# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs OpenSSL $version.
|
||||
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
|
||||
@@ -31,11 +31,11 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will set the network test server IP in to hosts file
|
||||
|
||||
$n = Get-Content "$PSScriptRoot\network_test_server_ip.txt"
|
||||
$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt"
|
||||
$n = $n.Split('=')
|
||||
New-Variable -Name $n[0] -Value $n[1]
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Vulkan SDK
|
||||
|
||||
Reference in New Issue
Block a user