mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 17:56:11 +08:00
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/provisioning/qtci-osx-10.10-x86_64/android.sh coin/provisioning/qtci-osx-10.11-x86_64/android.sh Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
This commit is contained in:
Simon Hausmann
@@ -1,14 +1,14 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples
|
||||
qtci-windows-10-x86_64-5 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix
|
||||
qtci-windows-10-x86_64-6 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix
|
||||
qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic
|
||||
qtci-windows-10-x86-4 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-5 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86-5 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-6 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-6 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86_64-6 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo
|
||||
qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
|
||||
qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Template Target OS Target arch Compiler Features
|
||||
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
|
||||
qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-windows-10-x86_64-6 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests
|
||||
qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 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$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
|
||||
# This script will install Visual Studio 2017 Build Tools
|
||||
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
|
||||
|
||||
$version = "2017_version_15.0"
|
||||
$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
|
||||
$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
|
||||
$msvcPackage = "C:\Windows\Temp\$version.exe"
|
||||
|
||||
Download $url_cache $url_cache $msvcPackage
|
||||
Verify-Checksum $msvcPackage $sha1
|
||||
cmd /c "$msvcPackage --all --passive --wait"
|
||||
echo "Cleaning $msvcPackage.."
|
||||
Remove-Item -Recurse -Force "$msvcPackage"
|
||||
echo "Visual Studio Build Tools = $version" >> ~\versions.txt
|
||||
@@ -0,0 +1,48 @@
|
||||
############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 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$
|
||||
##
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\..\common\helpers.ps1"
|
||||
|
||||
# This script will install Visual Studio 2017 Build Tools
|
||||
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
|
||||
|
||||
$version = "2017_version_15.0"
|
||||
$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
|
||||
$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
|
||||
$msvcPackage = "C:\Windows\Temp\$version.exe"
|
||||
|
||||
Download $url_cache $url_cache $msvcPackage
|
||||
Verify-Checksum $msvcPackage $sha1
|
||||
cmd /c "$msvcPackage --all --passive --wait"
|
||||
echo "Cleaning $msvcPackage.."
|
||||
Remove-Item -Recurse -Force "$msvcPackage"
|
||||
echo "Visual Studio Build Tools = $version" >> ~\versions.txt
|
||||
@@ -39,14 +39,11 @@
|
||||
|
||||
# shellcheck source=../common/try_catch.sh
|
||||
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
|
||||
# shellcheck source=../common/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
|
||||
|
||||
targetFolder="/opt/android"
|
||||
sdkTargetFolder="$targetFolder/sdk"
|
||||
|
||||
baseUrl="http://ci-files01-hki.ci.local/input/android"
|
||||
baseAltUrl="https://dl.google.com/android/repository/"
|
||||
basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android"
|
||||
|
||||
toolsVersion="r25.2.5"
|
||||
toolsFile="tools_$toolsVersion-macosx.zip"
|
||||
@@ -58,13 +55,10 @@ sdkApiLevel="android-21"
|
||||
toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
|
||||
ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"
|
||||
|
||||
toolsDlUrl="$baseUrl/$toolsFile"
|
||||
ndkDlUrl="$baseUrl/$ndkFile"
|
||||
toolsAltDlUrl="$baseAltUrl/$toolsFile"
|
||||
ndkAltDlUrl="$baseAltUrl/$ndkFile"
|
||||
|
||||
toolsTargetFile="/tmp/$toolsFile"
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkTargetFile="/tmp/$ndkFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
ExceptionUnzipTools=100
|
||||
ExceptionUnzipNdk=101
|
||||
@@ -74,16 +68,10 @@ ExceptionSdkManager=104
|
||||
|
||||
try
|
||||
(
|
||||
DownloadURL "$toolsDlUrl" "$toolsAltDlUrl" "$toolsSha1" "$toolsTargetFile"
|
||||
DownloadURL "$ndkDlUrl" "$ndkAltDlUrl" "$ndkSha1" "$ndkTargetFile"
|
||||
echo "Unzipping Android NDK to '$targetFolder'"
|
||||
sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
|
||||
sudo unzip -q "$ndkSourceFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
|
||||
echo "Unzipping Android Tools to '$sdkTargetFolder'"
|
||||
sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
|
||||
|
||||
echo "Removing temporary files."
|
||||
rm "$toolsTargetFile" || throw $ExceptionRmTools
|
||||
rm "$ndkTargetFile" || throw $ExceptionRmNdk
|
||||
sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
|
||||
|
||||
echo "Changing ownership of Android files."
|
||||
sudo chown -R qt:wheel "$targetFolder"
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script install Android sdk and ndk.
|
||||
|
||||
# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and - build-tools
|
||||
|
||||
# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
|
||||
# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
|
||||
# That's why we need to use Andoid-21 API version in Qt 5.9.
|
||||
|
||||
|
||||
set -e
|
||||
targetFolder="/opt/android"
|
||||
baseUrl="http://ci-files01-hki.ci.local/input/android"
|
||||
|
||||
# SDK
|
||||
sdkVersion="android-sdk_r24.4.1-macosx.zip"
|
||||
sdkBuildToolsVersion="24.0.2"
|
||||
sdkApiLevel="android-21"
|
||||
sdkUrl="$baseUrl/$sdkVersion"
|
||||
sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd"
|
||||
sdkTargetFile="$targetFolder/$sdkVersion"
|
||||
sdkExtract="unzip $sdkTargetFile -d $targetFolder"
|
||||
sdkFolderName="android-sdk-macosx"
|
||||
sdkName="sdk"
|
||||
|
||||
# NDK
|
||||
ndkVersion="android-ndk-r10e-darwin-x86_64.zip"
|
||||
ndkUrl="$baseUrl/$ndkVersion"
|
||||
ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"
|
||||
ndkTargetFile="$targetFolder/$ndkVersion"
|
||||
ndkExtract="unzip $ndkTargetFile -d $targetFolder"
|
||||
ndkFolderName="android-ndk-r10e"
|
||||
ndkName="ndk"
|
||||
|
||||
function InstallAndroidPackage {
|
||||
targetFolder=$1
|
||||
version=$2
|
||||
url=$3
|
||||
sha1=$4
|
||||
targetFile=$5
|
||||
extract=$6
|
||||
folderName=$7
|
||||
name=$8
|
||||
|
||||
sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times"
|
||||
shasum $targetFile |grep $sha1 || echo "shasum check failed !"
|
||||
sudo chmod 755 $targetFile
|
||||
sudo $extract || echo "Failed to extract $url"
|
||||
sudo chown -R qt:wheel $targetFolder/$folderName
|
||||
sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name"
|
||||
sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version"
|
||||
}
|
||||
|
||||
sudo mkdir $targetFolder
|
||||
# Install Android SDK
|
||||
echo "Installing Android SDK version $sdkVersion..."
|
||||
InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
|
||||
|
||||
# Install Android NDK
|
||||
echo "Installing Android NDK version $ndkVersion..."
|
||||
InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
|
||||
|
||||
# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
|
||||
echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
|
||||
echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
|
||||
|
||||
# For Qt 5.6, we by default require API levels 10, 11, 16 and 21, but we can override this by setting ANDROID_API_VERSION=android-21
|
||||
# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one.
|
||||
echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
|
||||
@@ -469,7 +469,7 @@ sub git_stat_one_submodule
|
||||
my $orig_cwd = getcwd();
|
||||
chdir($submodule) or confess "chdir $submodule: $OS_ERROR";
|
||||
|
||||
my @sts = qx(git status --porcelain --untracked=no);
|
||||
my @sts = qx(git status --porcelain --untracked=no --ignore-submodules=all);
|
||||
|
||||
# After a git clone --no-checkout, git status reports all files as
|
||||
# staged for deletion, but we still want to update the submodule.
|
||||
|
||||
Reference in New Issue
Block a user