mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 09:46:08 +08:00
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: coin/platform_configs/qt5.txt coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
This commit is contained in:
Liang Qi
@@ -12,11 +12,10 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC
|
||||
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
|
||||
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
|
||||
qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker
|
||||
qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release
|
||||
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
|
||||
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
|
||||
qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests
|
||||
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
|
||||
qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static
|
||||
qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static
|
||||
qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 GCC Release
|
||||
qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck
|
||||
|
||||
@@ -17,6 +17,9 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin
|
||||
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2
|
||||
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
|
||||
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
|
||||
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
|
||||
qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
|
||||
|
||||
@@ -1,17 +1,59 @@
|
||||
############################################################################
|
||||
##
|
||||
## 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"
|
||||
|
||||
function InstallMinGW
|
||||
{
|
||||
Param (
|
||||
[string] $version = $(BadParam("the version being printed to versions.txt")),
|
||||
[string] $release = $(BadParam("release part of the file name"))
|
||||
[string] $release = $(BadParam("release file name")),
|
||||
[string] $sha1 = $(BadParam("SHA1 checksum of the file"))
|
||||
)
|
||||
|
||||
$arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
|
||||
|
||||
if ($arch -eq "i686") { $win_arch = "Win32" }
|
||||
elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
|
||||
|
||||
$envvar = "MINGW$version"
|
||||
$envvar = $envvar -replace '["."]'
|
||||
$targetdir = "C:\$envvar"
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z"
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
|
||||
$url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z"
|
||||
|
||||
$mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
|
||||
Copy-Item $url_cache $mingwPackage
|
||||
Download $url_official $url_cache $mingwPackage
|
||||
Verify-Checksum $mingwPackage $sha1
|
||||
|
||||
Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
|
||||
|
||||
|
||||
@@ -5,4 +5,4 @@ sudo pkcon -y refresh
|
||||
sudo pkcon -y install python-devel python-virtualenv
|
||||
|
||||
# install python3
|
||||
sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-virtualenv
|
||||
sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
# This script will install MinGW 5.3.0
|
||||
|
||||
$version = "5.3.0"
|
||||
$release = "release-posix-dwarf-rt_v4-rev0"
|
||||
$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0"
|
||||
$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A"
|
||||
|
||||
InstallMinGW $version $release
|
||||
InstallMinGW $release $sha1
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
# This script will install MinGW 6.3.0
|
||||
|
||||
$version = "6.3.0"
|
||||
$release = "release-posix-dwarf-rt_v5-rev2"
|
||||
$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2"
|
||||
$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B"
|
||||
|
||||
InstallMinGW $version $release
|
||||
InstallMinGW $release $sha1
|
||||
|
||||
Reference in New Issue
Block a user