From 512f8ff0a26dcc50260811d0108b32679b8c1054 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 Sep 2017 13:26:33 +0300 Subject: [PATCH 1/4] Change Packaging and iOS builds to macOS 10.12 This changes swap packaging and iOS builds from 10.10 to 10.12 Task-number: QTQAINFRA-1095 Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 5 ++--- coin/platform_configs/qt5.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index acfeba93..a94a6371 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -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_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d486061d..727dd7e9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -19,5 +19,5 @@ qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker 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-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From 28ffb0ce8a2f1a9d2003607114ef131cc71d849e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Sep 2017 23:02:12 +0300 Subject: [PATCH 2/4] Update submodules on '5.9' in qt5 Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtvirtualkeyboard | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index ba9a38ce..72e80520 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ba9a38ceca15f9bc086a6c9c5d341001e9e73852 +Subproject commit 72e80520d36802672eca1e93bc6c6019e6f5ffc3 diff --git a/qtbase b/qtbase index b0ffb332..bd72ead4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0ffb332f2aa2ffc0b752c2ad740fbb6a69e0167 +Subproject commit bd72ead4d12ff56c2856294d84f3e5d7e188b817 diff --git a/qtdeclarative b/qtdeclarative index f17b826a..fa52bb66 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f17b826a72d77379288aa84a933b9231c279cbad +Subproject commit fa52bb665d6beb77a951c14c8edcba3541850afc diff --git a/qtmultimedia b/qtmultimedia index f6838120..020e7b4c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f6838120ead0361463c800c25a711b799fae29ee +Subproject commit 020e7b4c198f5e74dd83da7fa8e64a02b14af2f9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f3683d17..31fcce58 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f3683d17c364c4f84f1591dd60121041628f9a5c +Subproject commit 31fcce584aee8ad323b56ab2965a3dc66320adab From 0b251bbdc058808c4264cbcc473c08f6c8a90f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 25 Sep 2017 10:04:39 +0300 Subject: [PATCH 3/4] Provisioning: Install Python3 development libs to OpenSUSE Those are required to build Pyside#5.9 branch. Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a Reviewed-by: Dominik Holland Reviewed-by: Friedemann Kleint --- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 254b738d..ce0badc0 100644 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -5,4 +5,4 @@ sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv # install python3 -sudo pkcon -y install python3 python3-pip python3-virtualenv +sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv From 0e4d668e358eb6a025b3173e8a822ddbef7f5aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 26 Sep 2017 09:32:06 +0300 Subject: [PATCH 4/4] Add official URL to MinGW Windows 10 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MinGW currently uses only internal URL without backup. Added the official URL to these scripts with SHA1 checksum verification. Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-mingw.ps1 | 50 +++++++++++++++++-- .../09-install-mingw530.ps1 | 6 +-- .../09-install-mingw630.ps1 | 6 +-- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 index fc02631d..f835059a 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/install-mingw.ps1 @@ -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"} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index ded894a5..7c4cd8ac 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -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 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index a2710760..e11f2310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -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