From 29a926f941c82ef54bc32149737d041f8b3fcb70 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 25 Jan 2017 11:39:31 +0100 Subject: [PATCH 01/75] Adjust submodule branches Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 625289c3..bb057ac6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.9 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.9 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.9 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.9 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.9 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.9 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = dev + branch = 5.9 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.9 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.9 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.9 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = dev + branch = 5.9 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = dev + branch = 5.9 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.9 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.9 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.9 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.9 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.9 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.9 status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.9 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.9 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.9 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.9 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.9 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.9 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.9 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.9 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,94 +226,94 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.9 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.9 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.9 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.9 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.9 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.9 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.9 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.9 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.9 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.9 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = dev + branch = 5.9 status = preview [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = dev + branch = 5.9 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech - branch = dev + branch = 5.9 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth - branch = dev + branch = 5.9 status = preview From db9682888c384b3e8333d7b01719adb96a23becb Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 23 Jan 2017 12:04:25 +0200 Subject: [PATCH 02/75] Add PS provisioning helper for 7-Zip files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/helpers.ps1 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 0e684452..191be290 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -15,6 +15,29 @@ function Verify-Checksum } } +function Extract-7Zip +{ + Param ( + [string]$Source, + [string]$Destination + ) + echo "Extracting '$Source' to '$Destination'..." + + if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) { + $zipExe = join-path ${env:ProgramFiles(x86)} '7-zip\7z.exe' + if (-not (test-path $zipExe)) { + $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe' + if (-not (test-path $zipExe)) { + throw "Could not find 7-zip." + } + } + } else { + $zipExe = "7z.exe" + } + + & $zipExe x $Source "-o$Destination" -y +} + function Extract-Zip { Param ( From 321d5f1488938ad80f207a03a02101ebbf8ce763 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 23 Jan 2017 12:12:51 +0200 Subject: [PATCH 03/75] Provision libusb-1.0 for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's needed by tqtc-boot2qt/qdb. Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/libusb.ps1 | 47 +++++++++++++++++++ .../qtci-windows-10-x86/libusb.ps1 | 1 + .../qtci-windows-7-x86/libusb.ps1 | 1 + .../qtci-windows-8-x86/libusb.ps1 | 1 + 4 files changed, 50 insertions(+) create mode 100644 coin/provisioning/common/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/libusb.ps1 diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1 new file mode 100644 index 00000000..ed575886 --- /dev/null +++ b/coin/provisioning/common/libusb.ps1 @@ -0,0 +1,47 @@ +############################################################################# +# +# 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$ +# +############################################################################ + +# lisbusb-1.0 is needed by tqtc-boot2qt/qdb + +. "$PSScriptRoot\helpers.ps1" + +$archive = "C:\users\qt\downloads\libusb-1.0.21.7z" +$libusb_location = "C:\Utils\libusb-1.0" + +Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z http://ci-files01-hki.ci.local/input/libusb-1.0/libusb-1.0.21.7z $archive +Verify-Checksum $archive "37c8884a0ddca97d492b8ef3e08970ae3ba20653" + +Extract-7Zip $archive $libusb_location + +# Tell tqtc-boot2qt/qdb build system where to find libusb +[Environment]::SetEnvironmentVariable("LIBUSB_PATH", $libusb_location, "Machine") diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/libusb.ps1 b/coin/provisioning/qtci-windows-7-x86/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" From 0c8536fc0a22bb071cecaa9165cce5586f4ff55b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 2 Feb 2017 09:07:50 +0200 Subject: [PATCH 04/75] Provision: Script for linux to remove preinstalled software Script to remove tier1's preinstalled software. Script itself includes all information about the software that needs to be removed from tier2 before provision starts to run installations. When this script is run for certain platform that platform needs to provision all removed software back to tier2 template. So user needs to make sure that all needed provision script are available when calling this removal-script. Goal is to have vanilla os when provision don't need to remove any software before installations. When this goal is reached this script and script calls can be removed from provision. Change-Id: I048909800807fabb1dc599e768a90e7457fbc2cf Reviewed-by: Simon Hausmann --- .../common/linux-removethemall.sh | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 coin/provisioning/common/linux-removethemall.sh diff --git a/coin/provisioning/common/linux-removethemall.sh b/coin/provisioning/common/linux-removethemall.sh new file mode 100755 index 00000000..4386ec74 --- /dev/null +++ b/coin/provisioning/common/linux-removethemall.sh @@ -0,0 +1,49 @@ +#!/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script removes preinstalled sw. +# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script + +function RemoveDir { + targetFolder=$1 + + if [ -d "$targetFolder" ]; then + echo "Removing existing $targetFolder..." + sudo rm -fr "$targetFolder" + fi +} + +# Android +RemoveDir /opt/android From 713188e4af7d99e4b04b5270b13fbb3b786d4edc Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 16 Jan 2017 14:21:47 +0100 Subject: [PATCH 05/75] Revert "Clean up usage of qtsvg as dependency" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtdeclarative has a runtime dependency, some tests rely on the svg module being available, so in order to not reduce the test coverage, revert this change. I'd like to see a better/cleaner separation, but for the time being, better coverage wins. This reverts commit fbd782636b6ee413d2b6e8bca408263297194254. Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6dc85870..9bcdf4ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative qtsvg + recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.6 @@ -159,7 +159,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 From 32b5e271a8998d25130c1cca4de7df93de9911e4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 22 Nov 2016 10:45:09 +0100 Subject: [PATCH 06/75] Update jom to 1.1.2 The most important changes that affect the CI are: - Fixed bogus path in error message for failed targets. - Fixed error "JobClient destroyed while still acquiring." that could be yielded for failed builds. - Fixed /k option (QTCREATORBUG-17131). - Added the special .NOTPARALLEL target that disables parallel build for the containing makefile. (This one is needed to build QtWebEngine in debug-and-release properly.) - Introduced the JOMFLAGS environment variable. This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up separate flags for nmake and jom. Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409 Reviewed-by: Simon Hausmann --- coin/provisioning/common/jom.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 index ef012b64..c1e2cbf7 100644 --- a/coin/provisioning/common/jom.ps1 +++ b/coin/provisioning/common/jom.ps1 @@ -1,9 +1,9 @@ . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\jom_1_1_0.zip" +$zip = "c:\users\qt\downloads\jom_1_1_2.zip" -Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip -Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" +Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip +Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4" Extract-Zip $zip C:\Utils\Jom [Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine") From 6afffd698574703acf2d4c8a30d07343a8a8e14f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 10 Jan 2017 15:26:57 +0200 Subject: [PATCH 07/75] Provision: Script to print sw versions to provision log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script is the last script that is run by provisioning. It will print all storaged sw information to provision log Change-Id: I2c76d5f7cccf9c116cb660ffcb67d3bece473da8 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/version.sh | 43 ++++++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/version.sh | 44 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100755 coin/provisioning/common/version.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/version.sh new file mode 100755 index 00000000..e7662e1e --- /dev/null +++ b/coin/provisioning/common/version.sh @@ -0,0 +1,43 @@ +#!/bin/env bash + +############################################################################# +## +## 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 will print all installed software to provision log. +# Script needs to be named so that it will be ran at last during provisioning + +# Print all build machines versions to provision log +echo "*********************************************" +echo "***** SW VERSIONS *****" +cat ~/versions.txt +echo "*********************************************" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh new file mode 100644 index 00000000..5ef5f0e9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh @@ -0,0 +1,44 @@ +#!/bin/env bash + +############################################################################# +## +## 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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +$(dirname $0)/../common/version.sh From a36977963a9b6fad940f6ae8395401ce567f4b49 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 10 Jan 2017 09:59:14 +0200 Subject: [PATCH 08/75] Provision: Storage android sdk and ndk version information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sdk and ndk version information will be storaged to versions.txt. Versions.txt will be used for all provision scripts and later on it's data will be printed to provision log. Also script name changed to match both android sdk and ndk. Change-Id: I3366e596f539099c3b587466d90905d0889398fe Reviewed-by: Tony Sarajärvi --- ...{android_sdk_linux.sh => android_linux.sh} | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{android_sdk_linux.sh => android_linux.sh} (64%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh similarity index 64% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 81132d9b..1d0630ce 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -48,23 +48,24 @@ targetFolder="/opt/android" baseUrl="http://ci-files01-hki.ci.local/input/android" # SDK -sdkVersion="android-sdk_r24.4.1-linux.tgz" +sdkPackage="android-sdk_r24.4.1-linux.tgz" sdkBuildToolsVersion="23.0.3" sdkApiLevel="android-18" -sdkUrl="$baseUrl/$sdkVersion" +sdkUrl="$baseUrl/$sdkPackage" sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkVersion" +sdkTargetFile="$targetFolder/$sdkPackage" sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" sdkFolderName="android-sdk-linux" sdkName="sdk" # NDK -ndkVersion="android-ndk-r10e-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkVersion" +ndkVersion="r10e" +ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" +ndkUrl="$baseUrl/$ndkPackage" ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkVersion" +ndkTargetFile="$targetFolder/$ndkPackage" ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-r10e" +ndkFolderName="android-ndk-$ndkVersion" ndkName="ndk" function InstallAndroidPackage { @@ -77,29 +78,40 @@ function InstallAndroidPackage { folderName=$7 name=$8 - sudo wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" - sudo chmod 755 $targetFile + sudo chmod 755 "$targetFile" sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users $targetFolder/$folderName - sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" - sudo rm -fr $targetFolder/$version + sudo chown -R qt:users "$targetFolder"/"$folderName" + sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" + sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir $targetFolder +sudo mkdir "$targetFolder" # Install Android SDK -echo "Installing Android SDK version $sdkVersion..." -InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName +echo "Installing Android SDK version $sdkPackage..." +InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName # Install Android NDK -echo "Installing Android NDK version $ndkVersion..." -InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName +echo "Installing Android NDK version $ndkPackage..." +InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName # run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools echo "Running Android SDK update for API version 18, 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" +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 18, but we can override this by setting ANDROID_API_VERSION=android-18 # From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc +# Storage version information to ~/versions.txt, which is used to print version information to provision log. +echo "***** Android SDK *****" >> ~/versions.txt +echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt +echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt +platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" +echo "Android Platform Tools = $platformTools" >> ~/versions.txt +sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" +echo "Android SDK Tools = $sdkTools" >> ~/versions.txt +echo "***** Android NDK *****" >> ~/versions.txt +echo "Android NDK Version = $ndkVersion" >> ~/versions.txt + From 4b45cd68d4f365c0025ca19611f35660361e8d76 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 3 Feb 2017 15:36:26 +0100 Subject: [PATCH 09/75] Update submodules on '5.8' in qt5 Change-Id: Ic3a06dd310fd7b67b53b95c8f6b1ef8813449fe5 Reviewed-by: Liang Qi --- qt3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qt3d b/qt3d index 8ec785d2..5cdfef0b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8ec785d21c13ed0a8d375ff13bf06bea1deb11ae +Subproject commit 5cdfef0be44d12bf340b5640e458a73631a4a6f3 diff --git a/qtconnectivity b/qtconnectivity index 468e3c38..2eaf5b34 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 468e3c38a893b9293a9f0ede432ce54d72b46966 +Subproject commit 2eaf5b3428f8440de2535be26bb0dee59fd0740d diff --git a/qtdeclarative b/qtdeclarative index e0c119cc..bf19d329 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e0c119ccd4ca49b6fecb708133bb0d3008903560 +Subproject commit bf19d3294f83fc061eddc719bc608bb19e500a5a diff --git a/qtdoc b/qtdoc index ff545591..24435fb0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ff5455912a1a8e40ce9edc731c6c5dcf3a7d9a8e +Subproject commit 24435fb0818ddf414de6d753dc5460da34b905f4 diff --git a/qtlocation b/qtlocation index 8cbfb416..ee5bf405 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8cbfb416c6cb1f60a7035d810f3ed68d3aae7bac +Subproject commit ee5bf40562aeca6fd861121ab29506cf905189f3 diff --git a/qtmacextras b/qtmacextras index 56ca83ad..f1d8761b 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 56ca83adf83cecd3b81425973d3bb65715719b80 +Subproject commit f1d8761b93fc3f23cb537b6e06f4502a3f214df0 diff --git a/qtmultimedia b/qtmultimedia index e5ee1e03..7c787f11 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e5ee1e036eaecb91797cbe85ac7f8929145f3d65 +Subproject commit 7c787f11dd2348e0fd2cecc231f15a0acde7481a diff --git a/qtnetworkauth b/qtnetworkauth index 1f5d0bbc..212ae9ac 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1f5d0bbcf5a581a67aad97564fb696f180462967 +Subproject commit 212ae9ac4a8c6bd8a74bbe67ffdcc730906bcad6 diff --git a/qtqa b/qtqa index 583ae213..1561b922 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 +Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 diff --git a/qtrepotools b/qtrepotools index d4c099dd..7f2dc562 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c +Subproject commit 7f2dc562e3e13640f615c86d700da3b501091f59 diff --git a/qtscxml b/qtscxml index c575eb52..b0031247 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c575eb524bc26fc4af3711d634110c226c9e11c0 +Subproject commit b00312476eb182c5cd716559148016558a5889b4 diff --git a/qtsensors b/qtsensors index 1b880496..722194f5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1b88049661176d149fa75bfdc349cf5b7acb21b4 +Subproject commit 722194f5cdfc04a1be875249507067f913ab2776 diff --git a/qtserialbus b/qtserialbus index aef65fb8..a13f088f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit aef65fb80fc60909ac5141f2df1f9918f964528c +Subproject commit a13f088fab1d2b28778f41a6e8f4c0951061c03f diff --git a/qtserialport b/qtserialport index 86683c44..489d8ce0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 86683c445aa61d23af5c06f4e4b45c1d4c80a5bd +Subproject commit 489d8ce034c422549c1cb39da29de361695f4137 diff --git a/qtspeech b/qtspeech index 9bfe64fd..ecc425e3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9bfe64fddcc528e9aa27b33a17e1435f46ec620d +Subproject commit ecc425e33290abdda9a193b57f160d3195930586 diff --git a/qtsvg b/qtsvg index 9778bdd2..7738642c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9778bdd27ce04b92824abfc1bb54b21f1086a2f6 +Subproject commit 7738642c0d8af7066ea488b239fbefa4b55ecca8 diff --git a/qttools b/qttools index 7bb45dc5..05fd8652 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7bb45dc5318c4c84d94ff35400616eee8e7f741d +Subproject commit 05fd8652a7e43df2fc763222892f3c33bed7183f diff --git a/qtwayland b/qtwayland index df015bd2..712e7f6d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit df015bd2e40e7654b2515996d5bd82469542581a +Subproject commit 712e7f6d96b00f1002a5f833f09ad465332967f0 diff --git a/qtwebchannel b/qtwebchannel index 031d8d8b..6015604d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 031d8d8b1c150f464fc29f7c7a296d257b19797a +Subproject commit 6015604df92ceea6021268a2161da29fb89e0738 diff --git a/qtwebengine b/qtwebengine index 35c38346..685366c9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 35c38346e65fe26c75bbe08c7002f645ea53fec1 +Subproject commit 685366c9a3d8d967e072c721c64a365ce50bc531 diff --git a/qtwebkit b/qtwebkit index 7c082434..a4eec411 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7c0824348f93947c946a42999afd8b5dd329c519 +Subproject commit a4eec4118333b59d10fd6cc9f126b1af2e8f505c diff --git a/qtwebsockets b/qtwebsockets index 83a05bbd..abc12bf1 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 83a05bbdc5d87246ec089f855545b6836c0fdf38 +Subproject commit abc12bf1c2dde5864fcd321ca41bcf2f80874d85 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2e582640..57a1b273 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2e582640c06facd313d77b34fe40c9db4419eef5 +Subproject commit 57a1b273a42746755bbcd93a74245d17afd81625 From ce7b09a1fc851555fd8ce8bfe21cd5a1f3f5460b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sun, 5 Feb 2017 11:31:17 +0100 Subject: [PATCH 10/75] Add speech-dispatcher-devel to RHEL Without this Qt Speech is useless in our packages. Task-number: QTBUG-58461 Change-Id: I5c93fae1b3a2987353c75865f1b0831114afedbf Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh index c322bcbf..daf3efab 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh @@ -1,9 +1,11 @@ # gstreamer 1 for QtMultimedia # gtk3 style for QtGui/QStyle # libusb1 for tqtc-boot2qt/qdb +# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux sudo yum install -y \ gstreamer1-devel gstreamer1-plugins-base-devel \ gtk3-devel \ - libusb1-devel + libusb1-devel \ + speech-dispatcher-devel From 5035a69e5506d51d14477fae024ea2bcc679c8c5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 4 Feb 2017 10:40:52 +0100 Subject: [PATCH 11/75] Update qtbase manually Change-Id: I2e9330f0f037bd8637c4391fe5abde613aadc2ea Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 02cc57f4..0e168f2c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 02cc57f4edbae450ecfa8368052afa44f8aeee19 +Subproject commit 0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00 From c8372d36413ae2e8c854f9bf742ed29eb4b060c6 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 26 Jan 2017 12:07:30 +0200 Subject: [PATCH 12/75] Linux android builds to RHEL 7.2 In 5.9 android builds will be using RHEL 7.2 instead of 6.6 Task-number: QTQAINFRA-1096 Change-Id: Ia802aa31fe347616c829e2142991686fe8e95ed9 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 2 +- .../01-linux-removethemall.sh | 1 + .../02-android_linux.sh | 117 ++++++++++++++++++ 4 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index be44f77f..40633b0f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,7 +18,7 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static -qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Jethro armv7 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 9429c5bd..76f57f9f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh new file mode 100644 index 00000000..38194671 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh @@ -0,0 +1 @@ +"${BASH_SOURCE%/*}/../common/linux-removethemall.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh new file mode 100644 index 00000000..87569d72 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh @@ -0,0 +1,117 @@ +#!/bin/env bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# 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 version 23.0.3 + +# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. + +# 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 +sdkPackage="android-sdk_r24.4.1-linux.tgz" +sdkBuildToolsVersion="23.0.3" +sdkApiLevel="android-21" +sdkUrl="$baseUrl/$sdkPackage" +sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" +sdkTargetFile="$targetFolder/$sdkPackage" +sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" +sdkFolderName="android-sdk-linux" +sdkName="sdk" + +# NDK +ndkVersion="r10e" +ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" +ndkUrl="$baseUrl/$ndkPackage" +ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" +ndkTargetFile="$targetFolder/$ndkPackage" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-$ndkVersion" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" + echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo chmod 755 "$targetFile" + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:users "$targetFolder"/"$folderName" + sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" + sudo rm -fr "$targetFolder"/"$version" +} + +sudo mkdir "$targetFolder" + +# Install Android SDK +echo "Installing Android SDK version $sdkPackage..." +InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkPackage..." +InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName + +# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools +echo "Running Android SDK update for API version 18, 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 18, but we can override this by setting ANDROID_API_VERSION=android-18 +# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. +# echo 'export ANDROID_API_VERSION=$sdkApiLevel' >> ~/.bashrc + +# Storage version information to ~/versions.txt, which is used to print version information to provision log. +echo "***** Android SDK *****" >> ~/versions.txt +echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt +echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt +platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" +echo "Android Platform Tools = $platformTools" >> ~/versions.txt +sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" +echo "Android SDK Tools = $sdkTools" >> ~/versions.txt +echo "***** Android NDK *****" >> ~/versions.txt +echo "Android NDK Version = $ndkVersion" >> ~/versions.txt From f65479ee0c1e9cb7463928ab656c60e5c16bd9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 6 Feb 2017 10:55:06 +0200 Subject: [PATCH 13/75] Upgrade CMake to 3.6.2 on Windows 8 Pyside requires CMake 3.0 or higher Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-8-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 | 1 + 2 files changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-8-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From 2835a4d873c19f9171ebd8c8a46a7bf910486544 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 6 Nov 2016 22:44:29 +0300 Subject: [PATCH 14/75] Upgrade CMake to 3.6.2 on Windows 7 builder Task-number: QTQAINFRA-996 Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800 Reviewed-by: Simon Hausmann (cherry picked from commit daa865312104e7d5d073b0a63e0f50c8a04b9697) --- coin/provisioning/qtci-windows-7-x86/cmake.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/cmake.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From 25160f24b6dea4172b482610ca500f961360c787 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 28 Sep 2016 13:07:43 +0300 Subject: [PATCH 15/75] Upgrade CMake to 3.6.2 QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann (cherry picked from commit 77eeee64a43c5c448321b8f5ac7b64c872e14489) --- coin/provisioning/common/cmake.ps1 | 10 ++++++++++ coin/provisioning/qtci-windows-10-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 | 1 + 3 files changed, 12 insertions(+) create mode 100644 coin/provisioning/common/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 new file mode 100644 index 00000000..6870f3a7 --- /dev/null +++ b/coin/provisioning/common/cmake.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" + +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip +Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" + +Extract-Zip $zip C: +Remove-Item C:\CMake -Force -Recurse +Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From ad97fd589f14432f74bd4b1cf864f2cfcd877664 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 26 Jan 2017 13:17:19 +0200 Subject: [PATCH 16/75] Provisioning: Visual Studio 2015 with update 3 Common install script for Visual Studio installation and updates. Latest Visual Studio 2015 update is required for releases Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc Reviewed-by: Simon Hausmann --- coin/provisioning/common/msvc2015_update.ps1 | 58 +++++++++++++++++++ .../06-msvc2015_update.ps1 | 33 +++++++++++ .../06-msvc2015_update.ps1 | 33 +++++++++++ 3 files changed, 124 insertions(+) create mode 100644 coin/provisioning/common/msvc2015_update.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 diff --git a/coin/provisioning/common/msvc2015_update.ps1 b/coin/provisioning/common/msvc2015_update.ps1 new file mode 100644 index 00000000..618c87c4 --- /dev/null +++ b/coin/provisioning/common/msvc2015_update.ps1 @@ -0,0 +1,58 @@ +############################################################################# +## +## 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\helpers.ps1" + +# Install Visual Studio $version with $update_version +# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs +$version = "2015" +$update_version = "3" + +# Only way to install specific Visual studio release is to use feed.xml. +# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' +# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) +$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" + +$msvc_web_installer = "vs" + $version + "_" + $update_version +$package = "C:\Windows\temp\$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" +$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" + +echo "Fetching Visual Studio $version update $update_version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing Visual studio $version update $update_version..." +cmd /c "$package $parameters /norestart /Quiet" +remove-item $package + +echo "Visual Studio = $version update $update_version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 new file mode 100644 index 00000000..83ff3f48 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 @@ -0,0 +1,33 @@ +############################################################################# +## +## 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\msvc2015_update.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 new file mode 100644 index 00000000..83ff3f48 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 @@ -0,0 +1,33 @@ +############################################################################# +## +## 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\msvc2015_update.ps1" From 15e396f7c3c22c5d91fc24d8e401cd92ebf0ecdb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 8 Feb 2017 09:33:18 +0100 Subject: [PATCH 17/75] Update submodules on '5.8' in qt5 Change-Id: I8c13bd75500b5fe21bde113b40b4e4161b8355f0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 5cdfef0b..69b94b86 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5cdfef0be44d12bf340b5640e458a73631a4a6f3 +Subproject commit 69b94b86e3141f1204c5a1121e1d289cd6f04a7b diff --git a/qtbase b/qtbase index 0e168f2c..b6bf2a33 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00 +Subproject commit b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 diff --git a/qtcharts b/qtcharts index ac91bf79..d920dfad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ac91bf7984291f46619415213ce089a33fc3e597 +Subproject commit d920dfad07c671d45af116b0b1816873074f94b5 diff --git a/qtdeclarative b/qtdeclarative index bf19d329..ce15c3af 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bf19d3294f83fc061eddc719bc608bb19e500a5a +Subproject commit ce15c3af57858b9b8b0621398121691b20c6f638 diff --git a/qtlocation b/qtlocation index ee5bf405..d9d36100 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ee5bf40562aeca6fd861121ab29506cf905189f3 +Subproject commit d9d36100d170ee7cdb04e2782d75e06118934def diff --git a/qtmultimedia b/qtmultimedia index 7c787f11..8d0e08e9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7c787f11dd2348e0fd2cecc231f15a0acde7481a +Subproject commit 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 diff --git a/qtnetworkauth b/qtnetworkauth index 212ae9ac..97db61d7 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 212ae9ac4a8c6bd8a74bbe67ffdcc730906bcad6 +Subproject commit 97db61d77432eefbc489d292cc95ed0a4902e77f diff --git a/qtquickcontrols b/qtquickcontrols index 27da25e2..07490d56 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 27da25e24ed44008f7ba303bb7fe8291aa43fd14 +Subproject commit 07490d5610f7a18bbf50f3a5d118c33fb8e88f5d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f0ce8b84..e6cc5382 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f0ce8b847e2169ad4ae884dbb35b58e6dd0f1859 +Subproject commit e6cc5382d9b789274d3e16e8601f33075b6a4b1c diff --git a/qtrepotools b/qtrepotools index 7f2dc562..51744f4f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7f2dc562e3e13640f615c86d700da3b501091f59 +Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce diff --git a/qtscript b/qtscript index d9d0f0fb..963cefe1 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit d9d0f0fb7857b71c04f6ff8c30e3092a57af1ef4 +Subproject commit 963cefe17376d2b0a4be448d9b025c4e31c579bc diff --git a/qtscxml b/qtscxml index b0031247..bd5dd290 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b00312476eb182c5cd716559148016558a5889b4 +Subproject commit bd5dd290e5a056d22688a64a58c2a669fed2d085 diff --git a/qtserialbus b/qtserialbus index a13f088f..a0c5dc1b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a13f088fab1d2b28778f41a6e8f4c0951061c03f +Subproject commit a0c5dc1bb516e205e10264f8c5dd8b5402d10bfe diff --git a/qtwayland b/qtwayland index 712e7f6d..91f5d6a9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 712e7f6d96b00f1002a5f833f09ad465332967f0 +Subproject commit 91f5d6a99d5f22334e33624126e881b3228c5ce2 diff --git a/qtwebengine b/qtwebengine index 685366c9..9ff8eda0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 685366c9a3d8d967e072c721c64a365ce50bc531 +Subproject commit 9ff8eda0af657ad504318aebea5349b76fbb107a diff --git a/qtxmlpatterns b/qtxmlpatterns index 57a1b273..f6e5f6ea 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 57a1b273a42746755bbcd93a74245d17afd81625 +Subproject commit f6e5f6eaf2eb958aa043440c8941b25339644360 From d6f56195bc09455ad713a590416dc0b8aabd1ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 15 Dec 2016 15:56:01 +0200 Subject: [PATCH 18/75] Add system setup provisioning for OS X 10.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1087 Change-Id: Icba6d58c56fc00b4fe3a7a3f72050465ff64d104 Reviewed-by: Simo Fält --- .../002-disable-screensaver.sh | 26 ---- .../qtci-osx-10.11-x86_64/005-systemsetup.sh | 118 ++++++++++++++++++ 2 files changed, 118 insertions(+), 26 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh deleted file mode 100644 index 44df94e7..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -mkdir -p $HOME/Library/LaunchAgents -cat >$HOME/Library/LaunchAgents/no-screensaver.plist < - - - - Label - org.qt.io.screensaver_disable - ProgramArguments - - defaults - -currentHost - write - com.apple.screensaver - idleTime - 0 - - RunAtLoad - - KeepAlive - - - -EOT diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh new file mode 100755 index 00000000..399ae47e --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh @@ -0,0 +1,118 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script modified system settings for automated use + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +VNCPassword=qt +NTS_IP=10.212.2.0 + +ExceptionDisableScreensaver=100 +ExceptionSetInitialDelay=101 +ExceptionSetDelay=102 +ExceptionVNC=103 +ExceptionNTS=104 + +try +( + echo "Disable Screensaver" + mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver + ( + cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" < + + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT + ) || throw $ExceptionDisableScreensaver + + echo "Set keyboard type rates and delays" + # normal minimum is 15 (225 ms) + defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay + # normal minimum is 2 (30 ms) + defaults write -g KeyRepeat -int 2 || throw $ExceptionSetDelay + + echo "Enable remote desktop sharing" + sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all || throw $ExceptionVNC + + echo "Set Network Test Server address to $NTS_IP in /etc/hosts" + echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS + +) +catch || { + case $ex_code in + $ExceptionDisableScreensaver) + echo "Failed to disable screensaver." + exit 1; + ;; + $ExceptionSetInitialDelay) + echo "Failed to set initial delay of keyboard." + exit 1; + ;; + $ExceptionSetDelay) + echo "Failed to set delay of keyboard." + exit 1; + ;; + $ExceptionVNC) + echo "Failed to enable VNC." + exit 1; + ;; + $ExceptionNTS) + echo "Failed to set NTS." + exit 1; + ;; + esac +} + From dd1b6e53b1e673c8c5b76da389d0061917820468 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 15:53:15 +0300 Subject: [PATCH 19/75] Add provisioning helper script for installing compressed files This script downloads a file from a given URL, uncompresses it and installs it to a desired location. Task-number: QTQAINFRA-1087 Change-Id: I466cb81ec6c96bb0d46329ec98dcc4f31be173ec Reviewed-by: Akseli Salovaara --- .../InstallAppFromCompressedFileFromURL.sh | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh new file mode 100644 index 00000000..b6072062 --- /dev/null +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -0,0 +1,127 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script receives URLs to a compressed file. It then downloads it, +# uncompresses it and installs it by default +# to /Applications/. This can be overridden by a target parameter. + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +ExceptionCreateTmpFile=100 +ExceptionCreateTmpDirectory=101 +ExceptionUncompress=102 +ExceptionMoveApp=103 +ExceptionDeleteTmpFile=104 +ExceptionRemoveTmpDirectory=105 +ExceptionUnknownFormat=106 + + +function InstallAppFromCompressedFileFromURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + appPrefix=$4 + target=$5 + + if [ "" == "$target" ]; then + target="/Applications/" + fi + + try + ( + basefilename=${url##*/} + extension=${basefilename##*.} + filename=${basefilename%.*} + if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then + extension="tar.gz" + fi + + echo "Extension for file: $extension" + echo "Creating temporary file and directory" + targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile + targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" + echo "Uncompress $targetFile" + case $extension in + "tar.gz") + tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress + ;; + "zip") + unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress + ;; + *) + throw $ExceptionUnknownFormat + ;; + esac + echo "Moving app to '$target'" + sudo mv "$targetDirectory/$appPrefix/"* "$target" || throw $ExceptionMoveApp + echo "Removing file '$targetFile'" + rm "$targetFile" || throw $ExceptionDeleteTmpFile + echo "Removing directory '$targetDirectory'" + rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory + ) + + catch || { + case $ex_code in + $ExceptionCreateTmpFile) + echo "Failed to create temporary file" + exit 1; + ;; + $ExceptionUncompress) + echo "Failed extracting compressed file." + exit 1; + ;; + $ExceptionMoveApp) + echo "Failed moving app to '$target'." + exit 1; + ;; + $ExceptionDeleteTmpFile) + echo "Failed deleting temporary file." + exit 1; + ;; + $ExceptionRemoveTmpDirectory) + echo "Failed deleting temporary file." + exit 1; + ;; + $ExceptionUnknownFormat) + echo "Unknown file format." + exit 1; + ;; + esac + } +} From f969320ac554b569f3f474a6a8796106086d7e4c Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 12:17:21 +0300 Subject: [PATCH 20/75] Add provisioning PKG install helper script for bash Task-number: QTQAINFRA-1087 Change-Id: I93f33e2e93371f68f31a9ed8b4d9c89ee091b629 Reviewed-by: Heikki Halmet Reviewed-by: Akseli Salovaara --- coin/provisioning/common/InstallPKGFromURL.sh | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 coin/provisioning/common/InstallPKGFromURL.sh diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh new file mode 100644 index 00000000..07f23d62 --- /dev/null +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -0,0 +1,103 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +ExceptionCreateTmpFile=100 +ExceptionDownloadPrimaryUrl=101 +ExceptionDownloadAltUrl=102 +ExceptionSHA1=103 +ExceptionInstallerPKG=104 +ExceptionDeleteTmpFile=105 + + +function InstallPKGFromURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + targetDirectory=$4 + + try + ( + echo "Creating temporary file" + targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg") || trow $ExceptionCreateTmpFile + try + ( + echo "Downloading PKG from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl + ) + catch || { + case $ex_code in + $ExceptionDownloadPrimaryUrl) + echo "Failed to download '$url' multiple times" + echo "Downloading PKG from alternative URL '$url_alt'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl + ;; + esac + } + echo "Checking SHA1 on PKG '$targetFile'" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + echo "Run installer on PKG" + sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG + echo "Removing file '$targetFile'" + rm "$targetFile" || throw $ExceptionDeleteTmpFile + ) + + catch || { + case $ex_code in + $ExceptionCreateTmpFile) + echo "Failed to create temporary file" + exit 1; + ;; + $ExceptionDownloadAltUrl) + echo "Failed downloading PKG from primary and alternative URLs" + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check sha1sum." + exit 1; + ;; + $ExceptionInstallerPKG) + echo "Failed running installer on PKG." + exit 1; + ;; + $ExceptionDeleteTmpFile) + echo "Failed deleting temporary file." + exit 1; + ;; + esac + } +} From 7a48b0d17cf6a0308990d95ce307b29fddaa5628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 15 Dec 2016 15:57:44 +0200 Subject: [PATCH 21/75] Add xz.sh provisioning script for OS X 10.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1087 Change-Id: I29879e17a18ffb7950c7a85db75f4bc2765741d5 Reviewed-by: Aapo Keskimolo Reviewed-by: Simo Fält --- .../qtci-osx-10.11-x86_64/015-xz.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh new file mode 100755 index 00000000..dcd8fead --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs XZ-Utils + +# XZ-Utils are needed for uncompressing xz-compressed files + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/XZ.pkg" +AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" +SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +echo "XZ = 5.0.7" >> ~/versions.txt From f7d20b7cc2217b90d4983e45d9b74051d513adfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 16 Dec 2016 10:00:40 +0200 Subject: [PATCH 22/75] Add XCode provisioning script for OS X 10.11 Task-number: QTQAINFRA-1087 Change-Id: I416b38459ef278f82af0379b46fd78f5ccc6512c Reviewed-by: Akseli Salovaara --- .../qtci-osx-10.11-x86_64/020-xcode.sh | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh new file mode 100755 index 00000000..dc02ae14 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs Xcode +# Prerequisites: Have Xcode prefetched to local cache as xz compressed. +# This can be achieved by fetching Xcode_8.xip from Apple Store. +# Uncompress it with 'xar -xf Xcode_8.xip' +# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py +# with which you can run 'python parse_pbzx2.py Content'. +# This will give you a file called "Content.part00.cpio.xz" that +# can be renamed to Xcode_8.xz for this script. + + + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +ExceptionDownloadUrl=100 +ExceptionSHA1=101 +ExceptionUnXZ=102 +ExceptionCPIO=103 +ExceptionDelete=104 + + +url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.2.xz +targetFile=/tmp/Xcode_8.2.xz +expectedSha1=46edc920955e315d946e36c45f629d5ee9dc9d59 + +try +( + echo "Downloading Xcode from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl + + echo "Checking SHA1 on $targetFile" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + + echo "Uncompressing '$targetFile'" + xz -d "$targetFile" || throw $ExceptionUnXZ + + echo "Unarchiving '${targetFile%.*}'" + (cd /Applications/ && sudo cpio -dmiI "${targetFile%.*}") || throw $ExceptionCPIO + + echo "Deleting '${targetFile%.*}'" + rm "${targetFile%.*}" || throw $ExceptionDelete + + echo "Xcode = 8.2" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownloadUrl) + echo "Failed to download Xcode." + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check SHA1." + exit 1; + ;; + $ExceptionUnXZ) + echo "Failed to uncompress .xz" + exit 1; + ;; + $ExceptionCPIO) + echo "Failed to unarchive .cpio." + exit 1; + ;; + $ExceptionDelete) + echo "Failed to delete temporary file." + exit 1; + ;; + + esac +} + + From 13ed034dc38c10948bdf0a5693e0ed86b90c7b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 16 Dec 2016 10:04:42 +0200 Subject: [PATCH 23/75] Add Cmake provisioning script for OS X 10.11 Task-number: QTQAINFRA-1087 Change-Id: If598b4b8391e13ed0891d8a65f752492fe303d29 Reviewed-by: Akseli Salovaara --- .../qtci-osx-10.11-x86_64/025-cmake.sh | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh new file mode 100755 index 00000000..3dadd9bc --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs CMake + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" +appPrefix="cmake-3.6.2-Darwin-x86_64" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc +echo "CMake = 3.6.2" >> ~/versions.txt From fc32c9bbf77de5a28c493031fd17b4c364f892e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 16 Dec 2016 10:27:36 +0200 Subject: [PATCH 24/75] Add postgresql provisioning script for OS X 10.11 Task-number: QTQAINFRA-1087 Change-Id: Ia186b8df007384f7fd03139ad448563b920ee21b Reviewed-by: Akseli Salovaara --- .../qtci-osx-10.11-x86_64/025-postgresql.sh | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh new file mode 100755 index 00000000..381fedf2 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs PostgreSQL + +# PostgreSQL is needed for Qt to be able to support PostgreSQL + +# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" +AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" +SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" +appPrefix="" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc +echo "PostgreSQL = 9.6.0" >> ~/versions.txt + From 0b3c843fb2c816595f58eb0ffa613284109896e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 16 Dec 2016 10:26:36 +0200 Subject: [PATCH 25/75] Add MySQL provisioning script to OS X 10.11 Task-number: QTQAINFRA-1087 Change-Id: If10ba5d5d3f2b4891098ffad8519fe4e16d8c268 Reviewed-by: Akseli Salovaara --- .../qtci-osx-10.11-x86_64/025-mysql.sh | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh new file mode 100755 index 00000000..4d938890 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +############################################################################# +## +## 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 installs MySQL + +# MySQL is needed for Qt to be able to support MySQL + +# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" +AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" +SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" +appPrefix="" +targetDir="/opt/mysql57/" + +sudo mkdir -p "/opt" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" + +echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc +echo "MySQL = 5.7.15" >> ~/versions.txt + From 8f9d75f18fb228127122b7933dc07d60b820bcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 16 Dec 2016 10:03:09 +0200 Subject: [PATCH 26/75] Add command line tools provisioning script for OS X 10.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1087 Change-Id: I51aa4ee850d8e8603fac78572942e3be8f1175e4 Reviewed-by: Simo Fält --- .../021-commandlinetools.sh | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh new file mode 100755 index 00000000..8a8e921c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh @@ -0,0 +1,111 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs Command Line Tools for Xcode +# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +ExceptionDownloadUrl=100 +ExceptionSHA1=101 +ExceptionAttachImage=102 +ExceptionInstall=103 +ExceptionDetachImage=104 +ExceptionRemoveTmpFile=105 +ExceptionAcceptLicense=106 + + +url=http://ci-files01-hki.ci.local/input/mac/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg +targetFile=/tmp/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg +expectedSha1=4df615ca765ac1a1e681ddcbca79fc15990e3b25 + +try +( + echo "Downloading Command Line Tools from URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl + + echo "Checking SHA1 on '$targetFile'" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + + echo Mounting DMG + hdiutil attach "$targetFile" || throw $ExceptionAttachImage + + echo Installing Command Line Tools + (cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS El Capitan version 10.11).pkg" -target /) || throw $ExceptionInstall + + hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage + + echo "Removing temporary file '$targetFile'" + rm "$targetFile" || throw $ExceptionRemoveTmpFile + + echo "Accept license" + sudo xcodebuild -license accept || throw $ExceptionAcceptLicense + + echo "Command Line Tools = 8.2" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownloadUrl) + echo "Failed to download Command Line Tools from form URL '$url'." + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check SHA1." + exit 1; + ;; + $ExceptionAttachImage) + echo "Failed to attach image." + exit 1; + ;; + $ExceptionInstall) + echo "Failed to install Command Line Tools." + exit 1; + ;; + $ExceptionDetachImage) + echo "Failed to detach image." + exit 1; + ;; + $ExceptionRemoveTmpFile) + echo "Failed to remove temporary file." + exit 1; + ;; + $ExceptionAcceptLicense) + echo "Failed to accept license." + exit 1; + ;; + + esac +} From ae5c1d4f5dbd1481b5b95906856dc91f7d95f311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 6 Feb 2017 15:17:25 +0200 Subject: [PATCH 27/75] Provisioning: remove Android provisioning script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android tools and NDK is not needed in 10.11. Task-number: QTQAINFRA-1087 Change-Id: I8f3f4e71492ea09828823f6ef70ab29faa08934c Reviewed-by: Simo Fält Reviewed-by: Heikki Halmet Reviewed-by: Akseli Salovaara --- .../01-macos-removethemall.sh | 4 - .../qtci-osx-10.11-x86_64/android.sh | 102 ------------------ 2 files changed, 106 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/android.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh deleted file mode 100644 index 6b56aac4..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -source "$BASEDIR/../common/01-macos-removethemall.sh" - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh deleted file mode 100644 index 3b6e75b4..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh +++ /dev/null @@ -1,102 +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 and decision was made to use it also with Qt 5.6. - -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 From 9c808847351047a3a4e092f279f3e775eddc6b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 7 Feb 2017 13:30:50 +0200 Subject: [PATCH 28/75] Provisioning: remove extra crashreport script We have a duplicate of the same file, but different name. Change-Id: Iedd70498a91bde0dddb05c33972fd21274399ae8 Reviewed-by: Akseli Salovaara --- coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh deleted file mode 100644 index ba8dbdd3..00000000 --- a/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -defaults write com.apple.CrashReporter DialogType server From e4769f93795f91954c3a9f64efab9ad12aa44704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 24 Jan 2017 12:00:57 +0200 Subject: [PATCH 29/75] Add one OS X 10.11 configuration to the CI The "-3" suffix for the configuration name is due to it being a clean TIER1 image and has not everything preinstalled manually. Tests are disabled at first. They will be enabled once we sort out all failing autotests. Task-number: QTQAINFRA-1088 Change-Id: I7adc05869524acdff9ba295d604c3fc28a7aab99 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 40633b0f..c568ddef 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -14,6 +14,7 @@ qtci-linux-Ubuntu-14.04-x86_64 GCC qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch DisableTests qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework From de553b356b4aeab46ea6e1558f96403c6a8d0aac Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 9 Feb 2017 10:47:01 +0100 Subject: [PATCH 30/75] Update submodules on '5.9' in qt5 Change-Id: Id4973a02255df2d2b311ac9f3b60d545bac3128f Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/qt3d b/qt3d index 7e6d78e2..601ee914 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e6d78e2cc647f1fe1a66a9350e6a39574212e72 +Subproject commit 601ee9146676ef78f6ad486420ba9849ac44c844 diff --git a/qtactiveqt b/qtactiveqt index c550735e..bada5f8e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c550735ebeb937a36b82c161f0fed4e35b8776bb +Subproject commit bada5f8ea74d6d9d2a60b35f4d271da143aced51 diff --git a/qtandroidextras b/qtandroidextras index 3c6d1f97..3f9e9244 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3c6d1f97c0b17f572ae569ad56360cca68fe23cb +Subproject commit 3f9e924417c13f2026fda503a1620f517370466d diff --git a/qtcanvas3d b/qtcanvas3d index a693bff7..3ac87eeb 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit a693bff7bc33145f918e8e1f160ab26cad551042 +Subproject commit 3ac87eeb59dd7ec0351d76a05dd7cfa22a274e5e diff --git a/qtcharts b/qtcharts index 1fea2116..e0ba5ac9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1fea2116072f96a86daec092e54fe658651a4034 +Subproject commit e0ba5ac91dbb1fe3611118239c00ea8d748e5678 diff --git a/qtconnectivity b/qtconnectivity index f128dd43..89cf6da8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f128dd43319d6a7020f7ee1e018b8f0bbff499ab +Subproject commit 89cf6da818279b16708d320ae3f5ed434310a347 diff --git a/qtdatavis3d b/qtdatavis3d index f03ed59a..f750a084 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f03ed59a582d2bf689c866f195224bf659a7bc47 +Subproject commit f750a084bec3062b1531e299e880043cfa19d6e7 diff --git a/qtdeclarative b/qtdeclarative index 94f6071b..7cab0a31 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 94f6071b8a36501d9da516f2bf0f251147c8b934 +Subproject commit 7cab0a31de5ab67bbe1add88ea6aa27e7bbc4ddc diff --git a/qtdoc b/qtdoc index 7a2df73f..8a6b1a9b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7a2df73f8ba5c0a8eef9bd08daf86ef449bc5673 +Subproject commit 8a6b1a9bc39922f1c0839b050eda128ce03cd0cb diff --git a/qtgamepad b/qtgamepad index bada2f46..9c7ed97c 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit bada2f466aff5faeae6239038cba227ea9636d1f +Subproject commit 9c7ed97cf9f01fd08183c8e4918c9f95286ac11c diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 574f6c73..a3a229bd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 574f6c73a967ec9ec497534e35f442ef327c25b3 +Subproject commit a3a229bd2ace8fc4f874304e60cf1cb74f294d71 diff --git a/qtimageformats b/qtimageformats index e349e6df..d2306d74 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e349e6df7a08b4aa15a63fa5f1dcd0f36d598d53 +Subproject commit d2306d74850986692c02b70df0d7a6a6e933d0dc diff --git a/qtlocation b/qtlocation index 93cd42ef..f5021281 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 93cd42ef606178261e12eeffc88cd4b7d029dbc3 +Subproject commit f5021281c56b660b81d0122608ca9b577889f99e diff --git a/qtmacextras b/qtmacextras index 3d975119..20d1d8d0 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3d975119f95173ce7ed2a29277cf1aa575bc31ad +Subproject commit 20d1d8d097333ec6d13a0dd0c46aeab1bdacb50a diff --git a/qtmultimedia b/qtmultimedia index 7e48870c..5e01869d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7e48870c182e66a8408bbcb4c9469d751a777daa +Subproject commit 5e01869d61ded981d5e3e4d955ddbc3c4c6fb201 diff --git a/qtpurchasing b/qtpurchasing index d11d69a2..ca91a12d 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d11d69a2dd46a49d244b9611ee6e0e22bb2a1f9b +Subproject commit ca91a12d768b9249a9e502806d68cb68afd5b16e diff --git a/qtqa b/qtqa index 583ae213..1561b922 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 +Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 diff --git a/qtquickcontrols b/qtquickcontrols index ff2c10d2..652e3bfc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ff2c10d287aa9f9726ceee91543f08ab1f9d0b9c +Subproject commit 652e3bfcefab674be3caa5062f4d1cf9634b9ef2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bb2a6c61..13ece44c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bb2a6c61777e2500fa00710c8bb752fa7b99f079 +Subproject commit 13ece44c44b4214b568ca3638ef62e0f1af04d7f diff --git a/qtrepotools b/qtrepotools index d4c099dd..51744f4f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c +Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce diff --git a/qtscript b/qtscript index 508514b5..61d135d1 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 508514b50737c8b854f1b8932a933ef1a24debbc +Subproject commit 61d135d1c0ae52a756cf62144210fa73c9ea5526 diff --git a/qtscxml b/qtscxml index 4b4e8139..5d851f27 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4b4e81398bdfcda23a9e3c86a297e12b2ff1e9d9 +Subproject commit 5d851f27a3c72e46df0dfdd234fc3a300a2870fb diff --git a/qtsensors b/qtsensors index 993ab0bd..d7f1d23c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 993ab0bd1d573f0bbab6e3fcd08d25bc4f32a3d9 +Subproject commit d7f1d23c1dd954d20e8358ca6b7c3f6720310f50 diff --git a/qtserialbus b/qtserialbus index fa979925..ed194212 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fa979925d9afa58aab29a57f4289c0b679ac03e9 +Subproject commit ed1942128078a30ea0436c3f2eb6cd9d60a82a4d diff --git a/qtserialport b/qtserialport index 23902340..4458f937 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 23902340662f1ef6f5dafe68a34b593aed6ea497 +Subproject commit 4458f9376aa88b556e38d81180c5966889009bfb diff --git a/qtsvg b/qtsvg index 4bd5d6ce..bfa9500a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4bd5d6ced07d2d0e643a13e7cebb228c521d2046 +Subproject commit bfa9500ae5b9acf24d1b6847003c19a4e49d9749 diff --git a/qttools b/qttools index 2f2b7155..cff0a955 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2f2b7155b5e4cb56c7dc284e203e8e15147e4b27 +Subproject commit cff0a9551e18e82793d454400a86438ffecee99a diff --git a/qttranslations b/qttranslations index 40e18a92..365bfb2e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 40e18a92fe3b704735a1fa1512f5b273dedf9102 +Subproject commit 365bfb2ef769241e798b7c222a63ff68348d87c7 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0371486a..18f37cf7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0371486a32a0e39cdc9d04f9d1245b214d269e3c +Subproject commit 18f37cf7410beb698855a38a1af458d51d64e3fe diff --git a/qtwayland b/qtwayland index e2669652..ee58fc0e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e26696524ceb58f4fe0cb7202d873240b6a9478d +Subproject commit ee58fc0edc94d18c2ab6d30f1836b23606ab2195 diff --git a/qtwebchannel b/qtwebchannel index 1cbc05a6..196097bf 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1cbc05a6568db5e0ff094f8e09723c607ade88af +Subproject commit 196097bfc84d297199ea591fc19e714c88796e8e diff --git a/qtwebengine b/qtwebengine index c2447a30..6ec0428d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c2447a308882ba3691d66b2c28df197f571518c7 +Subproject commit 6ec0428db1d1dda0a74ead838aa799298e7a1306 diff --git a/qtwebsockets b/qtwebsockets index a0aec91b..1af97a5f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a0aec91b676e2b79b8e66091d55d9e128bf2a1d0 +Subproject commit 1af97a5f04d4d7d0dbf9954397e2374a791d717b diff --git a/qtwebview b/qtwebview index d7b2a1d2..0218b634 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d7b2a1d245d7f22514c251a424d699bc5bb2c39e +Subproject commit 0218b63446186b659333bd3cbfd6f69ed172299b diff --git a/qtwinextras b/qtwinextras index 210b31fa..c5159ecf 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 210b31fa48134ace767be47508b9918bcee9a22d +Subproject commit c5159ecfc36bc0f9bff45de78accd104b9637066 diff --git a/qtx11extras b/qtx11extras index b45429fd..5ecce026 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b45429fd7eeaf598d78f76a670a892c7d0d02f11 +Subproject commit 5ecce026f65b2fb320379e49e70f772ad2bbba69 diff --git a/qtxmlpatterns b/qtxmlpatterns index fabf557b..afa27386 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fabf557bb8390a94ff4b5d8688a91ffe4abd17ec +Subproject commit afa273865b7f2697c6e28fb1511486d2f9ce6bfe From 6c767526739c9e25cb6ac62357af7d8f47db9b22 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 7 Feb 2017 12:53:22 +0200 Subject: [PATCH 31/75] Change qtgamepad status from preview to addon qtgamepad will be officially supported with Qt 5.9 Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c28d5667..71a3d9ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -296,7 +296,7 @@ path = qtgamepad url = ../qtgamepad branch = 5.9 - status = preview + status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml From dc4ec9c5d9c7f13c0c937fc0a69c517ed37baea9 Mon Sep 17 00:00:00 2001 From: Brett Stottlemyer Date: Sat, 28 Jan 2017 11:34:26 -0500 Subject: [PATCH 32/75] Add qtremoteobjects Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2 Reviewed-by: BogDan Vatra Reviewed-by: Oswald Buddenhagen --- .gitmodules | 6 ++++++ qtremoteobjects | 1 + 2 files changed, 7 insertions(+) create mode 160000 qtremoteobjects diff --git a/.gitmodules b/.gitmodules index 71a3d9ac..6a1e8498 100644 --- a/.gitmodules +++ b/.gitmodules @@ -317,3 +317,9 @@ url = ../qtnetworkauth branch = 5.9 status = preview +[submodule "qtremoteobjects"] + depends = qtbase + path = qtremoteobjects + url = ../qtremoteobjects + branch = 5.9 + status = preview diff --git a/qtremoteobjects b/qtremoteobjects new file mode 160000 index 00000000..3d3888c2 --- /dev/null +++ b/qtremoteobjects @@ -0,0 +1 @@ +Subproject commit 3d3888c2ea4eea637a4e7fad754b2f5d3afc4170 From da4c2e21b12aea45a1073556e99d492c505ffe94 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Thu, 15 Dec 2016 09:05:11 +0200 Subject: [PATCH 33/75] Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97 Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/mysql.ps1 | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 new file mode 100644 index 00000000..5e75f662 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -0,0 +1,112 @@ +############################################################################# +## +## 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 installs MySQL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "5.6.11" +$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip" +$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip" + +function CheckAndRemovePreviousInstallation +{ + Param ( + [string]$InstallFolder + ) + echo "Check for previous installation..." + $FolderExists = Test-Path $ExistingInstallation + If ($FolderExists -eq $True) { + echo "Removing previous installation ($ExistingInstallation)" + Remove-Item $ExistingInstallation -recurse + } +} + +function DownloadAndInstall +{ + Param ( + [string]$arch, + [string]$externalUrl, + [string]$internalUrl, + [string]$package, + [string]$sha1, + [string]$installPath + ) + + echo "Fetching from URL ..." + Download $externalUrl $internalUrl $package + Verify-Checksum $package $sha1 + Extract-Zip $package $installPath +} + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\Utils\my_sql" +$existingInstallation = "$installFolder\my_sql" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64" +$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38" + +echo "Check and remove previous installation ..." +CheckAndRemovePreviousInstallation $existingInstallation +DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder +Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql + +echo "Remove downloaded package ..." +Remove-Item $packagex64 + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\my_sql$architecture" +$existingInstallation = "$installFolder\my_sql" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32" +$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679" + +echo "Check and remove previous installation ..." +CheckAndRemovePreviousInstallation $existingInstallation +DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder +Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql + +echo "Remove downloaded package ..." +Remove-Item $packagex86 + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "MySQL = $version" >> ~/versions.txt From fb7581847e5be1b60c41cd06e20ade7a4d51ac11 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Thu, 15 Dec 2016 09:11:48 +0200 Subject: [PATCH 34/75] Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/openssl.ps1 | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 new file mode 100644 index 00000000..35340ca7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -0,0 +1,86 @@ +############################################################################# +## +## 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 installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2j" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\openssl" +$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" +$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe" +$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\openssl$architecture" +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe" +$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +cmd /c "$packagex86 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x86", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x86", "$installFolder\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "OpenSSL = $version" >> ~/versions.txt From f1f9b94b00337a4541757f3ae953ead5830e87e1 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Thu, 15 Dec 2016 09:14:25 +0200 Subject: [PATCH 35/75] Provisioning: Install postgresql x86 and x64 libraries to Windows 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/postgresql.ps1 | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 new file mode 100644 index 00000000..9b1d5d4e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -0,0 +1,84 @@ +############################################################################# +## +## 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 installs postgresql $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "9.1.9-1" +$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip" +$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" + +# Install x64 bit versions +$architecture = "x64" +$installFolder = "C:\Utils\postgresql" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip" +$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +Extract-Zip $packagex64 $installFolder + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\postgresql$architecture" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip" +$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +Extract-Zip $packagex86 $installFolder + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "PostgreSQL = $version" >> ~/versions.txt From 880e7506291644ee22c550607e78d655befb68a6 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Mon, 30 Jan 2017 10:29:06 +0200 Subject: [PATCH 36/75] Provisioning: Update opengl32.dll x86 on Windows 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenGL32 update is needed for autotests to pass. At least tst_qglbuffer vertexBuffer will fail without an update. This update is already in place on Windows x86 and x64 CI hosts but applied only to System32 -folders. Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3 Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/opengl32_x86.ps1 | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 new file mode 100644 index 00000000..079f26c3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -0,0 +1,63 @@ +############################################################################# +## +## 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" + +$version = "11_2_2" +$package = "C:\Windows\temp\opengl32sw_$version.7z" +$destinationFolder = "C:\Windows\SysWOW64" +$openglPackage = "C:\Windows\SysWOW64\opengl32.dll" + +$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" +$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll" +$openglSha1 = "690730f973aa39bd80648e026248394fde07a753" + +Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package +Verify-Checksum $package $mesaOpenglSha1 +Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"} + +echo "Remove downloaded $package ..." +Remove-Item $package -recurse + +echo "Take ownership of existing opengl32.dll from SysWOW64" +takeown /f $openglPackage +icacls $openglPackage /grant Administrators:F +echo "Remove existing opengl32.dll from SysWOW64" +Remove-Item -Recurse -Force $openglPackage +echo "Add new opengl32.dll to SysWOW64" +Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage +Verify-Checksum $openglPackage $openglSha1 + +# Store version information to ~/versions.txt +echo "OpenGL x86 = $version" >> ~/versions.txt From 7fdf860fc52b4d474565f7236ce90fa01b8fe355 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Feb 2017 08:06:01 +0200 Subject: [PATCH 37/75] Update submodules on '5.9' in qt5 Change-Id: I7c87e4fcd54dbaaa28dc6de510bcb6631fc14208 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmacextras | 2 +- qtremoteobjects | 2 +- qtspeech | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 601ee914..d1271dba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 601ee9146676ef78f6ad486420ba9849ac44c844 +Subproject commit d1271dba68f03610c27e87963653bf1600b5f659 diff --git a/qtbase b/qtbase index 7dc88b68..8a410f60 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7dc88b68904c7f1b7e012bd65ccdcbf48cc6e2e0 +Subproject commit 8a410f60ae39b06555d807581caf7cb8bfab4fac diff --git a/qtdeclarative b/qtdeclarative index 7cab0a31..705a2780 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7cab0a31de5ab67bbe1add88ea6aa27e7bbc4ddc +Subproject commit 705a2780743a01cb9a1032fca8c1f942b50e5a0a diff --git a/qtmacextras b/qtmacextras index 20d1d8d0..a931d079 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 20d1d8d097333ec6d13a0dd0c46aeab1bdacb50a +Subproject commit a931d0799b46123422582635b79d217eee0ae6bd diff --git a/qtremoteobjects b/qtremoteobjects index 3d3888c2..be567012 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3d3888c2ea4eea637a4e7fad754b2f5d3afc4170 +Subproject commit be567012c9cf16b7de4b0eadd34f1c80237e62c2 diff --git a/qtspeech b/qtspeech index 43fed1e8..5de7101b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 43fed1e8fa150ce9441281ad1891e9f2029b6d51 +Subproject commit 5de7101be14e7711eae6d28d187709656bc6f51d diff --git a/qtwebengine b/qtwebengine index 6ec0428d..13e64fc6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6ec0428db1d1dda0a74ead838aa799298e7a1306 +Subproject commit 13e64fc668d999cbfa362eb63ad4307deaf98391 From 79b410a77f3afffdc89e018920720d188bd5788a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 11 Feb 2017 00:07:23 +0100 Subject: [PATCH 38/75] Update submodules on '5.9' in qt5 Change-Id: I04eca9ec2a5c278d53c83f5b73a7e154d33115a5 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index d1271dba..905c5e5a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d1271dba68f03610c27e87963653bf1600b5f659 +Subproject commit 905c5e5a366e24bb6d42b102f2e8a019270baec6 diff --git a/qtbase b/qtbase index 8a410f60..fa3dca17 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8a410f60ae39b06555d807581caf7cb8bfab4fac +Subproject commit fa3dca176e03b39e982c5aff7a68850140c52507 diff --git a/qtdatavis3d b/qtdatavis3d index f750a084..25aeaddb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f750a084bec3062b1531e299e880043cfa19d6e7 +Subproject commit 25aeaddbfb62a705ea447b19e4d1771d603bde2b diff --git a/qtdoc b/qtdoc index 8a6b1a9b..339a602f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8a6b1a9bc39922f1c0839b050eda128ce03cd0cb +Subproject commit 339a602fd96b88f9df5ddbb8e0e778bc570c4e53 diff --git a/qtlocation b/qtlocation index f5021281..c9266145 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f5021281c56b660b81d0122608ca9b577889f99e +Subproject commit c9266145e7d60e0981f24087050f552617ff2077 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 13ece44c..751ca5df 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 13ece44c44b4214b568ca3638ef62e0f1af04d7f +Subproject commit 751ca5dfb7c3f0edd76110a5dc3a3696d3e0539c diff --git a/qtremoteobjects b/qtremoteobjects index be567012..4a94d147 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit be567012c9cf16b7de4b0eadd34f1c80237e62c2 +Subproject commit 4a94d1471ffe64533b969704178e44fc57bcd505 diff --git a/qtwebengine b/qtwebengine index 13e64fc6..0d4dd0ad 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 13e64fc668d999cbfa362eb63ad4307deaf98391 +Subproject commit 0d4dd0ad65ea01dd6236fe4414b766624476991c From cb78b8cfca08d6d0a78202e7d1ac6596ddbd616a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 10 Feb 2017 20:01:22 +0100 Subject: [PATCH 39/75] Update submodules on '5.6' in qt5 Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 88e6542e..aad7e955 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 88e6542ecc0451df2f291db928c4d4d549aa0ca2 +Subproject commit aad7e9551573ddf16bfba7a07ce6e24d92dc5483 diff --git a/qtdeclarative b/qtdeclarative index 533f9591..cdbda2e7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 533f9591595c3933ac56a3b3f4422a8aa821cb00 +Subproject commit cdbda2e7bd84e7e41812b811890f017e0538b5b9 diff --git a/qtdoc b/qtdoc index 276dcf86..7672f924 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 276dcf86836507b39c747067de151fb1a31fa527 +Subproject commit 7672f92440e7ba5587583acf8f54128a203f9acc diff --git a/qtimageformats b/qtimageformats index cc0e9432..b6ffd71e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cc0e9432848750689e8a9e48e318b5ef9c6874ff +Subproject commit b6ffd71e2315e699d4ad32859cf36c67635820e7 diff --git a/qtqa b/qtqa index 583ae213..1561b922 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 +Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 diff --git a/qtrepotools b/qtrepotools index d4c099dd..51744f4f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c +Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce diff --git a/qtserialbus b/qtserialbus index d8ae11c7..0c60b2c1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d8ae11c7c4bf2cf51653e7f0a34ced8b8c7a7bd7 +Subproject commit 0c60b2c10bd30e1ccb775a3fb406ba1e8214b1c3 diff --git a/qtwebengine b/qtwebengine index b61bb656..9464e7f4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b61bb656ac1d332da300177b41c1331d1f672c47 +Subproject commit 9464e7f4646ce4bdc8e16c1716bf07345531db28 diff --git a/qtx11extras b/qtx11extras index 7bc18713..25e20a72 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 7bc187133a72911f0257cb4aca63dbeef9408959 +Subproject commit 25e20a724f411f6e07cd3dc9f4870298a308c2c3 From 36bedf10de60909063ad4f3b17043b88a5c9fdf1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 11 Feb 2017 00:08:44 +0100 Subject: [PATCH 40/75] Update submodules on '5.8' in qt5 Change-Id: If01fe1a84460b65322bfe9d8c402f24d44e98094 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 69b94b86..e29f8cf6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 69b94b86e3141f1204c5a1121e1d289cd6f04a7b +Subproject commit e29f8cf68e2f1ed22244f84099589e9444eaf5ba diff --git a/qtbase b/qtbase index b6bf2a33..6e8fcab7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 +Subproject commit 6e8fcab7e07717526c8ea6eac8785bf27fa090c3 diff --git a/qtdeclarative b/qtdeclarative index ce15c3af..fedcd26c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ce15c3af57858b9b8b0621398121691b20c6f638 +Subproject commit fedcd26ce80451e113b963d09cad97a3d21e4ab8 diff --git a/qtlocation b/qtlocation index d9d36100..84e15908 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d9d36100d170ee7cdb04e2782d75e06118934def +Subproject commit 84e159086d2f5dda899737e1282f760e793e6654 diff --git a/qtquickcontrols b/qtquickcontrols index 07490d56..7b6f5708 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 07490d5610f7a18bbf50f3a5d118c33fb8e88f5d +Subproject commit 7b6f57086bbc64ad2f9be0c75a462120fc031e86 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e6cc5382..146d5403 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e6cc5382d9b789274d3e16e8601f33075b6a4b1c +Subproject commit 146d54036664a3f19c2e6d2119f1a1d4acf55fa1 diff --git a/qtscxml b/qtscxml index bd5dd290..e49fd45c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bd5dd290e5a056d22688a64a58c2a669fed2d085 +Subproject commit e49fd45c0947d1b24937517c2d170283eadfc501 diff --git a/qtwayland b/qtwayland index 91f5d6a9..0f07709e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 91f5d6a99d5f22334e33624126e881b3228c5ce2 +Subproject commit 0f07709e4249f8d4de299b3af7c5066f3eaf4fd1 diff --git a/qtwebengine b/qtwebengine index 9ff8eda0..309814bd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9ff8eda0af657ad504318aebea5349b76fbb107a +Subproject commit 309814bd7a160c44f91bf61c787af555a10a8eed From ef0e6e1e8f8b2c64d771c5f8c54dc9918f2248c6 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 9 Feb 2017 14:31:46 +0100 Subject: [PATCH 41/75] Add ForceDebugInfo to RHEL-6.6-x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On this particular platform we get hard-to-reproduce autotest crashes in the CI. Enable ForceDebugInfo to get a meaningful backtrace. Change-Id: Ic9ca50394ad5708c3de4d26eb87d4c2a9d580b18 Reviewed-by: Simon Hausmann Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c568ddef..1fec66f8 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch -qtci-linux-RHEL-6.6-x86_64 GCC Release +qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch DisableTests qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release From d4e3b5f48d3eb3d49972bd44eaee0e3c6ee8f492 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 13 Feb 2017 09:39:04 +0100 Subject: [PATCH 42/75] Update qtlocation manually Task-number: QTBUG-58807 Change-Id: Ia06d2a40c18d60e4665f0f7659ffd860a9deecf9 Reviewed-by: Liang Qi --- qtlocation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtlocation b/qtlocation index c9266145..a2403216 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c9266145e7d60e0981f24087050f552617ff2077 +Subproject commit a24032167a17c51c8ac4e36f4a9bb60d5877a1d3 From e5a1280ff09620b9a3096e221ebb60182412480d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 30 Jan 2017 22:33:33 +0200 Subject: [PATCH 43/75] Add Ubuntu 16.04 as a build target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As autotests pass, a subsequent commit will make Ubuntu 16.04 replace Ubuntu 14.04 build targets. Task-number: QTQAINFRA-1100 Change-Id: Ief659eec39f40873681ba617c37acf3662551fc1 Reviewed-by: Simo Fält --- coin/platform_configs/default.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 1fec66f8..70de19cd 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -9,6 +9,8 @@ qtci-windows-10-x86 MSVC2015 qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo DisableTests +qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch From d6beaa6f27a1408c8dfd691b077abd5e0aff4f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 27 Jan 2017 09:43:09 +0200 Subject: [PATCH 44/75] Add APT package provisioning to Ubuntu 16.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1099 Change-Id: Ie884846a21c3962aeeb83762113475f9eaf2f20d Reviewed-by: Simo Fält Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 100 ++++++++++++++++++ .../003-apt-update.sh | 2 - .../006-qt-build-dependencies.sh | 46 -------- 3 files changed, 100 insertions(+), 48 deletions(-) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh new file mode 100755 index 00000000..a50a0681 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -0,0 +1,100 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# Install required packages with APT + +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +ExceptionAPTUpdate=100 +ExceptionAPT=101 +ExceptionSED=102 + +try +( + echo "Disabling auto update" + sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED + echo "Running update for apt" + sudo apt update + echo "Installing packages" + # Git is not needed by builds themselves, but is nice to have + # immediately as one starts debugging + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install git || throw $ExceptionAPT + # 7zip is a needed decompressing tool + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install p7zip || throw $ExceptionAPT + # libssl-dev provides headers for OpenSSL + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libssl-dev || throw $ExceptionAPT + # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT + # Enable linking to system dbus + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libdbus-1-dev || throw $ExceptionAPT + # Needed libraries for WebEngine + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev || throw $ExceptionAPT + # Common event loop handling + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libglib2.0-dev || throw $ExceptionAPT + # MySQL support + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libmysqlclient-dev || throw $ExceptionAPT + # PostgreSQL support + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libpq-dev || throw $ExceptionAPT + # SQLite support + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libsqlite3-dev || throw $ExceptionAPT + # ODBC support + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install unixodbc-dev || throw $ExceptionAPT + # Support for FreeType font engine + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libfreetype6-dev || throw $ExceptionAPT + # Enable the usage of system jpeg libraries + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libjpeg-dev || throw $ExceptionAPT + # Enable support for printer driver + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libcups2-dev || throw $ExceptionAPT + # Install libraries needed for QtMultimedia to be able to support all plugins + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT +) +catch || { + case $ex_code in + $ExceptionAPTUpdate) + echo "Failed to run APT update." + exit 1; + ;; + $ExceptionAPT) + echo "Failed to install package." + exit 1; + ;; + $ExceptionSED) + echo "Failed to disable auto update." + exit 1; + ;; + esac +} + diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh deleted file mode 100644 index 2f7e2e47..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -sudo apt-get update diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh deleted file mode 100644 index 30a6caad..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## 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$ -## -############################################################################# - -sudo apt-get -y build-dep qt5-default - -# qtbase -sudo apt-get -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev -sudo apt-get -y install libxcb-xinerama0-dev libdbus-1-dev libatspi2.0-dev - -# qtmultimedia -sudo apt-get -y install libasound2-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev - -# qtwebengine -sudo apt-get -y install libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison From 58ad2e46f3df48a9b5b4c9d915a0fa3eb207bf8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 27 Jan 2017 09:39:53 +0200 Subject: [PATCH 45/75] Add system setup provisioning script for Ubuntu 16.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1099 Change-Id: I4ea578b65aca8511641a61461fd1295a3723fdab Reviewed-by: Simo Fält --- .../001-suppress-shutdown-indicator.sh | 4 - .../001-systemsetup.sh | 87 +++++++++++++++++++ 2 files changed, 87 insertions(+), 4 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh deleted file mode 100644 index f11263b7..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -# Disable questions on shutdown. -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh new file mode 100755 index 00000000..06f44049 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh @@ -0,0 +1,87 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script modifies system settings for automated use + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +NTS_IP=10.212.2.0 + +ExceptionGsettings1=100 +ExceptionGsettings2=101 +ExceptionGsettings3=102 +ExceptionNTS=103 +ExceptionDISPLAY=104 + +try +( + echo "Timeout for blanking the screen (0 = never)" + gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 + echo "Prevents screen lock when screesaver goes active." + gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2 + echo "Disable questions on shutdown." + gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3 + + echo "Set Network Test Server address to $NTS_IP in /etc/hosts" + echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS + echo "Set DISPLAY" + echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY +) +catch || { + case $ex_code in + $ExceptionGsettings1) + echo "Failed to disable black screen." + exit 1; + ;; + $ExceptionGsettings2) + echo "Failed to prevent screen lock." + exit 1; + ;; + $ExceptionGsettings3) + echo "Failed to disable questions on shutdown." + exit 1; + ;; + $ExceptionNTS) + echo "Failed to set network teset server address into /etc/hosts." + exit 1; + ;; + $ExceptionDISPLAY) + echo "Failed to set DISPLAY into ~/.bashrc." + exit 1; + ;; + esac +} + From 9e092f8cad5ffdb79dd8d268102695425ca48f4e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 13 Feb 2017 20:05:15 +0100 Subject: [PATCH 46/75] Update submodules on '5.9' in qt5 Change-Id: I631be2f14aa948c1c7678f7a1e0f2fd073a27ce5 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtrepotools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 905c5e5a..88b24df4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 905c5e5a366e24bb6d42b102f2e8a019270baec6 +Subproject commit 88b24df43916442785238966d5a3c3eb77b2d097 diff --git a/qtbase b/qtbase index fa3dca17..1b46872c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fa3dca176e03b39e982c5aff7a68850140c52507 +Subproject commit 1b46872cde7fb50652f55bfe1e286e6af5124200 diff --git a/qtdeclarative b/qtdeclarative index 705a2780..32f6315d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 705a2780743a01cb9a1032fca8c1f942b50e5a0a +Subproject commit 32f6315d6d458600bb3f1db08c53148557382c21 diff --git a/qtgamepad b/qtgamepad index 9c7ed97c..fdce0bd4 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 9c7ed97cf9f01fd08183c8e4918c9f95286ac11c +Subproject commit fdce0bd433f4a219a371db4091b18cc48209b04f diff --git a/qtlocation b/qtlocation index a2403216..68520449 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a24032167a17c51c8ac4e36f4a9bb60d5877a1d3 +Subproject commit 68520449fe15682fe8fcd666860f6ae86493ebf5 diff --git a/qtrepotools b/qtrepotools index 51744f4f..45a7ada2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce +Subproject commit 45a7ada21fc00026d23d96277bf910aad451c842 diff --git a/qtwayland b/qtwayland index ee58fc0e..e9fb1165 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ee58fc0edc94d18c2ab6d30f1836b23606ab2195 +Subproject commit e9fb11653a504b86478ef8f4513a6c23045a4fa2 diff --git a/qtwebengine b/qtwebengine index 0d4dd0ad..cd475d57 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0d4dd0ad65ea01dd6236fe4414b766624476991c +Subproject commit cd475d5727becd6ec4e7605d335721355e049354 From e8231a46f2281f80d6ee0c9f977281ee0429c6d9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 14 Feb 2017 20:03:52 +0100 Subject: [PATCH 47/75] Update submodules on '5.8' in qt5 Change-Id: Idb3b5cdd408d20582f10372a0e42e6f63e7a94bc Reviewed-by: Liang Qi --- qtbase | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 6e8fcab7..5fcdb6c4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6e8fcab7e07717526c8ea6eac8785bf27fa090c3 +Subproject commit 5fcdb6c459ebea5e1762e8ba6f0ea1191e19f523 diff --git a/qtdoc b/qtdoc index 24435fb0..02eaf0cc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 24435fb0818ddf414de6d753dc5460da34b905f4 +Subproject commit 02eaf0cc58c462a6a5a0bf61dfb4961266b1966a diff --git a/qtlocation b/qtlocation index 84e15908..3995bee7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 84e159086d2f5dda899737e1282f760e793e6654 +Subproject commit 3995bee767306476993134cb9c42499daf9ed1bc diff --git a/qtrepotools b/qtrepotools index 51744f4f..45a7ada2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce +Subproject commit 45a7ada21fc00026d23d96277bf910aad451c842 diff --git a/qtwebengine b/qtwebengine index 309814bd..1f8154cd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 309814bd7a160c44f91bf61c787af555a10a8eed +Subproject commit 1f8154cd473bf57aad59ef1c4cf7c9a3be9a823d diff --git a/qtwebkit b/qtwebkit index a4eec411..c3b710c3 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a4eec4118333b59d10fd6cc9f126b1af2e8f505c +Subproject commit c3b710c3f4de2da0fd67c858949c3f420dfd175a From a5ba58e8dda94354bc5eb496de73a5e0e229b394 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 13 Feb 2017 12:13:15 -0800 Subject: [PATCH 48/75] Remove QT_SKIP_MODULES declaration These exclusions belong in the individual modules. Change-Id: Iaa868bf953f7bc3d72b6508272a18798a8569f4d Reviewed-by: Oswald Buddenhagen --- qt.pro | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qt.pro b/qt.pro index 1915fc2c..49901139 100644 --- a/qt.pro +++ b/qt.pro @@ -25,10 +25,6 @@ for (line, lines) { QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules QT_SKIP_MODULES = -uikit { - QT_SKIP_MODULES += qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples - !ios: QT_SKIP_MODULES += qtscript -} # This is a bit hacky, but a proper implementation is not worth it. args = $$QMAKE_EXTRA_ARGS From 8254e8659fd0b266edae1d5b919380215a910013 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Mon, 10 Oct 2016 14:24:16 +0300 Subject: [PATCH 49/75] Add system setup provisioning script for macOS 10.12 Task-numer: QTQAINFRA-1091 Change-Id: I0da0e22dd859609fa107b9c157a678a4e2d252e4 Reviewed-by: Heikki Halmet --- .../005-systemsetup.sh | 117 ++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh new file mode 100755 index 00000000..000c8c0a --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh @@ -0,0 +1,117 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script modified system settings for automated use + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +VNCPassword=qt +NTS_IP=10.212.2.0 + +ExceptionDisableScreensaver=100 +ExceptionSetInitialDelay=101 +ExceptionSetDelay=102 +ExceptionVNC=103 +ExceptionNTS=104 + +try +( + echo "Disable Screensaver" + mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver + ( + cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" < + + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT + ) || throw $ExceptionDisableScreensaver + + echo "Set keyboard type rates and delays" + # normal minimum is 15 (225 ms) + defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay + # normal minimum is 2 (30 ms) + defaults write -g KeyRepeat -int 2 || throw $ExceptionSetDelay + + echo "Enable remote desktop sharing" + sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all || throw $ExceptionVNC + + echo "Set Network Test Server address to $NTS_IP in /etc/hosts" + echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS + +) +catch || { + case $ex_code in + $ExceptionDisableScreensaver) + echo "Failed to disable screensaver." + exit 1; + ;; + $ExceptionSetInitialDelay) + echo "Failed to set initial delay of keyboard." + exit 1; + ;; + $ExceptionSetDelay) + echo "Failed to set delay of keyboard." + exit 1; + ;; + $ExceptionVNC) + echo "Failed to enable VNC." + exit 1; + ;; + $ExceptionNTS) + echo "Failed to set NTS." + exit 1; + ;; + esac +} From a56c7ef768e058a3df5e40ad65da998aec7e1a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 18 Jan 2017 11:28:41 +0200 Subject: [PATCH 50/75] macOS 10.12: Switch crash reporting to server mode Task-number: QTQAINFRA-1091 Change-Id: I49c2f92f570a648e80ac16180bdf0c7967ed1120 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh new file mode 100755 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server From 884d198a34fc0aa5f1fd86202b9e2723e5d33a8c Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 12:29:53 +0300 Subject: [PATCH 51/75] Add xz.sh provisioning script for macOS 10.12 Task-number: QTQAINFRA-1091 Change-Id: I5594ae5591ad0b092ed000da8930972475163f51 Reviewed-by: Heikki Halmet --- .../qtci-macos-10.12-x86_64/015-xz.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh new file mode 100755 index 00000000..eca6858c --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs XZ-Utils + +# XZ-Utils are needed for uncompressing xz-compressed files + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/XZ.pkg" +AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" +SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +echo "XZ = 5.0.7" >> ~/versions.txt From c3fa9ffd763a697e84c1ca57eae784671dde81ba Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 15:18:53 +0300 Subject: [PATCH 52/75] Add xcode.sh provisioning script for macOS 10.12 Task-number: QTQAINFRA-1091 Change-Id: I6d2071c3304cc8df31d8bbad6d713d21ea2dda25 Reviewed-by: Heikki Halmet --- .../qtci-macos-10.12-x86_64/020-xcode.sh | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh new file mode 100755 index 00000000..260f18aa --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -0,0 +1,102 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs Xcode +# Prerequisites: Have Xcode prefetched to local cache as xz compressed. +# This can be achieved by fetching Xcode_8.xip from Apple Store. +# Uncompress it with 'xar -xf Xcode_8.xip' +# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py +# with which you can run 'python parse_pbzx2.py Content'. +# This will give you a file called "Content.part00.cpio.xz" that +# can be renamed to Xcode_8.xz for this script. + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +ExceptionDownloadUrl=100 +ExceptionSHA1=101 +ExceptionUnXZ=102 +ExceptionCPIO=103 +ExceptionDelete=104 + + +url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz +targetFile=/tmp/Xcode_8.2.1.xz +expectedSha1=a68e8a4446f77e781b1ce123125263862f2607a3 + +try +( + echo "Downloading Xcode from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl + + echo "Checking SHA1 on $targetFile" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + + echo "Uncompressing '$targetFile'" + xz -d "$targetFile" || throw $ExceptionUnXZ + + echo "Unarchiving '${targetFile%.*}'" + (cd /Applications/ && sudo cpio -dmiI "${targetFile%.*}") || throw $ExceptionCPIO + + echo "Deleting '${targetFile%.*}'" + rm "${targetFile%.*}" || throw $ExceptionDelete + + echo "XCode = 8.2.1" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownloadUrl) + echo "Failed to download Xcode." + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check SHA1." + exit 1; + ;; + $ExceptionUnXZ) + echo "Failed to uncompress .xz" + exit 1; + ;; + $ExceptionCPIO) + echo "Failed to unarchive .cpio." + exit 1; + ;; + $ExceptionDelete) + echo "Failed to delete temporary file." + exit 1; + ;; + + esac +} From 1dbe2c1ff471a0cda63d61efa44c920dad0e26ab Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Mon, 10 Oct 2016 14:14:21 +0300 Subject: [PATCH 53/75] Add command line tool provisioning for macOS 10.12 Task-number: QTQAINFRA-1091 Change-Id: I2b209c8ca59af5bfdcc1faa46ac771a85eeb457e Reviewed-by: Heikki Halmet --- .../021-commandlinetools.sh | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh new file mode 100755 index 00000000..e90904fd --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh @@ -0,0 +1,111 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs Command Line Tools for Xcode +# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +ExceptionDownloadUrl=100 +ExceptionSHA1=101 +ExceptionAttachImage=102 +ExceptionInstall=103 +ExceptionDetachImage=104 +ExceptionRemoveTmpFile=105 +ExceptionAcceptLicense=106 + + +url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg +targetFile=/tmp/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg +expectedSha1=0a55c5682c18879cfff7761619adb769ea396a79 + +try +( + echo "Downloading Command Line Tools from URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl + + echo "Checking SHA1 on '$targetFile'" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + + echo Mounting DMG + hdiutil attach "$targetFile" || throw $ExceptionAttachImage + + echo Installing Command Line Tools + (cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS Sierra version 10.12).pkg" -target /) || throw $ExceptionInstall + + hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage + + echo "Removing temporary file '$targetFile'" + rm "$targetFile" || throw $ExceptionRemoveTmpFile + + echo "Accept license" + sudo xcodebuild -license accept || throw $ExceptionAcceptLicense + + echo "Command Line Tools = 8.2" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionDownloadUrl) + echo "Failed to download Command Line Tools from form URL '$url'." + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check SHA1." + exit 1; + ;; + $ExceptionAttachImage) + echo "Failed to attach image." + exit 1; + ;; + $ExceptionInstall) + echo "Failed to install Command Line Tools." + exit 1; + ;; + $ExceptionDetachImage) + echo "Failed to detach image." + exit 1; + ;; + $ExceptionRemoveTmpFile) + echo "Failed to remove temporary file." + exit 1; + ;; + $ExceptionAcceptLicense) + echo "Failed to accept license." + exit 1; + ;; + + esac +} From 430aa0192d3efc205ac0882351e8eabe1cd8d1b1 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 15:55:08 +0300 Subject: [PATCH 54/75] Add cmake.sh to provisioning for macOS 10.12 Task-number: QTQAINFRA-1091 Change-Id: I3d58c7e94866754adb22975b874ebe4a0e239ec1 Reviewed-by: Heikki Halmet --- .../qtci-macos-10.12-x86_64/025-cmake.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh new file mode 100755 index 00000000..9f6df8cf --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs CMake + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/cmake-3.6.2-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" +appPrefix="cmake-3.6.2-Darwin-x86_64" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +echo "CMake = 3.6.2" >> ~/versions.txt From a8348c9e6c21e70d8b0e34642205718b6635d161 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Mon, 10 Oct 2016 12:11:12 +0300 Subject: [PATCH 55/75] Add postgresql.sh provisioning script for macOS 10.12 Task-number: QTQAINFRA-1091 Change-Id: Idf314816d4986855b0b4d92a5f523ec1397f4083 Reviewed-by: Heikki Halmet --- .../qtci-macos-10.12-x86_64/025-postgresql.sh | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh new file mode 100755 index 00000000..e699933d --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs PostgreSQL + +# PostgreSQL is needed for Qt to be able to support PostgreSQL + +# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" + +psqlVersion="9.6.0" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip" +AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip" +SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5" +appPrefix="" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc +echo "PostgreSQL = $psqlVersion" >> ~/versions.txt From c4a5844e256a9713a1ccfba253d7fbe6b4d3cf8a Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 21 Oct 2016 11:25:22 +0300 Subject: [PATCH 56/75] Add MySQL provisioning script for macOS 10.12 Task-number: QTQAINFRA-1091 Change-Id: Id20e5398007284ddf809f2c2c49a60711729db26 Reviewed-by: Liang Qi Reviewed-by: Heikki Halmet --- .../qtci-macos-10.12-x86_64/025-mysql.sh | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh new file mode 100755 index 00000000..54389916 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +############################################################################# +## +## 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$ +## +############################################################################# + +# This script installs MySQL + +# MySQL is needed for Qt to be able to support MySQL + +# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" +AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" +SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" +appPrefix="" +targetDir="/opt/mysql57/" + +sudo mkdir -p "/opt" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" + +echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc +echo "MySQL = 5.7.15" >> ~/versions.txt From 00635a672aaf0f8db9c33637ee72e33f780fdd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 9 Feb 2017 23:35:47 +0200 Subject: [PATCH 57/75] Provision: Set bash_profile to read .bashrc in macOS 10.12 The method (vmware tools) of launching a process inside a virtual machine results in the launch of a process that does not originate from a login shell. Therefore the CI system explicitly starts the agent with "bash -l -c" to enforce the invocation as login shell and thus execute settings from /etc/profile, ~/.bash_profile, etc. This brings the behavior of the system closer to what we see as developers. However the shell is a non-interactive shell, therefore ~/.bashrc is not read by default. On Linux systems such as RHEL, ~/.bash_profile is configured to still read ~/.bashrc. For consistency we apply the same logic to the macOS configurations. Task-number: QTQAINFRA-1091 Change-Id: I72206dbd8f7289de86830db23fa1ae2c548181eb Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh new file mode 100644 index 00000000..0fbe7628 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +# Read .bashrc if exist +printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile + From 628639ea0dbb92ee84109616f7429f2b459646eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 9 Feb 2017 23:50:47 +0200 Subject: [PATCH 58/75] Add macOS 10.12 as a build target with tests disabled Task-number: QTQAINFRA-1092 Change-Id: I0098a1ad9df115f911a401ba06a443a30374135b Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 70de19cd..1055432c 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -16,6 +16,7 @@ qtci-linux-Ubuntu-14.04-x86_64 GCC qtci-linux-openSUSE-42.1-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 DisableTests qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch DisableTests qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release qtci-osx-10.10-x86_64 Clang DeveloperBuild Release QtNamespace NoPch From 3fb0afb7f98ebb3d392e7e9740616b50127d4189 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 16 Feb 2017 16:00:03 +0100 Subject: [PATCH 59/75] Update qtwebengine manually Change-Id: I86dc97895dbbbff1a14e90d0a7c2ae359ce25891 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 1f8154cd..4578bc71 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1f8154cd473bf57aad59ef1c4cf7c9a3be9a823d +Subproject commit 4578bc7173caa37f92cffe8f8dee4a5471d88af1 From 7470f97c4e1041c0e02deafb067e76bb9cf02804 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Feb 2017 12:29:49 +0100 Subject: [PATCH 60/75] Update qtwebengine manually again Change-Id: I6fabfa3a4ce0b0fbcb1da2e15bdf5f8f6ac6e643 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 4578bc71..8666e9d5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4578bc7173caa37f92cffe8f8dee4a5471d88af1 +Subproject commit 8666e9d50346ce4ae68b577812282b7bc17b41c9 From 2df983757af44964b7df132ed993eca11373adfa Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Feb 2017 20:04:01 +0100 Subject: [PATCH 61/75] Update submodules on '5.8' in qt5 Change-Id: I2a905ff8300b2f64537446ee763202eeed216c6e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtserialbus | 2 +- qtwayland | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index e29f8cf6..c668bde4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e29f8cf68e2f1ed22244f84099589e9444eaf5ba +Subproject commit c668bde4982ff7340de4e882aa45cf1db93bea98 diff --git a/qtbase b/qtbase index 5fcdb6c4..8d6d68d3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5fcdb6c459ebea5e1762e8ba6f0ea1191e19f523 +Subproject commit 8d6d68d3d363bb6aa1faec2355b32e3ea290116c diff --git a/qtcharts b/qtcharts index d920dfad..f7b477ad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d920dfad07c671d45af116b0b1816873074f94b5 +Subproject commit f7b477ad0e2f9ab4f3a95e7547a92dccab7bb836 diff --git a/qtconnectivity b/qtconnectivity index 2eaf5b34..d8817ceb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2eaf5b3428f8440de2535be26bb0dee59fd0740d +Subproject commit d8817cebf11c9212f85a5359262d321f3c205c02 diff --git a/qtdeclarative b/qtdeclarative index fedcd26c..7454ad3c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fedcd26ce80451e113b963d09cad97a3d21e4ab8 +Subproject commit 7454ad3ce1895eae7409df28752739cc912abcac diff --git a/qtserialbus b/qtserialbus index a0c5dc1b..2f934cfb 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a0c5dc1bb516e205e10264f8c5dd8b5402d10bfe +Subproject commit 2f934cfb143df5fccdaab20b2982e54bb13a1bdf diff --git a/qtwayland b/qtwayland index 0f07709e..262efbc3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0f07709e4249f8d4de299b3af7c5066f3eaf4fd1 +Subproject commit 262efbc390e58dab4c898a34bb566ea83288601c From 9d03dae05217e8e3b928a78b3b2247e9fc3ee4c8 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 21 Feb 2017 07:18:36 +0200 Subject: [PATCH 62/75] Update submodules on '5.9' in qt5 There seems to be some issue with updating all submodules so update qtbase and qtdeclarative only to get INTEGRITY compile Change-Id: I079837a75f20e649f26b4b55d66e65edf0ba33a5 Reviewed-by: Heikki Halmet --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 1b46872c..a81dfb32 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b46872cde7fb50652f55bfe1e286e6af5124200 +Subproject commit a81dfb32d6f9e7a407567511c20b59e537f6a063 diff --git a/qtdeclarative b/qtdeclarative index 32f6315d..2a15f6c5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 32f6315d6d458600bb3f1db08c53148557382c21 +Subproject commit 2a15f6c5de6905b2b0b583c0d37d109eeb94c196 From e0416f4966a0ed62902dccc10837d9c77a12de74 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 Feb 2017 18:12:34 +0100 Subject: [PATCH 63/75] Update submodules on '5.8' in qt5 Change-Id: I81b3b50b87402c49a306d381c2d107fc6d4d91da Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 8d6d68d3..1d44b6be 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8d6d68d3d363bb6aa1faec2355b32e3ea290116c +Subproject commit 1d44b6bedbc50c565487fbda6564f3e81c5d4bd0 diff --git a/qtdeclarative b/qtdeclarative index 7454ad3c..9bca88ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7454ad3ce1895eae7409df28752739cc912abcac +Subproject commit 9bca88ea414e68b34eb3f58238b30e47637ab5cc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 146d5403..e91c9fea 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 146d54036664a3f19c2e6d2119f1a1d4acf55fa1 +Subproject commit e91c9feab8a0cf4cff71cc68ab0f001b1531504f diff --git a/qtwayland b/qtwayland index 262efbc3..7d527c19 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 262efbc390e58dab4c898a34bb566ea83288601c +Subproject commit 7d527c1914710a511c06713bbda1572b767cea34 diff --git a/qtwebengine b/qtwebengine index 8666e9d5..5ff4702e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8666e9d50346ce4ae68b577812282b7bc17b41c9 +Subproject commit 5ff4702ea7e567eecc767a2e40d383a27f4ee4fb diff --git a/qtwebsockets b/qtwebsockets index abc12bf1..d5e2b4bb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit abc12bf1c2dde5864fcd321ca41bcf2f80874d85 +Subproject commit d5e2b4bba1e19a51780aa68d47771065755883b3 From ed8f84f149f6901cbca50d145b25fe5f43a2d54c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 21 Feb 2017 18:30:31 +0100 Subject: [PATCH 64/75] declare optional dependency of qtwebengine on qttools starting with 5.7, it optionally comes with a qt designer plugin. Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c Reviewed-by: Michal Klocek --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f044480c..6d20dc99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -237,7 +237,7 @@ status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel - recommends = qtlocation + recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git branch = 5.8 From 161f9ef9a5d25396d1441ba8130e997913c8ee1a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 Feb 2017 14:39:23 +0100 Subject: [PATCH 65/75] Update qtbase manually Change-Id: I5ccb9dbba46e97d213bfbb3a69393b7beed54665 Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a81dfb32..35fa30e6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a81dfb32d6f9e7a407567511c20b59e537f6a063 +Subproject commit 35fa30e65d26b9e4840cfa793ed8369b3475c1fd From b5e631ad6ff9e8de3603f587e1ea268fc2935dc2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 Feb 2017 20:05:12 +0100 Subject: [PATCH 66/75] Update submodules on '5.8' in qt5 Change-Id: Id5ddefcb8bb28109f75b181e5db41ad98519ffc6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 1d44b6be..8e958284 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d44b6bedbc50c565487fbda6564f3e81c5d4bd0 +Subproject commit 8e9582847506bf17755415fdddd92c242407851c diff --git a/qtdeclarative b/qtdeclarative index 9bca88ea..fe5d6966 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9bca88ea414e68b34eb3f58238b30e47637ab5cc +Subproject commit fe5d69669197a51662061b014810f0242eec5ca7 diff --git a/qtrepotools b/qtrepotools index 45a7ada2..ae6a386f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 45a7ada21fc00026d23d96277bf910aad451c842 +Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 diff --git a/qtwebengine b/qtwebengine index 5ff4702e..b70bdb11 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5ff4702ea7e567eecc767a2e40d383a27f4ee4fb +Subproject commit b70bdb111e16d9437f60725f8c2854014a569289 From 6c6169f292476046e62c6c62968ac72a914cb5a3 Mon Sep 17 00:00:00 2001 From: Svintsov Dmitry Date: Thu, 22 Dec 2016 21:03:53 +0500 Subject: [PATCH 67/75] Make top-level configure script more portable Remove hard-coded path to pwd; there is no need to have it, and for example NixOS doesn't actually have it at this location, leading to such an error: ./configure: line 36: /bin/pwd: No such file or directory /qtbase/configure not found. Did you forget to run "init-repository"? Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353 Reviewed-by: Oswald Buddenhagen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index a7b4c9cb..b6954b85 100755 --- a/configure +++ b/configure @@ -33,7 +33,7 @@ ############################################################################# srcpath=`dirname $0` -srcpath=`(cd "$srcpath"; /bin/pwd)` +srcpath=`(cd "$srcpath"; pwd)` configure=$srcpath/qtbase/configure if [ ! -e "$configure" ]; then echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 From 0fdc5369209225943aaa77672706fe9b607e0a89 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 25 Feb 2017 08:51:56 +0100 Subject: [PATCH 68/75] Update submodules on '5.8' in qt5 Change-Id: Icdce897429db6ec02938807bc2add8ae8d9a1ccc Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8e958284..e3bcab93 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8e9582847506bf17755415fdddd92c242407851c +Subproject commit e3bcab935c9fe37b344394c3ee8afd6773a8cd7e diff --git a/qtdeclarative b/qtdeclarative index fe5d6966..aa0e51be 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fe5d69669197a51662061b014810f0242eec5ca7 +Subproject commit aa0e51beaba1a338db42391c575212b4aac815b1 diff --git a/qtwebengine b/qtwebengine index b70bdb11..714bddf9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b70bdb111e16d9437f60725f8c2854014a569289 +Subproject commit 714bddf9921a4e12f03867118c6a4697083e6a14 From b94b02b9a0de01704a8ea2bed39ac34f28f6841e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 24 Feb 2017 10:24:05 +0100 Subject: [PATCH 69/75] Update submodules on '5.9' in qt5 Exclude qtbase this time. Change-Id: Ib294e795f7c822f3bc8a66643880cf09994d09ac Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index 88b24df4..16b1f88d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 88b24df43916442785238966d5a3c3eb77b2d097 +Subproject commit 16b1f88df40da3fad02e772dbaea5703f9564915 diff --git a/qtactiveqt b/qtactiveqt index bada5f8e..c0d93d40 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bada5f8ea74d6d9d2a60b35f4d271da143aced51 +Subproject commit c0d93d408d4eafcaab06d455b8c3ce1e2c21f8db diff --git a/qtdatavis3d b/qtdatavis3d index 25aeaddb..743f32ee 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 25aeaddbfb62a705ea447b19e4d1771d603bde2b +Subproject commit 743f32ee776220b52e0c37cbbbff5b4c52c475b6 diff --git a/qtdeclarative b/qtdeclarative index 2a15f6c5..ba68c325 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2a15f6c5de6905b2b0b583c0d37d109eeb94c196 +Subproject commit ba68c325688acf3072715757480497524f61c425 diff --git a/qtdoc b/qtdoc index 339a602f..27a03052 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 339a602fd96b88f9df5ddbb8e0e778bc570c4e53 +Subproject commit 27a03052d0d2e49360ec8b0f3b5c201294de8f79 diff --git a/qtlocation b/qtlocation index 68520449..11714b97 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 68520449fe15682fe8fcd666860f6ae86493ebf5 +Subproject commit 11714b973304827e2893953d7c55a23e15e678f5 diff --git a/qtmultimedia b/qtmultimedia index 5e01869d..b6299347 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5e01869d61ded981d5e3e4d955ddbc3c4c6fb201 +Subproject commit b6299347cc5cf4a9e4f79e2a4a8bb389260264df diff --git a/qtpurchasing b/qtpurchasing index ca91a12d..ab90166b 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ca91a12d768b9249a9e502806d68cb68afd5b16e +Subproject commit ab90166b29352a059239bbf90e3556f30465fc0c diff --git a/qtquickcontrols b/qtquickcontrols index 652e3bfc..0e92d0ae 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 652e3bfcefab674be3caa5062f4d1cf9634b9ef2 +Subproject commit 0e92d0ae2e21f01769f6768223a411c06b953989 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 751ca5df..e7409625 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 751ca5dfb7c3f0edd76110a5dc3a3696d3e0539c +Subproject commit e7409625f24ed8a32bb303b948bfdf077b74ea77 diff --git a/qtremoteobjects b/qtremoteobjects index 4a94d147..2c7268a3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4a94d1471ffe64533b969704178e44fc57bcd505 +Subproject commit 2c7268a3360d8174c34b037564a721971ec67677 diff --git a/qtrepotools b/qtrepotools index 45a7ada2..ae6a386f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 45a7ada21fc00026d23d96277bf910aad451c842 +Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 diff --git a/qtserialport b/qtserialport index 4458f937..1340fede 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4458f9376aa88b556e38d81180c5966889009bfb +Subproject commit 1340fedecd841765485beffa7c93320c96f21cdc diff --git a/qtspeech b/qtspeech index 5de7101b..5135fefe 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5de7101be14e7711eae6d28d187709656bc6f51d +Subproject commit 5135fefe90b7a5ff9bebe012ed4f1688fe096f93 diff --git a/qtsvg b/qtsvg index bfa9500a..7cc50e97 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bfa9500ae5b9acf24d1b6847003c19a4e49d9749 +Subproject commit 7cc50e972b7fa546f7cedff2ef19db20af9e36ab diff --git a/qttools b/qttools index cff0a955..0285e3ad 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit cff0a9551e18e82793d454400a86438ffecee99a +Subproject commit 0285e3ad511882b3cfb87fc06ffbf5775c01437b diff --git a/qtwebengine b/qtwebengine index cd475d57..cb6564b1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cd475d5727becd6ec4e7605d335721355e049354 +Subproject commit cb6564b11ea0a81155b59ab178ff75148017a952 diff --git a/qtwebkit b/qtwebkit index 37f9c3ea..0b30e449 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 37f9c3ea771ce340e1d0e474930798a3c188055b +Subproject commit 0b30e4490f7500ade1868fb33cea8705418c90bb diff --git a/qtxmlpatterns b/qtxmlpatterns index afa27386..8f340ee4 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit afa273865b7f2697c6e28fb1511486d2f9ce6bfe +Subproject commit 8f340ee4baddd6f9a43ecb1754c563372b561ce3 From 85f6859c3d6b787e847b9e28df422771b0b3a4b2 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Tue, 14 Feb 2017 13:44:28 +0200 Subject: [PATCH 70/75] Change Boot2Qt to use Ubuntu 16.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed Boot2Qt CI host from Ubuntu 14.04 to 16.04. There is also changed the target architecture to x86_64. Even though the meta-boot2qt builds binaries to the armv7 tests are run in host machine using Qemu thus we spoof Coin to believe we are running native binaries. Change-Id: I633d01b80ec8ae753badf495ec8faa90b4659c11 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 1055432c..70495e76 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -23,6 +23,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework qtci-osx-10.10-x86_64 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-14.04-x86_64 Boot2Qt_Jethro armv7 GCC DisableTests +qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck From df0092448a96c89e19b344f07cdb378069f21d5d Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 28 Feb 2017 22:31:11 +0100 Subject: [PATCH 71/75] Update submodules on '5.9' in qt5 Change-Id: Ia56d37f29ee715654aaeae85274073d74aedd0e8 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 16b1f88d..bec33082 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 16b1f88df40da3fad02e772dbaea5703f9564915 +Subproject commit bec33082f5ec09e067b30c8a560ffb5e8a20c154 diff --git a/qtbase b/qtbase index 35fa30e6..6d10f739 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 35fa30e65d26b9e4840cfa793ed8369b3475c1fd +Subproject commit 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c diff --git a/qtconnectivity b/qtconnectivity index 89cf6da8..402cbe22 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 89cf6da818279b16708d320ae3f5ed434310a347 +Subproject commit 402cbe22407133a38e319af7af676e68708c577d diff --git a/qtdatavis3d b/qtdatavis3d index 743f32ee..839c3d4b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 743f32ee776220b52e0c37cbbbff5b4c52c475b6 +Subproject commit 839c3d4b0acf1f4b3d00e002ab5bd044ab3331cf diff --git a/qtdeclarative b/qtdeclarative index ba68c325..8c864e52 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ba68c325688acf3072715757480497524f61c425 +Subproject commit 8c864e52369ee4d55a1d9345215c8153144b5939 diff --git a/qtdoc b/qtdoc index 27a03052..7c7607b2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 27a03052d0d2e49360ec8b0f3b5c201294de8f79 +Subproject commit 7c7607b2f26548734a05b8d6fb74ce0a6fa664e4 diff --git a/qtlocation b/qtlocation index 11714b97..b91774ec 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 11714b973304827e2893953d7c55a23e15e678f5 +Subproject commit b91774eca4bf46fcf5d4f4c9a65d6cb71eb6290d diff --git a/qtmultimedia b/qtmultimedia index b6299347..ed8f90d0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b6299347cc5cf4a9e4f79e2a4a8bb389260264df +Subproject commit ed8f90d0e47bd4ade7be3852627395ac66ba32ea diff --git a/qtpurchasing b/qtpurchasing index ab90166b..00c6b792 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ab90166b29352a059239bbf90e3556f30465fc0c +Subproject commit 00c6b792a95d72a4deb2bb89d0ba8cbb52681998 diff --git a/qtqa b/qtqa index 1561b922..02deca89 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 +Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 diff --git a/qtquickcontrols b/qtquickcontrols index 0e92d0ae..704045bc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0e92d0ae2e21f01769f6768223a411c06b953989 +Subproject commit 704045bc0326e4950f87504f3f67cbfabcd0b5e5 diff --git a/qtscxml b/qtscxml index 5d851f27..63904309 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 5d851f27a3c72e46df0dfdd234fc3a300a2870fb +Subproject commit 63904309552bc6dd39fcfda086b81c1b9bee0a08 diff --git a/qtserialbus b/qtserialbus index ed194212..6a460b36 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ed1942128078a30ea0436c3f2eb6cd9d60a82a4d +Subproject commit 6a460b3652af00231cc5037668656cec1621d5cf diff --git a/qttools b/qttools index 0285e3ad..ce8ad09e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0285e3ad511882b3cfb87fc06ffbf5775c01437b +Subproject commit ce8ad09e69d5732787312c362464a3ce0c5fa582 From 5f598f67f3d6430a2241df44177209617412e45c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 1 Mar 2017 13:41:53 +0100 Subject: [PATCH 72/75] Add libxss-dev needed by QtWebEngine Change-Id: Iac7e6b730803865d00b17d53e6aa488e80123b5b Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index a50a0681..b727659f 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -60,7 +60,7 @@ try # Enable linking to system dbus sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libdbus-1-dev || throw $ExceptionAPT # Needed libraries for WebEngine - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT # Common event loop handling sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libglib2.0-dev || throw $ExceptionAPT # MySQL support From 93b18e36e4cee7daccb24b986823360d1707c0a4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 2 Mar 2017 11:32:08 +0100 Subject: [PATCH 73/75] Update submodules on '5.9' in qt5 Change-Id: I525727ffd60aabf0f8e964377f6a670f26a49338 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index bec33082..ff6089ac 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bec33082f5ec09e067b30c8a560ffb5e8a20c154 +Subproject commit ff6089aca0ec77c6304a04de268e6d27e97d6c32 diff --git a/qtbase b/qtbase index 6d10f739..593a707b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c +Subproject commit 593a707ba35c22c0a1061dce745deceed8837f80 diff --git a/qtdatavis3d b/qtdatavis3d index 839c3d4b..fc946bae 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 839c3d4b0acf1f4b3d00e002ab5bd044ab3331cf +Subproject commit fc946bae2969cacb3ffa822ab033231ea1185b2d diff --git a/qtdeclarative b/qtdeclarative index 8c864e52..71a2dbed 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8c864e52369ee4d55a1d9345215c8153144b5939 +Subproject commit 71a2dbed467be0041b6793dda868655b2632e830 diff --git a/qtlocation b/qtlocation index b91774ec..e463bf8f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b91774eca4bf46fcf5d4f4c9a65d6cb71eb6290d +Subproject commit e463bf8f4ae1eb94b4f91cb6ebca4b198e86bccd diff --git a/qtquickcontrols b/qtquickcontrols index 704045bc..ba81daa6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 704045bc0326e4950f87504f3f67cbfabcd0b5e5 +Subproject commit ba81daa6f58992f0724f0a43590fae3453d3948e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e7409625..eb082fe7 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e7409625f24ed8a32bb303b948bfdf077b74ea77 +Subproject commit eb082fe715e23f55d24b3cf7528857167831f578 diff --git a/qtsensors b/qtsensors index d7f1d23c..5863c695 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d7f1d23c1dd954d20e8358ca6b7c3f6720310f50 +Subproject commit 5863c695ee8eef2976026dea876e37b8978d0c7a diff --git a/qtserialbus b/qtserialbus index 6a460b36..38703176 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6a460b3652af00231cc5037668656cec1621d5cf +Subproject commit 38703176f77ededf1b44946a6c38d6998c5e6796 diff --git a/qtwayland b/qtwayland index e9fb1165..a259232f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e9fb11653a504b86478ef8f4513a6c23045a4fa2 +Subproject commit a259232f3a661b8916497b056cb3d50c396c3d94 diff --git a/qtwebengine b/qtwebengine index cb6564b1..352115e2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cb6564b11ea0a81155b59ab178ff75148017a952 +Subproject commit 352115e2aeb8ba8c2bf4897f40b9e26555b7c80c diff --git a/qtxmlpatterns b/qtxmlpatterns index 8f340ee4..a5b1e6e3 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8f340ee4baddd6f9a43ecb1754c563372b561ce3 +Subproject commit a5b1e6e35e32719647c7f9b3de3953838d40d805 From 8de4f42cb62b083cee959ae196eec6c593b3f8ea Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Wed, 1 Mar 2017 18:29:21 +0200 Subject: [PATCH 74/75] Provisioning: Upgrade conan version from 0.16.0 to 0.20.2 Conan provisioning fails on private Coin instance due to error message Could not find a version that satisfies the requirement conan==0.16.0 (from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1, 0.20.2) No matching distribution found for conan==0.16.0 Upgrading to 0.16.1 resulted warning "Your conan's client version is deprecated for the current remote (v0.20.2). Upgrade conan client." and provisioning failed with "ERROR: All remotes failed" After upgrade to 0.20.2 conan provisioning script is working again. Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3 Reviewed-by: Konstantin Tokarev --- coin/provisioning/common/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 04be729d..6a4b4ebb 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -2,7 +2,7 @@ $scriptsPath = "C:\Python27\Scripts" -& "$scriptsPath\pip.exe" install --upgrade conan==0.16.0 +& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") From 111799abf170d4a65358aa84d1f1d9a92bee6350 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Fri, 13 Jan 2017 10:01:47 +0200 Subject: [PATCH 75/75] Add qemu user mode binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qemu is used to run unit tests for arm binaries in coin. Change-Id: I8610b5d7603fa3bcd5cf0f9e83ee38e219b60a85 Reviewed-by: Tony Sarajärvi Reviewed-by: Simon Hausmann --- .../003-qemu.sh | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh new file mode 100755 index 00000000..bd71bbe2 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash +############################################################################# +## +## 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$ +## +############################################################################# + +set -e +# build latest qemu to usermode +sudo apt-get -y install automake autoconf libtool + +tempDir=$(mktemp -d) || echo "Failed to create temporary directory" +git clone git://git.qemu.org/qemu.git "$tempDir" +cd "$tempDir" + +#latest commit from the master proven to work +git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f +git submodule update --init pixman +./configure --target-list=arm-linux-user --static +make +sudo make install +rm -rf "$tempDir" + +# Enable binfmt support +sudo apt-get -y install binfmt-support + +# Install qemu binfmt +sudo update-binfmts --package qemu-arm --install arm \ +/usr/local/bin/qemu-arm \ +--magic \ +"\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ +--mask \ +"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"