From 3dc3ceb646e07eb94c04c51835637639454da5f4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 24 Aug 2017 22:36:43 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: Ia93843e106a111a79740fe9b5a55eb177259dcfe Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtwayland | 2 +- qtwinextras | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 58639dab..a52648e5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 58639dab0360add8ccb23ca96141113fedf39866 +Subproject commit a52648e549e23beb79c3ba0060a8e131ce22cc7d diff --git a/qtactiveqt b/qtactiveqt index c2751b1d..f0274051 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c2751b1d664748cfbd05d2e397f95f2cc0bec13f +Subproject commit f02740515348339963af18ff795f7cdfb1b1f8cc diff --git a/qtbase b/qtbase index b65e30c8..515b9051 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b65e30c861af308d142c36b5f96f1a4cfedde1f3 +Subproject commit 515b9051505d61af6be0eba87616c7281ee4ce62 diff --git a/qtcharts b/qtcharts index 1f47b1a7..5261307d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1f47b1a7ae58702dccc57a9ccbaa905441f4fecb +Subproject commit 5261307d061a2b925faffb6ea21aa3dbca1e50a9 diff --git a/qtdeclarative b/qtdeclarative index 363189a3..4c3246e4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 363189a3d351ace484180ede0f2f6c4ed04f8401 +Subproject commit 4c3246e49521b6341ddcc513814ae03e6d8f1d3e diff --git a/qtdoc b/qtdoc index 0718372f..48f7e029 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0718372fec57aae22aaab544f39c2fbbdb0119a2 +Subproject commit 48f7e029923303fc313ca460a1a7d06fc2d04384 diff --git a/qtwayland b/qtwayland index 7f70da6a..a97b4f85 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7f70da6a644bc5b690066f0ab4814e1358f57e81 +Subproject commit a97b4f8504cd4bccebed60934e5b842610454b39 diff --git a/qtwinextras b/qtwinextras index fe63ea12..f1e26328 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fe63ea126822fae40db90a06ab3be47700e85ec4 +Subproject commit f1e26328e8f1abe9d87e369b0fe57954dfe68a87 -- cgit v1.2.3 From 3a000ed41add5a2400b83d78366992054764b33d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 24 Aug 2017 17:10:56 +0200 Subject: Fix target architecture for Boot2Qt declarative tests Amends 7456e028a701ff31f63a465fb8fadca63c453b97 and therefore allows the re-use of the boot2qt build artifacts. Change-Id: I4b01bf13e0004c4c3c3a2be00b02760e0ad3ffdd Reviewed-by: Sami Nurmenniemi Reviewed-by: Simon Hausmann --- coin/platform_configs/qtdeclarative.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c8ac9c47..1cc88584 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC DeveloperBuild -- cgit v1.2.3 From 738509c242c9cfbcced7e5ef73ec2ba4be22d32c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Aug 2017 14:59:40 +0200 Subject: Adjust submodule branches Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index b5637093..a9cc46ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.10 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.10 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.10 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.10 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.10 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.10 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 5.10 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.10 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.10 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.10 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.10 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.10 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.10 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.10 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.10 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.10 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.10 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.10 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.10 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.10 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.10 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.10 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.10 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.10 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.10 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.10 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.10 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.10 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.10 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.10 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.10 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.10 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.10 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.10 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = 5.10 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 5.10 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = 5.10 status = addon [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 5.10 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 5.10 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = 5.10 status = preview -- cgit v1.2.3 From be3e818688c1a634aebe2b23884d511cb1e3b623 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 27 Aug 2017 13:11:42 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: Ibf7a0094c2e06fdf7b1f62eaf90d6e4f6c6e1161 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index a52648e5..595b4add 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a52648e549e23beb79c3ba0060a8e131ce22cc7d +Subproject commit 595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a diff --git a/qtbase b/qtbase index 515b9051..0f11fab6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 515b9051505d61af6be0eba87616c7281ee4ce62 +Subproject commit 0f11fab6f75dec78d3721280971448cc2edd6e72 diff --git a/qtdeclarative b/qtdeclarative index 4c3246e4..2c45bdb0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4c3246e49521b6341ddcc513814ae03e6d8f1d3e +Subproject commit 2c45bdb0e2433b2246d985b61348f8caa6e5926b -- cgit v1.2.3 From b663966026c5a2c7d4805d299bee778b71341f40 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 28 Aug 2017 20:10:54 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I96b67c72364dabaf6bbefbcf561104bbd01ee6b3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qttools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index 595b4add..142cc363 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 595b4add0ce6f32bb8ffc56b3a59e6e5bf0b000a +Subproject commit 142cc363d7175c7cc9c7271154e12f7f23bfe514 diff --git a/qtbase b/qtbase index 0f11fab6..1bb70830 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0f11fab6f75dec78d3721280971448cc2edd6e72 +Subproject commit 1bb70830d4ea030c4ce2d41be3e31a9c05c6b976 diff --git a/qttools b/qttools index 28b1b88a..9a6dd30d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 28b1b88a0b85f4ce7765ed5cc5f3780f97e5ea4f +Subproject commit 9a6dd30d0a71dfece28f4f0360f4e266ec386607 -- cgit v1.2.3 From 207eb4069be3ec44baed7be2eab41ed5107c50ec Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 28 Aug 2017 09:52:25 +0200 Subject: Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The merge commit 74eb853384473dbe18123f9731b6f9529d68d2cf accidentally brought forward the removal of files from commit 49ccf716dca2a14d21ce6869cdcd64b861c53834 that were not supposed to propagate. Change-Id: Ia5d6b2205c75f0856c3fed104149980c75a55840 Reviewed-by: Dominik Holland Reviewed-by: Iikka Eklund Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 5 ++ .../qtci-linux-RHEL-7.2-x86_64/09-cmake.sh | 53 ++++++++++++++++++++++ .../qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh | 53 ++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh new file mode 100644 index 00000000..ad1bf18f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -0,0 +1,5 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo subscription-manager refresh +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/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 CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/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 CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc -- cgit v1.2.3 From 21ecbe19578a700b90dbf99e83388e374d81052f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Aug 2017 16:00:53 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I89cafd064580d98afb8c55c82465bc3348652ff3 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 1bb70830..e81f430e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1bb70830d4ea030c4ce2d41be3e31a9c05c6b976 +Subproject commit e81f430e30635f975dd4635ffb64d66fc1bce355 diff --git a/qtdeclarative b/qtdeclarative index 2c45bdb0..b4491c46 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2c45bdb0e2433b2246d985b61348f8caa6e5926b +Subproject commit b4491c46fd9754a1c799978529574037a55a55aa diff --git a/qtwebchannel b/qtwebchannel index b5229df6..228184f9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b5229df6a08a902b11a2fc9529af6385f4d985d5 +Subproject commit 228184f93b4d39e1aca9e53fde8e576f71b90c93 diff --git a/qtwebengine b/qtwebengine index 0f6908b5..a311b7bc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0f6908b5f9eca09cf086410344a862b9d59ef727 +Subproject commit a311b7bc9d598c251b9beb1f712da9de62308be0 -- cgit v1.2.3 From bf097625701c32ba993248dabebcb7917a35a03b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Aug 2017 15:57:30 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I10ce89cd030062845d72a49266bb077cabd935ea Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 5c99313e..dc4a29aa 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5c99313eedada4e502b57798122ab20d71eca0fe +Subproject commit dc4a29aa578c1c00fc750d1f6882e45f09134b47 diff --git a/qtbase b/qtbase index f537dc0d..3ea09e44 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f537dc0da288949c4df903c1f2b21156e62fbae5 +Subproject commit 3ea09e447487a26bf6c833dc0707a83844190777 diff --git a/qtdeclarative b/qtdeclarative index 780e11cf..34a545c2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 780e11cf38a98cd32b6a5aa44dbb4cbf0f5d5ff8 +Subproject commit 34a545c2ab821bbba5229df89f47719eb0219d92 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4200f711..31d90e30 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4200f7117973969392be48b0c82f1b4bc214e546 +Subproject commit 31d90e308e46d644d74e9434ce31dd664677bc59 diff --git a/qttranslations b/qttranslations index e51b921f..4f744d42 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e51b921f6fa0fb64a8a7f4159024d1a2f1872772 +Subproject commit 4f744d427a5bfd698dcdad394666a72ccbb79a3c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d80646f8..f504a96c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d80646f8f11283ad4bd9996d5a59a1154e7f651d +Subproject commit f504a96c268d10efcbe0597ae529a467b20d8eb8 -- cgit v1.2.3 From f05289d62231fc38c0e8094870d917a14cd11654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 28 Aug 2017 09:42:02 +0300 Subject: Provisioning: Add $PATH properly in .bashrc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index 7cdfc25c..c23cf9b2 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -50,4 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc +echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh index 7cdfc25c..c23cf9b2 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh @@ -50,4 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc +echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc -- cgit v1.2.3 From 835ef953f026dcad106b9fe00e1504f4526d5a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 22 Aug 2017 15:06:23 +0300 Subject: Provisioning: Fine tune cmake provisioning script Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake.ps1 | 55 +++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 197eec57..50e2e82c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -1,10 +1,57 @@ +############################################################################# +## +## 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" -$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" +$majorminorversion = "3.6" +$version = "3.6.2" + +$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" +$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" +$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" -Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip +Download $officialurl $cachedurl $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 +# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS +if((Test-Path -Path "C:\CMake" )){ + try { + Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old + } catch {} +} +$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" +Rename-Item $defaultinstallfolder C:\CMake + +echo "CMake = $version" >> ~\versions.txt + -- cgit v1.2.3 From c7a9bb92e1ed46464a38006832a010a719290779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 25 Aug 2017 09:02:36 +0300 Subject: Fix adding to path lines for Windows provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the path addition command will forget the previous addition when adding a new string. This hasn't been found out because python was the only script using this command. Now we also need to set the path for ruby, so the python string is left out. Change-Id: I39721d78111550189e52a9f095030033f9660c0a Reviewed-by: Tony Sarajärvi Reviewed-by: Joni Jäntti --- coin/provisioning/common/install-ruby.ps1 | 3 +++ coin/provisioning/common/python.ps1 | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 332a3a89..be0bc3eb 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -48,4 +48,7 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" +$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine) + echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 6c88689a..29114456 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,7 +62,9 @@ echo "Chancing allowZip64 value to 'True'..." (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py echo "Remove $package..." del $package -[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) + +$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) C:\Python27\python.exe -m ensurepip # Install python virtual env -- cgit v1.2.3 From 1bd2b2acfa5eff4a78b20fb9a0b49c79107a2b3a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 28 Aug 2017 12:55:16 +0200 Subject: Fix code duplication for cmake installation on Linux Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake_linux.sh | 53 +++++++++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 54 +--------------------- .../qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh | 54 +--------------------- 3 files changed, 55 insertions(+), 106 deletions(-) create mode 100755 coin/provisioning/common/cmake_linux.sh diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh new file mode 100755 index 00000000..c23cf9b2 --- /dev/null +++ b/coin/provisioning/common/cmake_linux.sh @@ -0,0 +1,53 @@ +#!/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 CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index c23cf9b2..d7abd285 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1,53 +1 @@ -#!/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 CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh index c23cf9b2..d7abd285 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh @@ -1,53 +1 @@ -#!/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 CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +$(dirname $0)/../common/cmake_linux.sh -- cgit v1.2.3 From 39b3764a5ade3c86715770911b80a0a8a89855f5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 30 Aug 2017 10:16:36 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae Reviewed-by: Simon Hausmann --- qtactiveqt | 2 +- qtbase | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtwinextras | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index ddf9740b..7cfd7cfe 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ddf9740b3df51078d879b9b577d0a722b4da57a4 +Subproject commit 7cfd7cfebabe347413158ef4a97cf2ff0832533d diff --git a/qtbase b/qtbase index c86a75e9..b875e97a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c86a75e9e5fac56f0a9c87ce87264f8f020791ce +Subproject commit b875e97ad54637cfeb3e5f3e1d70814f62692036 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index be77d879..0593bd57 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit be77d8798a1df1cb928b944c145db3fa9aeb9777 +Subproject commit 0593bd577168cdf8b4318d4e46ea463f433f8bb2 diff --git a/qtrepotools b/qtrepotools index f9427cec..21574ed0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9427cec15cdcfd37c13fc883fd17d16f23bdcfb +Subproject commit 21574ed0092c596d46bd4639262c1918ea28af6c diff --git a/qtwinextras b/qtwinextras index 5f76a8ea..cef5c0d5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5f76a8ea102392838b05c41fa5a474aa1168ff11 +Subproject commit cef5c0d59075d420f2ec5b192a22bf4dba58f68c -- cgit v1.2.3 From a99d3432f71c4be5045ae2cdcc3b7070de5abe23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 26 Jul 2017 10:19:45 +0300 Subject: Install python3 on all platforms Python3 is required in 5.6 by pyside-setup. Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann (cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7) --- coin/provisioning/common/InstallPKGFromURL.sh | 104 +++++++++++++++++++++ coin/provisioning/common/python3.ps1 | 70 ++++++++++++++ coin/provisioning/common/python3.sh | 52 +++++++++++ coin/provisioning/common/vc_redist.ps1 | 64 +++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 14 +++ .../qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh | 4 +- .../qtci-osx-10.10-x86_64/025-python3.sh | 1 + .../qtci-osx-10.11-x86_64/025-python3.sh | 1 + .../qtci-osx-10.8-x86_64/025-python3.sh | 1 + .../qtci-osx-10.9-x86_64/025-python3.sh | 1 + coin/provisioning/qtci-windows-10-x86/python3.ps1 | 1 + .../qtci-windows-10-x86_64/python3.ps1 | 1 + .../qtci-windows-7-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/python3.ps1 | 1 + .../qtci-windows-8-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8-x86/python3.ps1 | 1 + .../qtci-windows-8-x86_64/07-vc_redist.ps1 | 1 + .../provisioning/qtci-windows-8-x86_64/python3.ps1 | 1 + 18 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/InstallPKGFromURL.sh create mode 100644 coin/provisioning/common/python3.ps1 create mode 100755 coin/provisioning/common/python3.sh create mode 100644 coin/provisioning/common/vc_redist.ps1 create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/python3.ps1 diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh new file mode 100644 index 00000000..c00b646c --- /dev/null +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -0,0 +1,104 @@ +#!/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" > $targetFile.sha1 + /usr/bin/shasum --check $targetFile.sha1 || 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 + } +} diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/python3.ps1 new file mode 100644 index 00000000..3c565874 --- /dev/null +++ b/coin/provisioning/common/python3.ps1 @@ -0,0 +1,70 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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$ +## +############################################################################# + +param([Int32]$archVer=32) +. "$PSScriptRoot\helpers.ps1" + +# This script installs Python $version. +# Python3 is required for building some qt modules. + +$version = "3.6.1" +$package = "C:\Windows\temp\python-$version.exe" +$install_path = "C:\Python36" + +# check bit version +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe" + $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" +} +else { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe" + $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" +} + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q TargetDir=$install_path" +echo "Remove $package..." +del $package + +[Environment]::SetEnvironmentVariable("PYTHON3_PATH", "$install_path", [EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine) + +# Install python virtual env +cmd /c "$install_path\Scripts\pip3.exe install virtualenv" diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh new file mode 100755 index 00000000..56e82386 --- /dev/null +++ b/coin/provisioning/common/python3.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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 python3 + +source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" +SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv + +echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +echo "python3 = 3.6.1" >> ~/versions.txt diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 new file mode 100644 index 00000000..95567669 --- /dev/null +++ b/coin/provisioning/common/vc_redist.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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$ +## +############################################################################# + +param([Int32]$archVer=32) +. "$PSScriptRoot\helpers.ps1" + +# This script installs Visual C++ Redistributable for Visual Studio 2015 +# This is a dependency of the current python3 version + +# check bit version +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" + $arch = "x64" + $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe" + $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c" +} +else { + $arch = "x86" + $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe" + $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1" +} + +$package = "C:\Windows\temp\vc_redist.$arch.exe" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q" +echo "Remove $package..." +del $package diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index b419f217..0003127a 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -2,3 +2,17 @@ # version: provided by default Linux distribution repository # needed to build pyside sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm +sudo rpm -Uvh epel-release-latest-6.noarch.rpm +sudo rm -f epel-release-latest-6.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh index 205f598b..d4cd60e8 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh @@ -3,4 +3,6 @@ # needed to build pyside sudo apt-get update -sudo apt-get install -y python-dev +sudo apt-get install -y python-dev python3-dev python3-pip + +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-7-x86/python3.ps1 b/coin/provisioning/qtci-windows-7-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..6070c80b --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 -- cgit v1.2.3 From eb6ce241f090e85c1cfb97d28cff2b7b39d45e50 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 30 Aug 2017 10:40:05 +0200 Subject: qtquickcontrols2: recommend qtimageformats The new image-based style in Qt Quick Controls 2 uses WebP for animations. Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901 Reviewed-by: Mitch Curtis Reviewed-by: Oswald Buddenhagen --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index a9cc46ae..4cc5b93a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -243,6 +243,7 @@ status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects + recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.10 -- cgit v1.2.3 From 30660bf987a22275339ae522c411809cdf077406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 19 May 2017 14:27:35 +0300 Subject: Make CI use a new provisioned Win 10 template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann Reviewed-by: Joni Jäntti Reviewed-by: Qt CI Bot --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 6 +++--- coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 | 1 + .../qtci-windows-10-x86_64/004-disable-windows-updates.ps1 | 1 + .../qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 | 1 + .../qtci-windows-10-x86_64/09-install-dependencywalker.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 | 1 + .../qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 | 1 + .../qtci-windows-10-x86_64/09-set-network-test-server.ps1 | 1 + 13 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 57820fcc..23b6e331 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,7 +7,7 @@ qtci-windows-8.1-x86_64 MSVC2013 qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index b7a49bd0..a24ffd9a 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -10,6 +10,6 @@ qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packagin qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 new file mode 100644 index 00000000..ae3f327d --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..e8e24995 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 new file mode 100644 index 00000000..ee3f36a9 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 new file mode 100644 index 00000000..f9129cff --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 new file mode 100644 index 00000000..07c4f487 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..8d549455 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..18109622 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\set-network-test-server.ps1" -- cgit v1.2.3 From 05dd83c73ae072d1e0be3709ed87bbd485ae896c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 22 Aug 2017 15:39:09 +0300 Subject: provisioning: windows: ICU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed ICU script to actually install ICU instead of just setting the environment variables. It is required to build qtwebkit. Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/icu.ps1 | 120 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 index 4be185e5..16dd8a6f 100644 --- a/coin/provisioning/common/icu.ps1 +++ b/coin/provisioning/common/icu.ps1 @@ -1,5 +1,78 @@ -# ICU is already pre-installed on Windows machines, it would be nice to have -# the installation script, but for now let's just export the right variables +############################################################################ +## +## 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" + +# This script installs ICU. + +$version = "53_1" + +if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { + + $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z" + $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z" + $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC" + + $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z" + $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z" + $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F" + + $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z" + $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z" + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64 + Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012 + Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""} + + echo "Cleaning $icuPackage_msvc2012_64..." + Remove-Item -Recurse -Force $icuPackage_msvc2012_64 + + echo "ICU MSVC2012 = $version" >> ~\versions.txt + } + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64 + Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013 + Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""} + + echo "Cleaning $icuPackage_msvc2013_64..." + Remove-Item -Recurse -Force $icuPackage_msvc2013_64 + + echo "ICU MSVC2013 = $version" >> ~\versions.txt + } # FIXME: do we really want to have it per MSVC version? What about MSVC2015? [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine") @@ -7,3 +80,46 @@ # FIXME: do we really want to use the 4.8.2 ICU build? [Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") + +} else { + + $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z" + $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z" + $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0" + + $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z" + $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z" + $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800" + + $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z" + $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z" + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32 + Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32 + Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""} + + echo "Cleaning $icuPackage_msvc2012_32..." + Remove-Item -Recurse -Force $icuPackage_msvc2012_32 + + echo "ICU MSVC2012 = $version" >> ~\versions.txt + } + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32 + Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32 + Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""} + + echo "Cleaning $icuPackage_msvc2013_32..." + Remove-Item -Recurse -Force $icuPackage_msvc2013_32 + + echo "ICU MSVC2013 = $version" >> ~\versions.txt + } + +# FIXME: do we really want to have it per MSVC version? What about MSVC2015? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine") +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") + +} -- cgit v1.2.3 From 1726ba16117fedaffc4c3d387d411851479fb22c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Aug 2017 11:39:19 +0300 Subject: Update submodules on '5.6' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idfea61ecc744f07c6212fa4f29de808103393702 Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index b875e97a..40ca27e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b875e97ad54637cfeb3e5f3e1d70814f62692036 +Subproject commit 40ca27e0d2107fd97b01bfb201cff408f7c5a0c3 -- cgit v1.2.3 From 3ca76587815797b1b101941537c090b9026bd418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 21 Aug 2017 15:14:00 +0300 Subject: Provision vanilla Windows 8.1 x86 and use it Replaces existing Windows 8 x86 builds with a vanilla tier 1 image that gets all needed software provisioned except for VS2013 that is pre-installed. Also modifies existing provisioning scripts under common to support this 32bit OS. Task-number: QTQAINFRA-1383 Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- coin/provisioning/common/helpers.ps1 | 10 +++++ .../common/install-dependencywalker.ps1 | 13 ++++-- coin/provisioning/common/install-git.ps1 | 15 +++++-- coin/provisioning/common/install-java.ps1 | 16 +++++-- coin/provisioning/common/install-notepad++.ps1 | 21 +++++++-- coin/provisioning/common/install-ruby.ps1 | 13 ++++-- coin/provisioning/common/install-sevenzip.ps1 | 15 +++++-- .../common/install-strawberry-perl.ps1 | 13 ++++-- coin/provisioning/common/mysql.ps1 | 25 +++++++---- coin/provisioning/common/openssl.ps1 | 45 +++++++++++-------- coin/provisioning/common/postgresql.ps1 | 50 ++++++++++++--------- coin/provisioning/common/python.ps1 | 16 +++---- .../01-windows_removethemall.ps1 | 1 - .../qtci-windows-8-x86/04-disable-windefender.ps1 | 5 --- .../qtci-windows-8-x86/05-wsearch-off.ps1 | 3 -- coin/provisioning/qtci-windows-8-x86/06-python.ps1 | 1 - .../qtci-windows-8-x86/07-mesa_llvmpipe.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/cmake.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/icu.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/jom.ps1 | 1 - .../qtci-windows-8.1-x86/001-disable-uac.ps1 | 1 + .../004-disable-windows-updates.ps1 | 1 + .../009-set-network-test-server.ps1 | 1 + .../01-allow-remote-desktop-access.ps1 | 1 + .../qtci-windows-8.1-x86/02-disable-sleep.ps1 | 1 + .../qtci-windows-8.1-x86/02-install-notepad++.ps1 | 1 + .../qtci-windows-8.1-x86/03-install-sevenzip.ps1 | 1 + .../04-disable-windefender.ps1 | 1 + .../qtci-windows-8.1-x86/05-wsearch-off.ps1 | 1 + .../qtci-windows-8.1-x86/06-python.ps1 | 1 + .../qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8.1-x86/08-install-git.ps1 | 1 + .../qtci-windows-8.1-x86/08-install-java.ps1 | 1 + .../09-install-dependencywalker.ps1 | 1 + .../qtci-windows-8.1-x86/09-install-ruby.ps1 | 1 + .../09-install-strawberry-perl.ps1 | 1 + .../provisioning/qtci-windows-8.1-x86/09-mysql.ps1 | 1 + .../qtci-windows-8.1-x86/09-postgresql.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/icu.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/jom.ps1 | 1 + .../qtci-windows-8.1-x86/msvc-2013-update5.ps1 | 51 ++++++++++++++++++++++ coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 | 1 + 44 files changed, 245 insertions(+), 96 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/06-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/cmake.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/icu.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 23b6e331..ea6e259b 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,7 +2,7 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 132fcdd3..3f7f0a68 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -88,3 +88,13 @@ function Add-Path echo "Adding $Path to Path" [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) } + +function is64bitWinHost +{ + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { + return 1 + } + else { + return 0 + } +} diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/install-dependencywalker.ps1 index a9a56f7a..ad89fc7b 100644 --- a/coin/provisioning/common/install-dependencywalker.ps1 +++ b/coin/provisioning/common/install-dependencywalker.ps1 @@ -36,10 +36,17 @@ # This script will install Dependency Walker 2.2.6000 $version = "2.2.6000" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip" -$url_official = "http://www.dependencywalker.com/depends22_x64.zip" +if( (is64bitWinHost) -eq 1 ) { + $arch = "_x64" + $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" +} +else { + $arch = "_x86" + $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22" + $arch + ".zip" +$url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip" $dependsPackage = "C:\Windows\Temp\depends-$version.zip" -$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" $TARGETDIR = "C:\Utils\dependencywalker" if(!(Test-Path -Path $TARGETDIR )){ diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/install-git.ps1 index d3543138..6b4a34b0 100644 --- a/coin/provisioning/common/install-git.ps1 +++ b/coin/provisioning/common/install-git.ps1 @@ -35,10 +35,17 @@ # Install Git version 2.13.0 $version = "2.13.0" -$gitPackage = "C:\Windows\Temp\Git-" + $version + "-64-bit.exe" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + "-64-bit.exe" -$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + "-64-bit.exe" -$sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-64-bit" + $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7" +} +else { + $arch = "-32-bit" + $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec" +} +$gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe" +$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe" echo "Fetching Git $version..." Download $url_official $url_cache $gitPackage diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 index 06bcf6a1..4b9dd097 100644 --- a/coin/provisioning/common/install-java.ps1 +++ b/coin/provisioning/common/install-java.ps1 @@ -33,14 +33,24 @@ . "$PSScriptRoot\..\common\helpers.ps1" -# This script will install Java +# This script will install Java RE +# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. $version = "7u7" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe" +if( (is64bitWinHost) -eq 1 ) { + $arch = "x64" + $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3" +} +else { + $arch = "i586" + $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe" $javaPackage = "C:\Windows\Temp\java-$version.exe" Copy-Item $url_cache $javaPackage cmd /c "$javaPackage /s SPONSORS=0" echo "Cleaning $javaPackage.." Remove-Item -Recurse -Force "$javaPackage" -echo "Java = $version" >> ~\versions.txt +echo "Java = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/install-notepad++.ps1 index 15a8c004..2e893852 100644 --- a/coin/provisioning/common/install-notepad++.ps1 +++ b/coin/provisioning/common/install-notepad++.ps1 @@ -36,9 +36,16 @@ # This script will install Notepad++ $version = "7.3" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer.x64.exe" -$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer.x64.exe" -$sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA" +if( (is64bitWinHost) -eq 1 ) { + $arch = ".x64" + $sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA" +} +else { + $arch = "" + $sha1 = "d4c403675a21cc381f640b92e596bae3ef958dc6" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer" + $arch + ".exe" +$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer" + $arch + ".exe" $nppPackage = "C:\Windows\Temp\npp-$version.exe" Download $url_official $url_cache $nppPackage @@ -50,5 +57,11 @@ Remove-Item -Recurse -Force "$nppPackage" echo "Notepad++ = $version" >> ~\versions.txt -Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +if( (is64bitWinHost) -eq 1 ) { + Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +} +else { + Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" +} + echo "Auto-updating disabled." diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index be0bc3eb..81b01342 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -36,10 +36,17 @@ # This script will install Ruby $version = "2.2.6" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + "-x64.exe" -$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + "-x64.exe" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-x64" + $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" +} +else { + $arch = "" + $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe" +$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe" $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" -$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" Download $url_official $url_cache $rubyPackage Verify-Checksum $rubyPackage $sha1 diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1 index 91442500..1db41cc1 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/install-sevenzip.ps1 @@ -36,10 +36,19 @@ # This script installs 7-Zip $version = "1604" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + "-x64.exe" -$url_official = "http://www.7-zip.org/a/7z" + $version + "-x64.exe" + +if( (is64bitWinHost) -eq 1 ) { + $arch = "-x64" + $sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" +} +else { + $arch = "" + $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe" +$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe" $7zPackage = "C:\Windows\Temp\7zip-$version.exe" -$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" Download $url_official $url_cache $7zPackage Verify-Checksum $7zPackage $sha1 diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/install-strawberry-perl.ps1 index 83b63897..bd5347b6 100644 --- a/coin/provisioning/common/install-strawberry-perl.ps1 +++ b/coin/provisioning/common/install-strawberry-perl.ps1 @@ -36,10 +36,17 @@ # This script installs Strawberry Perl $version = "5.26.0.1" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + "-64bit.msi" -$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" +$version+ "-64bit.msi" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-64bit" + $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" +} +else { + $arch = "-32bit" + $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + $arch + ".msi" +$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" + $version + $arch + ".msi" $strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi" -$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" Download $url_official $url_cache $strawberryPackage Verify-Checksum $strawberryPackage $sha1 diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1 index 9bd9929b..e300566e 100644 --- a/coin/provisioning/common/mysql.ps1 +++ b/coin/provisioning/common/mysql.ps1 @@ -62,21 +62,28 @@ try { Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted } catch {} -# Install x64 bit version -$architecture = "x64" -$installFolder = "C:\Utils\my_sql\my_sql" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip" +if( (is64bitWinHost) -eq 1 ) { + # Install x64 bit version + $architecture = "x64" + $installFolder = "C:\Utils\my_sql\my_sql" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip" -DownloadAndInstall $internalUrl $packagex64 $installFolder + DownloadAndInstall $internalUrl $packagex64 $installFolder -echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") + echo "Set environment variables ..." + [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") + [Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") +} # Install x86 bit version $architecture = "x86" -$installFolder = "C:\Utils\my_sql\my_sql$architecture" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip" +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\Utils\my_sql\my_sql$architecture" +} +else { + $installFolder = "C:\Utils\my_sql\my_sql" +} DownloadAndInstall $internalUrl $packagex86 $installFolder diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/openssl.ps1 index 2d63106f..df320c72 100644 --- a/coin/provisioning/common/openssl.ps1 +++ b/coin/provisioning/common/openssl.ps1 @@ -40,30 +40,39 @@ $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 = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" -$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" +if( (is64bitWinHost) -eq 1 ) { -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" + # Install x64 bit version + $architecture = "x64" + $installFolder = "C:\openssl" + $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" + $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" -echo "Remove downloaded $packagex64 ..." -Remove-Item $packagex64 + 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 "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") + 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" + +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\openssl$architecture" +} else { + $installFolder = "C:\openssl" +} + $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 index 2ff97761..dd5858a3 100644 --- a/coin/provisioning/common/postgresql.ps1 +++ b/coin/provisioning/common/postgresql.ps1 @@ -40,37 +40,45 @@ $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\pgsql" -$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" -$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" +if( (is64bitWinHost) -eq 1 ) { + # Install x64 bit versions + $architecture = "x64" + $installFolder = "C:\Utils\postgresql\pgsql" + $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" + $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" -# Delete any leftovers -try { - Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted -} catch {} + # Delete any leftovers + try { + Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted + } catch {} -echo "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex64 -Verify-Checksum $packagex64 $sha1 -echo "Installing $packagex64 ..." -Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder + echo "Fetching from URL ..." + Download $externalUrl $internalUrl $packagex64 + Verify-Checksum $packagex64 $sha1 + echo "Installing $packagex64 ..." + Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder -echo "Remove downloaded $packagex64 ..." -Remove-Item $packagex64 + echo "Remove downloaded $packagex64 ..." + Remove-Item $packagex64 -echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") + echo "Set $architecture environment variables ..." + [Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") + [Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") +} # Install x86 bit version $architecture = "x86" -$installFolder = "C:\Utils\postgresql$architecture\pgsql" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip" $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\Utils\postgresql$architecture\pgsql" +} +else { + $installFolder = "C:\Utils\postgresql\pgsql" +} + echo "Fetching from URL..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 29114456..0be96eef 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -30,27 +30,23 @@ ## $QT_END_LICENSE$ ## ############################################################################# -param([Int32]$archVer=32) . "$PSScriptRoot\helpers.ps1" # This script installs Python $version. # Python is required for building Qt 5 from source. $version = "2.7.13" -$package = "C:\Windows\temp\python-$version.msi" - -# check bit version -if ( $archVer -eq 64 ) { - echo "Running in 64 bit system" - $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi" +if( (is64bitWinHost) -eq 1 ) { + $arch = ".amd64" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { - $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi" + $arch = "" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } +$package = "C:\Windows\temp\python-$version.msi" +$externalUrl = "https://www.python.org/ftp/python/$version/python-$version" + $arch + ".msi" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version" + $arch + ".msi" echo "Fetching from URL..." Download $externalUrl $internalUrl $package diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 deleted file mode 100644 index 2d1f0783..00000000 --- a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Turning off win defender. -# -# If disabled manually, windows will automatically enable it after -# some period of time. Disabling it speeds up the builds. -REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 deleted file mode 100644 index 09c45bbd..00000000 --- a/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 +++ /dev/null @@ -1,3 +0,0 @@ - -# Disable the windows search indexing service -sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86/06-python.ps1 deleted file mode 100644 index 27c618e1..00000000 --- a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 deleted file mode 100644 index b405191e..00000000 --- a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 deleted file mode 100644 index 8dbe0372..00000000 --- a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 deleted file mode 100644 index 325be36a..00000000 --- a/coin/provisioning/qtci-windows-8-x86/icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 deleted file mode 100644 index 842c65dd..00000000 --- a/coin/provisioning/qtci-windows-8-x86/jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 new file mode 100644 index 00000000..2303699c --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..e8e24995 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 new file mode 100644 index 00000000..ae3f327d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 new file mode 100644 index 00000000..ee3f36a9 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 new file mode 100644 index 00000000..44c1c5ff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 new file mode 100644 index 00000000..f9129cff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 new file mode 100644 index 00000000..07c4f487 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..8d549455 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..18109622 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 new file mode 100644 index 00000000..a41035da --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 new file mode 100644 index 00000000..92339a45 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 new file mode 100644 index 00000000..325be36a --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 new file mode 100644 index 00000000..842c65dd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 new file mode 100644 index 00000000..8540c67d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 @@ -0,0 +1,51 @@ +############################################################################# +## +## 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" + +# Install Visual Studio 2013 update 5 + +$version = "2013 Update 5 (KB2829760)" +$package = "C:\Windows\Temp\vs12-kb2829760.exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe" + +echo "Fetching patch for Visual Studio $version..." +Copy-Item $url_cache $package +$commandLine = $package + +echo "Installing Update 5 for Visual Studio $version..." +. $commandLine /norestart /passive + +echo "Removing $package ..." +remove-item $package + +echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 new file mode 100644 index 00000000..f3906f78 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\openssl.ps1" -- cgit v1.2.3 From 87df3502a7d5f75c32eefe921a6cfbb3e6d9068a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 1 Sep 2017 10:23:54 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ic754baf143f879f561c4d28c8eae3c8675ef9412 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtx11extras | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index dc4a29aa..4cb940c1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dc4a29aa578c1c00fc750d1f6882e45f09134b47 +Subproject commit 4cb940c170a5df68893e333b70212a6073ee6294 diff --git a/qtbase b/qtbase index 3ea09e44..28414f8e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3ea09e447487a26bf6c833dc0707a83844190777 +Subproject commit 28414f8e3a25f6ac913d14542866a7d1745b4df1 diff --git a/qtcharts b/qtcharts index 0168fe1f..f64bd909 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0168fe1f95d56850734447b118cdcf1847da1c51 +Subproject commit f64bd90920b80be63c318fed7613c87ff70cce1b diff --git a/qtdeclarative b/qtdeclarative index 34a545c2..b55aaa7b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 34a545c2ab821bbba5229df89f47719eb0219d92 +Subproject commit b55aaa7b94d6fc5841d624245d7b65ecfae592a0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 31d90e30..6dbc3715 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 31d90e308e46d644d74e9434ce31dd664677bc59 +Subproject commit 6dbc3715b9a496b91743d6ca3727178897d2af7e diff --git a/qtserialbus b/qtserialbus index bec0f13f..a7a49d05 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit bec0f13fa456d3b52deb6dbb7add5e81b7734fa4 +Subproject commit a7a49d057613e88aba3ca98a0d8e52805f7d5bcf diff --git a/qtx11extras b/qtx11extras index 9749c508..ec2c0f4d 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 9749c5085dc21d2064177aa748f3a9395592a7cf +Subproject commit ec2c0f4db6350a304dcf901b9adbadc895864c14 -- cgit v1.2.3 From d1dfb5767f1f199937abe5c46aba5219d667b21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 14 Aug 2017 13:39:37 +0300 Subject: Swap B2Qt branch to Morty Task-number: QTQAINFRA-1364 Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6 Reviewed-by: Jake Petroules --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qtdeclarative.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b3d564c5..b444d157 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 1cc88584..2a9d9ac7 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC DeveloperBuild -- cgit v1.2.3 From 84703103881f5cda1ec10720d551db9246519b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 28 Aug 2017 09:55:25 +0300 Subject: Provisioning: Add variables properly in .bashrc If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index acd0bd74..a6563ae5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -73,8 +73,8 @@ try sudo mkdir -p "$path" sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN - echo "export PATH=\"$opensslTargetLocation/bin:$PATH\"" >> ~/.bashrc - echo "export MANPATH=\"$opensslTargetLocation/share/man:$MANPATH\"" >> ~/.bashrc + echo "export PATH=\"$opensslTargetLocation/bin:\$PATH\"" >> ~/.bashrc + echo "export MANPATH=\"$opensslTargetLocation/share/man:\$MANPATH\"" >> ~/.bashrc security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate -- cgit v1.2.3 From 8c8be4816763db5a93aa14abc27d0f8047509aa1 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 7 Jul 2017 14:34:24 +0200 Subject: Prefer apt-get over apt in scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apt explicitly warns that it doesn't have a stable UI, so it shouldn't be used in scripts. This should have no implications in practice. Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 8b28c981..593b7c5b 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 @@ -46,42 +46,42 @@ 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 + sudo apt-get 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 + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install p7zip || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libssl-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -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 + sudo DEBIAN_FRONTEND=noninteractive apt-get -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 + sudo DEBIAN_FRONTEND=noninteractive apt-get -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 libxss-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -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 + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libmysqlclient-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libpq-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libsqlite3-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install unixodbc-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libfreetype6-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -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 + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libcups2-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -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 + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install g++-multilib || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT ) catch || { case $ex_code in -- cgit v1.2.3 From 42b502f7bcf39da693739b313495980a1440a08a Mon Sep 17 00:00:00 2001 From: Aapo Keskimolo Date: Tue, 29 Aug 2017 13:11:59 +0300 Subject: Add UploadConfigureExe feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We used to solve the requirement for uploading configure.exe from product version, but we can add this as a feature and remove the dependency to product version. Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 14 +++++++------- coin/platform_configs/qt5.txt | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ea6e259b..191e59d4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,16 +2,16 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic -qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation -qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index a24ffd9a..b9565ebe 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,15 +1,15 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 UploadConfigureExe +qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 UploadConfigureExe qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -- cgit v1.2.3 From 44cf10382c5586a326a0f2c60aff23ec5bc5cebc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 Sep 2017 11:05:20 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I8d2a3b3c53ef50f543e69d8824e2ec95939956aa Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qt3d b/qt3d index 142cc363..2e4acacf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 142cc363d7175c7cc9c7271154e12f7f23bfe514 +Subproject commit 2e4acacfa3a062b8585226500f6cbc65597b8b67 diff --git a/qtactiveqt b/qtactiveqt index f0274051..e3753542 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f02740515348339963af18ff795f7cdfb1b1f8cc +Subproject commit e3753542d00aaed7b9890064e7d7923d3b3bc9e1 diff --git a/qtbase b/qtbase index e81f430e..fc37e036 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e81f430e30635f975dd4635ffb64d66fc1bce355 +Subproject commit fc37e0369929e265db4fa3b9fa75164d63d66d1e diff --git a/qtcanvas3d b/qtcanvas3d index 25447e88..f19f1de5 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 25447e889dc43c0831100bee1625a6f667d364cf +Subproject commit f19f1de5124465f001181b494d788b6a6084157f diff --git a/qtconnectivity b/qtconnectivity index 94cc2b91..19e6a952 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4 +Subproject commit 19e6a952d9b736ae9e052d094f908946b4abebe3 diff --git a/qtdeclarative b/qtdeclarative index b4491c46..d031e8f7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b4491c46fd9754a1c799978529574037a55a55aa +Subproject commit d031e8f7b51a28a9c609f40a6245657f303277f2 diff --git a/qtdoc b/qtdoc index 48f7e029..7ec16b36 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 48f7e029923303fc313ca460a1a7d06fc2d04384 +Subproject commit 7ec16b36a793138f1d1891e96156a289af30149a diff --git a/qtimageformats b/qtimageformats index 144a3535..0d42a2e4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 144a3535db9f95e60972d3c3b6eaceb65a604577 +Subproject commit 0d42a2e44491980e6803d6aee6c7d2e83acadec4 diff --git a/qtlocation b/qtlocation index d22e6d09..1903bfab 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d22e6d09f1607e694694d2ae5b2f447605a8782e +Subproject commit 1903bfab5d5ceef6df247bbb19c7f7fac26f1edb diff --git a/qtmultimedia b/qtmultimedia index 343e281f..8b825866 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 343e281f0e7cc7fd9e1558e4d92f5019fa565181 +Subproject commit 8b8258665e4b6e85ca2e012722ad150320c03189 diff --git a/qtquickcontrols b/qtquickcontrols index 633c5642..843f1add 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 633c5642611234cf204569471598c3d3c083b84c +Subproject commit 843f1add60219171eb7deb6e9724f100284aab06 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 63f2f554..60eaf0f9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 63f2f55462f2f040cfe175ada8aa1e01168597fc +Subproject commit 60eaf0f9432697416abdc758e003c9ac44962324 diff --git a/qtscript b/qtscript index 86ee6173..caecbf64 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 86ee61734e0331459f9cfeb1ad56f773b7e994be +Subproject commit caecbf646c35b9f02ba744756fae2e8797f50e44 diff --git a/qtsensors b/qtsensors index 1673dbed..41897abf 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1673dbed00ba68209b6de95981f1e3b4a2a24682 +Subproject commit 41897abf76636a17d76fad7e1528d170b619e51a diff --git a/qtserialbus b/qtserialbus index 1d37c357..dc7c6943 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1d37c357c843a2622d2af7e1684576e19a8c7c30 +Subproject commit dc7c6943b8c2890bb3d4d8ca6f526d2d45075a45 diff --git a/qtserialport b/qtserialport index 93b53914..15d0472b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 93b539140c06da07d330c9ecad67ab5ed3f9b0c8 +Subproject commit 15d0472bde7a08b2f89b4361f3960486aca259bf diff --git a/qtspeech b/qtspeech index 6f577626..42590b06 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 6f5776269ed427725eae7d7fd8b091886f48220b +Subproject commit 42590b0679e9662960db06565a763780f7bf14f0 diff --git a/qttools b/qttools index 9a6dd30d..1c643431 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9a6dd30d0a71dfece28f4f0360f4e266ec386607 +Subproject commit 1c643431ae034853a7e0c46adf90a68ec7cbfc01 diff --git a/qtwayland b/qtwayland index a97b4f85..bde5619e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a97b4f8504cd4bccebed60934e5b842610454b39 +Subproject commit bde5619e2090efdc16823de21ff5cb76805204bd diff --git a/qtwebengine b/qtwebengine index a311b7bc..38f816a4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a311b7bc9d598c251b9beb1f712da9de62308be0 +Subproject commit 38f816a443a384aaaacc932de99bfdf30bcc469f diff --git a/qtwebsockets b/qtwebsockets index fb71c823..30de96f6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit fb71c823a7ae823345518ca33ccfe273fcf76494 +Subproject commit 30de96f6d7ef01c1c5887405a4ad49cf44a5ab79 diff --git a/qtx11extras b/qtx11extras index f65d50eb..90d5d612 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8 +Subproject commit 90d5d612bc7b3450a7a9d5c37c2de1d150f95182 diff --git a/qtxmlpatterns b/qtxmlpatterns index fcfa8244..7b67fba8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fcfa824402bb4edaf644fad786dac3560c743ebe +Subproject commit 7b67fba8bb21b06d423b68911b227fd1db22b1be -- cgit v1.2.3 From 4e1f4665c5ed631e18d2fa4910fd1a612b40539a Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Tue, 15 Aug 2017 12:12:22 +0300 Subject: Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries requires Windows 64bit machine. Linking requires more RAM than Windows 32bit can address. Change MSVC2013 & MSVC2015 integration host machines accordingly. Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 191e59d4..c41f3d7f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,11 +2,11 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe -qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86_64-8 x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation -- cgit v1.2.3 From dbf737a5c098ffe5c38413c2f289790d87ec6131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Mon, 4 Sep 2017 13:25:44 +0300 Subject: Fix Add-Path helper function and start using it in scripts This function was broken and only added the latest addition to the actual PATH. Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake.ps1 | 2 ++ coin/provisioning/common/helpers.ps1 | 4 +++- coin/provisioning/common/install-ruby.ps1 | 3 +-- coin/provisioning/common/python.ps1 | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 50e2e82c..8a94dc5d 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -53,5 +53,7 @@ if((Test-Path -Path "C:\CMake" )){ $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake +Add-Path "C:\CMake\bin" + echo "CMake = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 3f7f0a68..846f58a5 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -86,7 +86,9 @@ function Add-Path [string]$Path ) echo "Adding $Path to Path" - [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) } function is64bitWinHost diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 81b01342..57cf227f 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -55,7 +55,6 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Ruby22-x64\bin" echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 0be96eef..c3eba2d8 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -59,8 +59,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Python27;C:\Python27\Scripts" C:\Python27\python.exe -m ensurepip # Install python virtual env -- cgit v1.2.3 From a7b1b0035075b3a44e9e8e3801edf896501f6511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 4 Sep 2017 12:17:45 +0300 Subject: Provisioning: Hide powershell progress bar for performance Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613 Reviewed-by: Heikki Halmet --- coin/provisioning/common/helpers.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 846f58a5..b957603a 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -69,6 +69,7 @@ function Download [string] $CachedUrl = $(BadParam("the locally cached URL")), [string] $Destination = $(BadParam("a download target location")) ) + $ProgressPreference = 'SilentlyContinue' try { if ($CachedUrl.StartsWith("http")) { Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination -- cgit v1.2.3 From a3f4bf703b9d76b6aa8224240a017d006237f85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 25 Aug 2017 09:52:12 +0300 Subject: Provisioning: Fix helper function's mktemp in macOS 10.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that macOS 10.10 has a non standard mktemp command. It doesn't work as expected but prints usage and exit instead. Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh index b6072062..bee16dd2 100644 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -74,7 +74,12 @@ function InstallAppFromCompressedFileFromURL { echo "Extension for file: $extension" echo "Creating temporary file and directory" targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile - targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + # macOS 10.10 mktemp does require prefix + if [[ $OSTYPE == "darwin14" ]]; then + targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory + else + targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + fi DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" echo "Uncompress $targetFile" case $extension in -- cgit v1.2.3 From 73834c7166870bd4eb04bf58c4f8d6ec1b135ede Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 4 Sep 2017 17:38:58 +0200 Subject: Adjust submodule branches --- .gitmodules | 68 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9e391985..2acc9bf2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.6.3 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.6.3 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.6.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -75,7 +75,7 @@ serialize = qtwebengine path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.3 status = obsolete project = WebKit.pro priority = 20 @@ -83,7 +83,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.6.3 status = obsolete [submodule "qtqa"] depends = qtbase @@ -97,14 +97,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -137,130 +137,130 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6 + branch = 5.6.3 status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.3 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.6.3 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.3 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 + branch = 5.6.3 status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.6.3 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.6.3 status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 + branch = 5.6.3 status = preview [submodule "qtpurchasing"] depends = qtbase qtandroidextras -- cgit v1.2.3 From c48355ebb58cb058df5b2ca519b6b89fbd09f380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 5 Sep 2017 07:37:04 +0300 Subject: Provisioning: Fix DownloadURL utility's shasum check MacOS 10.10 has older shasum tool, which does not support oneliner verification. Change-Id: If00b846d5772aa1991960675d022249d63e7bd77 Reviewed-by: Simon Hausmann --- coin/provisioning/common/DownloadURL.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index 305f2675..a663b602 100644 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -70,7 +70,8 @@ function DownloadURL { esac } echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + echo "$expectedSha1 *$targetFile" > $targetFile.sha1 + /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { -- cgit v1.2.3 From 6dfd0c7b38e9df65647b42c71b57c176980dd088 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 9 Aug 2017 11:22:39 +0300 Subject: Use 64-bit host for VS2017 builds of QtWebKit Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589 Reviewed-by: Simon Hausmann Reviewed-by: Iikka Eklund Reviewed-by: Konstantin Tokarev --- coin/platform_configs/qtwebkit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index abc434de..7c8e8ac5 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -- cgit v1.2.3 From cc8a7501f329fbfefd1584f18ac7ff413e2d0854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 25 Aug 2017 10:11:58 +0300 Subject: Swap B2Qt branch to Pyro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1364 Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki Reviewed-by: Sami Nurmenniemi --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qtdeclarative.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b3d564c5..e0467131 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c8ac9c47..b9d5ecb0 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro x86_64 GCC DeveloperBuild -- cgit v1.2.3 From bcd7f921f85864f86ea1d83d34e851b3b7ef687e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Sep 2017 20:16:44 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I96537e757b58500804180cb579d4777e6abbfc96 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtquickcontrols | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index fc37e036..68b8f2d4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc37e0369929e265db4fa3b9fa75164d63d66d1e +Subproject commit 68b8f2d40858457f4c3433af1e700cef04e121bc diff --git a/qtcharts b/qtcharts index 5261307d..524229e3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5261307d061a2b925faffb6ea21aa3dbca1e50a9 +Subproject commit 524229e31d7f8141c3f91cdad2cffa36131d6789 diff --git a/qtdatavis3d b/qtdatavis3d index 3f8ae713..fdc983fb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f +Subproject commit fdc983fb3c4ad79cdba282d84a7d8c51ae740965 diff --git a/qtdeclarative b/qtdeclarative index d031e8f7..4dbb3c7b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d031e8f7b51a28a9c609f40a6245657f303277f2 +Subproject commit 4dbb3c7bc5829bcf699715157d3a82fb86f4ea5e diff --git a/qtdoc b/qtdoc index 7ec16b36..3d3899a3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7ec16b36a793138f1d1891e96156a289af30149a +Subproject commit 3d3899a36e261c99913830e879d15ac8996de60f diff --git a/qtgraphicaleffects b/qtgraphicaleffects index b6ff12df..5affaad9 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit b6ff12df5496f3d296bb438ae343d5f771e93fec +Subproject commit 5affaad97a8c2116fb53c6709ad09952a8989c89 diff --git a/qtlocation b/qtlocation index 1903bfab..8f80da7e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1903bfab5d5ceef6df247bbb19c7f7fac26f1edb +Subproject commit 8f80da7ea0165adb492c71255d0eea5f08c0af8e diff --git a/qtmacextras b/qtmacextras index cb8ec72a..ceb065d4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit cb8ec72ad6398e442d9a6182fd2f71274509f8d2 +Subproject commit ceb065d40dc9032dc27189393de9561b575b29f4 diff --git a/qtquickcontrols b/qtquickcontrols index 843f1add..33c5f4c3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 843f1add60219171eb7deb6e9724f100284aab06 +Subproject commit 33c5f4c3ad73fa2e75fe7ba69f5359e69adb212f diff --git a/qtserialbus b/qtserialbus index dc7c6943..9a720b4f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit dc7c6943b8c2890bb3d4d8ca6f526d2d45075a45 +Subproject commit 9a720b4fcc1d743db1b04f7696a30e7850c7707b diff --git a/qttools b/qttools index 1c643431..03855e3d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1c643431ae034853a7e0c46adf90a68ec7cbfc01 +Subproject commit 03855e3dc7f22df38c9e20572beb0828441c204c diff --git a/qtwebengine b/qtwebengine index 38f816a4..ad55613c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 38f816a443a384aaaacc932de99bfdf30bcc469f +Subproject commit ad55613c2648edb67353c3882d1956b54fc323b4 -- cgit v1.2.3 From 88525879919a3aa36d1753e8d4348201f2a44046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 12 Jun 2017 23:08:26 +0300 Subject: Provision openSUSE 42.3 and add to CI Replaces 42.1 that isn't supported anymore by openSUSE.org. Task-number: QTQAINFRA-1257 Task-number: QTQAINFRA-1259 Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01 Reviewed-by: Simon Hausmann Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- .../qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh | 9 ----- .../qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh | 1 - .../001-systemsetup.sh | 13 ++++++ .../002-zypperpackages.sh | 46 ++++++++++++++++++++++ .../008-pythondev.sh | 8 ++++ .../qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 + .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 9 +++++ 8 files changed, 78 insertions(+), 11 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b444d157..63c54671 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -9,7 +9,7 @@ qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation -qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch +qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh deleted file mode 100755 index abbda212..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -. $BASEDIR/../common/sw_versions.txt -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" - -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh deleted file mode 100644 index d7abd285..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh new file mode 100755 index 00000000..4b2f2546 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +BASEDIR=$(dirname "$0") +source $BASEDIR/../common/network_test_server_ip.txt + +sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh new file mode 100755 index 00000000..1f6b9070 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -0,0 +1,46 @@ +#!/bin/bash +set -e + +sudo zypper -nq install git +# default compiler, gcc 4.8.5 +sudo zypper -nq install gcc +sudo zypper -nq install gcc-c++ + +sudo zypper -nq install bison +sudo zypper -nq install flex +sudo zypper -nq install gperf + +sudo zypper -nq install zlib-devel +sudo zypper -nq install libudev-devel +sudo zypper -nq install glib2-devel +sudo zypper -nq install libopenssl-devel +sudo zypper -nq install freetype2-devel +sudo zypper -nq install fontconfig-devel + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel +sudo zypper -nq install Mesa-libGL-devel + +sudo zypper -nq install libxkbcommon-devel + +# Xinput2 +sudo zypper -nq install libXi-devel + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel +sudo zypper -nq install xcb-util-image-devel +sudo zypper -nq install xcb-util-keysyms-devel +sudo zypper -nq install xcb-util-wm-devel +sudo zypper -nq install xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel +sudo zypper -nq install libicu52_1 + +# qtwebengine +sudo zypper -nq install alsa-devel +sudo zypper -nq install dbus-1-devel +sudo zypper -nq install libXcomposite-devel +sudo zypper -nq install libXcursor-devel +sudo zypper -nq install libXrandr-devel +sudo zypper -nq install libXtst-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh new file mode 100755 index 00000000..d8874561 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo zypper -nq install python-devel python-virtualenv + +# install python3 +sudo zypper -nq install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh new file mode 100755 index 00000000..d7abd285 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -0,0 +1 @@ +$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh new file mode 100755 index 00000000..abbda212 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/sw_versions.txt +VERSION=$libclang_version +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +SHA1="bbdbbc0296f42310077539b7247d285386119ef4" + +$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" -- cgit v1.2.3 From 88d718d38163504086c643abf66ad19bff8e0d67 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Sep 2017 19:10:15 +0300 Subject: Update submodules on '5.6.3' in qt5 Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73 Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index dfb9f2cf..61631013 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit dfb9f2cfd658860f69dd55363122a7c2c56b88fb +Subproject commit 6163101324d9bd7cef59c98efd584f7fd6b6230c diff --git a/qtbase b/qtbase index 40ca27e0..e6f8b072 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 40ca27e0d2107fd97b01bfb201cff408f7c5a0c3 +Subproject commit e6f8b072d2bf15f8b82bede48ff29ce8ac8dbd9a diff --git a/qtcanvas3d b/qtcanvas3d index 61804e56..8bbd8329 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 61804e56b82330fac0f29beec0e56262233467bb +Subproject commit 8bbd832997841927e0d8a433f4ec20c82cdea203 diff --git a/qtconnectivity b/qtconnectivity index f7bfd2ad..12b5e352 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f7bfd2adb82e3a8797e168a37287510e4a004b2e +Subproject commit 12b5e352c312a88518d6db34673350a70cd53616 diff --git a/qtdeclarative b/qtdeclarative index f724b538..6eaaedc6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f724b5380c911fbc841ff8ed4831dccd37fff6e9 +Subproject commit 6eaaedc646bc6d7d4dc97274c776abab9b54008f diff --git a/qtdoc b/qtdoc index 27f88300..c46e1a02 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 27f883002b9fba6e5bbcbc84ad0d366fb8149808 +Subproject commit c46e1a02eefb6b4050ef0cbb4190d086813da315 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 4dc734d8..bf13dd5c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 4dc734d85f59e3a16a50a9d7ffebc7aa304f5243 +Subproject commit bf13dd5ca02d861c3a554743948c939a339d5061 diff --git a/qtimageformats b/qtimageformats index b6ffd71e..a7a998ee 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b6ffd71e2315e699d4ad32859cf36c67635820e7 +Subproject commit a7a998ee6e328babaa0edfee0d156fb28cf1b385 diff --git a/qtlocation b/qtlocation index 0a389325..35348e80 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a38932510ffaad5387b7e86c7ca70aed8af5c5b +Subproject commit 35348e80145305778a89923d3bfe50d7baba7690 diff --git a/qtmacextras b/qtmacextras index 9e98d9a6..5aea5928 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 9e98d9a6f56d1076ec9438b2b22f46ed0798273a +Subproject commit 5aea592832ad6380b3eab91790b147b22cfdb922 diff --git a/qtmultimedia b/qtmultimedia index 6d494812..4dd780a8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d4948122063b651948a5c4db2197d633d7e96c4 +Subproject commit 4dd780a81e886a8a5eb86d1a045716ac4194eba1 diff --git a/qtquickcontrols b/qtquickcontrols index 9fc3fcb5..b66f6b05 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 9fc3fcb5a827196dee8c7afbd70a4c2361c65107 +Subproject commit b66f6b05c5f8024ddd9f8c46f33ccb618323999e diff --git a/qtsensors b/qtsensors index 12b98b6f..099b3a74 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 12b98b6ff70a18c27f543dda029e75c197d8cbc5 +Subproject commit 099b3a7442a553aedf4d5bb8955dabcae4dae66c diff --git a/qtserialbus b/qtserialbus index f5b1c3a3..21616f7b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f5b1c3a32b2a7c9bc06b68c469981ae46fb7172e +Subproject commit 21616f7bc1e7325d2cb04403388b8fdaeea99e21 diff --git a/qtserialport b/qtserialport index 9e4b9d27..2f7b2533 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9e4b9d276f0de2d298da4ffdf6f15a9960402194 +Subproject commit 2f7b2533b323644289c60370f68492aea6b1a625 diff --git a/qttools b/qttools index 705d06c2..56dbabb7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 705d06c2841ef5d9ebda954c112fc8f1e32ec2cb +Subproject commit 56dbabb7a64a4d416e8cf7b61e068208fd032355 diff --git a/qtwayland b/qtwayland index d6f7bb39..70575643 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d6f7bb39e71777ce5568d462841caccc17f3a205 +Subproject commit 70575643cfece4f0aca4b40e77ac5d7c0e8042a2 diff --git a/qtwebchannel b/qtwebchannel index 64306392..065afc22 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 64306392ce3a7751bfb58e1352b212ad5cba8aec +Subproject commit 065afc22e9cc61364968aafc74ff2ca4524fab56 diff --git a/qtwebengine b/qtwebengine index 04fa812e..fad625e0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 04fa812ef5025aa991d9a79dd26e9ecfcb3182a1 +Subproject commit fad625e0ba39e855817bbf206ab9a846d07aeeec diff --git a/qtwebsockets b/qtwebsockets index d3032491..65e71304 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d3032491971e1cee8f1171f16b8e6d3d2fa42eed +Subproject commit 65e7130466963e0fd9cee8719d8b37c9fb15db35 diff --git a/qtwebview b/qtwebview index d3994169..6d9a88e3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d39941695dbc10b06188580b675f2b7c337ca505 +Subproject commit 6d9a88e3048e230a3ee516c39bf55f714117869c diff --git a/qtx11extras b/qtx11extras index 25e20a72..e33fc10f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 25e20a724f411f6e07cd3dc9f4870298a308c2c3 +Subproject commit e33fc10fa49da17b297c53e44d109dc4d24c974a diff --git a/qtxmlpatterns b/qtxmlpatterns index 0533f8ba..50582280 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0533f8ba47f57da5d7363c2c00cf0b239ce72888 +Subproject commit 50582280b10fb1962b3bdfdd06a72ae1e0325049 -- cgit v1.2.3 From fba2c6f4dd96d590248827df9c9ca7b844c814a3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Sep 2017 12:38:34 +0300 Subject: Update submodules on '5.6.3' in qt5 Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70 Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index 6eaaedc6..cf3b1bbd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6eaaedc646bc6d7d4dc97274c776abab9b54008f +Subproject commit cf3b1bbd9ee048a28b58a55d76504b1c01e34811 -- cgit v1.2.3 From 92d1bdcb43e988919bfdcb91c0e6f366bed07145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 7 Sep 2017 12:07:25 +0300 Subject: Provisioning: Fix shasum path Commit c48355ebb58cb058df5b2ca519b6b89fbd09f380 changed the path of shasum, which was not intended. While the DownloadURL.sh utility is used by rhel in addition to macOS we can't rely on /usr/bin/shasum but we have to use the one found from PATH. Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9 Reviewed-by: Simon Hausmann --- coin/provisioning/common/DownloadURL.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index a663b602..c60fae21 100644 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -71,7 +71,7 @@ function DownloadURL { } echo "Checking SHA1 on PKG '$targetFile'" echo "$expectedSha1 *$targetFile" > $targetFile.sha1 - /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1 + shasum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { -- cgit v1.2.3 From eb89f13583793a168222633cd0a6a3438ac5fe0b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Sep 2017 03:01:13 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ic0236346284e3b30012977f634f52d8aa3851d24 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index 4cb940c1..8a4b9eba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4cb940c170a5df68893e333b70212a6073ee6294 +Subproject commit 8a4b9ebadb9e63ae367694f04786c7faf6306f27 diff --git a/qtbase b/qtbase index 28414f8e..037652d7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28414f8e3a25f6ac913d14542866a7d1745b4df1 +Subproject commit 037652d7a258535bd92e6950ff46398e2e74e728 diff --git a/qtcanvas3d b/qtcanvas3d index 3241a817..5be124d7 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 3241a817e0c25da7ee682c8274d859757eeb5839 +Subproject commit 5be124d7373c36daf9a6c01712e6eab057bbf56d diff --git a/qtcharts b/qtcharts index f64bd909..c245b25d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f64bd90920b80be63c318fed7613c87ff70cce1b +Subproject commit c245b25dd2ed8b9e141ac85b77f58d3522815823 diff --git a/qtconnectivity b/qtconnectivity index c3c3837b..ed5a1134 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c3c3837b02919a26031d917003898e72585e300b +Subproject commit ed5a1134d50f6dbed3fc568c799a39f4e2338056 diff --git a/qtdeclarative b/qtdeclarative index b55aaa7b..00adacd7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b55aaa7b94d6fc5841d624245d7b65ecfae592a0 +Subproject commit 00adacd7934d7553eaea7c6d2b43bcb3df439e3e diff --git a/qtdoc b/qtdoc index cb40f264..6bed42d8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cb40f264a6796d8d28101de3241b96a3e09b45dc +Subproject commit 6bed42d813833dcb8e6d172a123e302c042b4402 diff --git a/qtlocation b/qtlocation index b68b8837..3f2c6d8a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b68b88373beb884c77ec9813cac1e9a79854b957 +Subproject commit 3f2c6d8af0367c5e87eb38d348c99e2e2a2f0a76 diff --git a/qtmultimedia b/qtmultimedia index c341b2b2..230f070c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c341b2b25697f937280fe3620629ac3d32c19613 +Subproject commit 230f070c7ed353605260f9fa79d0a5bc5181321c diff --git a/qtnetworkauth b/qtnetworkauth index 461a29be..4e681472 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 461a29be564271ef3a6ca1728f5e48ec2d25c08d +Subproject commit 4e681472f6e25153745151f2b41a8ebf4bc94f54 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6dbc3715..bc6e79eb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6dbc3715b9a496b91743d6ca3727178897d2af7e +Subproject commit bc6e79ebab8f7556aa2c7cd4352ba24509bd4792 diff --git a/qtserialbus b/qtserialbus index a7a49d05..b2e4e7a4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a7a49d057613e88aba3ca98a0d8e52805f7d5bcf +Subproject commit b2e4e7a49990a68915820df525680b9c70971527 diff --git a/qtspeech b/qtspeech index b8b86799..cb10801e 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b8b8679996cd017670d2c80affdb3375f0f684c0 +Subproject commit cb10801ee7ea27d2296767ee24cbb048a7db5441 diff --git a/qttools b/qttools index 8492e448..1ace238c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8492e448666931a33d53a52df31ac2fd796239a5 +Subproject commit 1ace238ce0347857a5ba55d6fa30ba81fed204b9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f504a96c..1f72424b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f504a96c268d10efcbe0597ae529a467b20d8eb8 +Subproject commit 1f72424b80ac1b84b4f040f195d74d9f2b646a62 diff --git a/qtwayland b/qtwayland index e99dae74..1e6063f6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e99dae74353e5652794d7bcbcd3d79b1478debbc +Subproject commit 1e6063f6fc9fa02bd2f12ad9e60cbc2529fc0377 diff --git a/qtwebengine b/qtwebengine index 647307f5..f32b3514 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 647307f534d45758832f23912ed281af819f0174 +Subproject commit f32b3514a5186bc4f5452f004324bdb7782d30a3 -- cgit v1.2.3 From a1f173fc67587062a3e777c05131611b228f38e3 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 30 Aug 2017 10:22:34 +0200 Subject: Provisioning: Install paho mqtt broker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The paho broker is used for testing the Qt Mqtt module, specifically the client classes. Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/mqtt_broker.ps1 | 50 +++++++++++++++++++++ coin/provisioning/common/mqtt_broker.sh | 51 ++++++++++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-windows-10-x86/mqtt_broker.ps1 | 1 + .../qtci-windows-10-x86_64/mqtt_broker.ps1 | 1 + .../qtci-windows-7-x86/mqtt_broker.ps1 | 1 + .../qtci-windows-8-x86/mqtt_broker.ps1 | 1 + .../qtci-windows-8-x86_64/mqtt_broker.ps1 | 1 + .../qtci-windows-8.1-x86_64/mqtt_broker.ps1 | 1 + 14 files changed, 323 insertions(+) create mode 100644 coin/provisioning/common/mqtt_broker.ps1 create mode 100644 coin/provisioning/common/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 diff --git a/coin/provisioning/common/mqtt_broker.ps1 b/coin/provisioning/common/mqtt_broker.ps1 new file mode 100644 index 00000000..610f22d8 --- /dev/null +++ b/coin/provisioning/common/mqtt_broker.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +echo "MQTT: Downloading Paho test broker..." +$zip = "c:\users\qt\downloads\pahotest.zip" +$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$sha1 = "532fe145096cdd8d679f425cbfd883289150c968" + +Download $externalUrl $internalUrl $zip +Verify-Checksum $zip $sha1 + +echo "MQTT: Installing $zip..." +Extract-Zip $zip C:\Utils +Remove-Item $zip + +echo "MQTT: Updating environment..." +[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine") diff --git a/coin/provisioning/common/mqtt_broker.sh b/coin/provisioning/common/mqtt_broker.sh new file mode 100644 index 00000000..7c316de2 --- /dev/null +++ b/coin/provisioning/common/mqtt_broker.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 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 paho testing broker + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" +PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" +AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +SHA1="532fe145096cdd8d679f425cbfd883289150c968" +targetFolder="/opt/paho_broker" +appPrefix="paho.mqtt.testing-$CommitSHA" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding MQTT broker path to environment" +echo "export MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" -- cgit v1.2.3 From b6e6882bb7c82a9f4cf702dfd39f0a0ff4a5087f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 11 Sep 2017 13:54:57 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index 2e4acacf..837a56fa 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2e4acacfa3a062b8585226500f6cbc65597b8b67 +Subproject commit 837a56fa10b26f129cb0a70caaff9f84e00a3acb diff --git a/qtandroidextras b/qtandroidextras index a511c605..9f70e4b1 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a511c60514d7cc0ff876d13fa4a3800c7e25cbfc +Subproject commit 9f70e4b12b7eaac3f6f727f6d3189779794342f4 diff --git a/qtbase b/qtbase index 68b8f2d4..689606de 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 68b8f2d40858457f4c3433af1e700cef04e121bc +Subproject commit 689606de91faecf91f1f92e8d355789d9be62d2f diff --git a/qtconnectivity b/qtconnectivity index 19e6a952..ae21b257 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 19e6a952d9b736ae9e052d094f908946b4abebe3 +Subproject commit ae21b2574c0000aac6e3b10f7e11ebd1da567ffd diff --git a/qtdatavis3d b/qtdatavis3d index fdc983fb..82f9c8a5 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fdc983fb3c4ad79cdba282d84a7d8c51ae740965 +Subproject commit 82f9c8a5a246845c746f0a8b3497dceba19ff05b diff --git a/qtdeclarative b/qtdeclarative index 4dbb3c7b..286d72e4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4dbb3c7bc5829bcf699715157d3a82fb86f4ea5e +Subproject commit 286d72e458c10bae3ce11c58a16352a53ba06aef diff --git a/qtlocation b/qtlocation index 8f80da7e..f09e5fb2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8f80da7ea0165adb492c71255d0eea5f08c0af8e +Subproject commit f09e5fb2eaba4a3d3f131fa4a4392ec49d02af0d diff --git a/qtmultimedia b/qtmultimedia index 8b825866..500552d1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8b8258665e4b6e85ca2e012722ad150320c03189 +Subproject commit 500552d11bc5ca2e762875019a15b02d451de1f6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 60eaf0f9..dc398182 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 60eaf0f9432697416abdc758e003c9ac44962324 +Subproject commit dc39818207439a62a97179b8d2ad22ef49521148 diff --git a/qtscript b/qtscript index caecbf64..08b74f4f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit caecbf646c35b9f02ba744756fae2e8797f50e44 +Subproject commit 08b74f4f30c304b80249a593a572808bc1892f66 diff --git a/qtserialport b/qtserialport index 15d0472b..2a828454 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 15d0472bde7a08b2f89b4361f3960486aca259bf +Subproject commit 2a8284543018943ab581202cf934c751a22db6c7 diff --git a/qtspeech b/qtspeech index 42590b06..5393b76f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 42590b0679e9662960db06565a763780f7bf14f0 +Subproject commit 5393b76f3780b0be33cc727458993223605e5ab1 diff --git a/qttools b/qttools index 03855e3d..56026959 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 03855e3dc7f22df38c9e20572beb0828441c204c +Subproject commit 560269593ba6642e6cb7915a64853a4457f4afe8 diff --git a/qtwayland b/qtwayland index bde5619e..3f400e31 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bde5619e2090efdc16823de21ff5cb76805204bd +Subproject commit 3f400e31fecd1c0436ad17d1be1dae7745c6a4f5 diff --git a/qtwebchannel b/qtwebchannel index 228184f9..dd04d747 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 228184f93b4d39e1aca9e53fde8e576f71b90c93 +Subproject commit dd04d74769e1859d571de7c4f2e88cb85a227ab9 diff --git a/qtwebengine b/qtwebengine index ad55613c..f6dc11e9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ad55613c2648edb67353c3882d1956b54fc323b4 +Subproject commit f6dc11e9b589ae80a6665424b94c5e23567ea9d6 diff --git a/qtwebview b/qtwebview index e4016a67..01ff5c0d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e4016a67bbffefed71a407494e249e978d212b3d +Subproject commit 01ff5c0d5f937577cfd2391a43af4180f2a484bb -- cgit v1.2.3 From 528580bbcd2a2cd432a22efd6a7209c56c4fbb3e Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 2 May 2017 11:34:30 +0200 Subject: Install python3 on all platforms This forward-ports commit a99d3432f71c4be5045ae2cdcc3b7070de5abe23 to 5.9, which should have been done in 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb but accidentally left out. It reuses parts of commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74 that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 15 ++++++++++++++- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 8 ++++++++ coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh index ad1bf18f..ff25f463 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -1,5 +1,18 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside -sudo subscription-manager refresh sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +sudo rpm -Uvh epel-release-latest-7.noarch.rpm +sudo rm -f epel-release-latest-7.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv 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 593b7c5b..f07be55a 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 @@ -82,6 +82,8 @@ try sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + # python3 development package + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh new file mode 100644 index 00000000..254b738d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" -- cgit v1.2.3 From b1c268a8eb91eea35bf7592d24de0745c309f693 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 12 Sep 2017 10:32:14 +0200 Subject: Build examples also on Linux with namespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change we get coverage for namespace related build breakages in examples of Linux-only modules, such as wayland. Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c Reviewed-by: Tony Sarajärvi Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- 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 63c54671..acfeba93 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker -- cgit v1.2.3 From 3e9b7b16c97980a78697a7dd9de596163cc847e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Sep 2017 21:44:31 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I155cd4eccb5b298f93fe36437b9db450d6e23a6d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 8a4b9eba..3f03499b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8a4b9ebadb9e63ae367694f04786c7faf6306f27 +Subproject commit 3f03499bf8a7cf3c3f8d19a020179c1205980bde diff --git a/qtbase b/qtbase index 037652d7..ad8a48e8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 037652d7a258535bd92e6950ff46398e2e74e728 +Subproject commit ad8a48e8f1b336099eab2a00c1c1e59abad8e717 diff --git a/qtdeclarative b/qtdeclarative index 00adacd7..7236b0df 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 00adacd7934d7553eaea7c6d2b43bcb3df439e3e +Subproject commit 7236b0dfdb9ae805f4ba595def2b696859aa3613 diff --git a/qtlocation b/qtlocation index 3f2c6d8a..a0c7b93d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3f2c6d8af0367c5e87eb38d348c99e2e2a2f0a76 +Subproject commit a0c7b93df620d9254aef3136da08adbc70752837 diff --git a/qtquickcontrols b/qtquickcontrols index caa38d21..67906d61 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit caa38d217ecbcaaa5617255290598012477c4492 +Subproject commit 67906d61c6f786dbbced67becc25e1a396f3183c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bc6e79eb..79057479 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bc6e79ebab8f7556aa2c7cd4352ba24509bd4792 +Subproject commit 790574795b22609a04c5dea71003c5f53fa15766 diff --git a/qttools b/qttools index 1ace238c..4cb8667d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1ace238ce0347857a5ba55d6fa30ba81fed204b9 +Subproject commit 4cb8667d20ff9f4af1451c54560ea864630f49b9 diff --git a/qtwebengine b/qtwebengine index f32b3514..6bc675d8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f32b3514a5186bc4f5452f004324bdb7782d30a3 +Subproject commit 6bc675d8a7f89cb8c1ce4fc48dfeedcc8028c76f -- cgit v1.2.3 From 4b0e2f79c1e7fc8b09a9ea61c78e92581e070c3f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 12 Sep 2017 14:40:34 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 837a56fa..cd467d5f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 837a56fa10b26f129cb0a70caaff9f84e00a3acb +Subproject commit cd467d5ffc6eaaa7da089ab4acc5284cd11d1109 diff --git a/qtbase b/qtbase index 689606de..10601aa7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 689606de91faecf91f1f92e8d355789d9be62d2f +Subproject commit 10601aa7d2aea597ae5127ef83cea3c7549d5712 diff --git a/qtdeclarative b/qtdeclarative index 286d72e4..78d574a9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 286d72e458c10bae3ce11c58a16352a53ba06aef +Subproject commit 78d574a909a4bcf7543fba8d921e8658dfbc0200 diff --git a/qtlocation b/qtlocation index f09e5fb2..b13ff055 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f09e5fb2eaba4a3d3f131fa4a4392ec49d02af0d +Subproject commit b13ff055eb64970f545ba590735a38652de7689b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc398182..d3aef722 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc39818207439a62a97179b8d2ad22ef49521148 +Subproject commit d3aef722da533c3b100ba653498c79986a44c9f9 diff --git a/qtscxml b/qtscxml index a1dff1a1..16956a96 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a1dff1a11ad303a1f82f181e6386194de90ec08f +Subproject commit 16956a965817311fbc9d80ffbee74eb5d9ea00e0 diff --git a/qtwayland b/qtwayland index 3f400e31..8828bf4d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3f400e31fecd1c0436ad17d1be1dae7745c6a4f5 +Subproject commit 8828bf4dbeb90e479b3b461905f974774d6e20a4 diff --git a/qtwebengine b/qtwebengine index f6dc11e9..e409cfca 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f6dc11e9b589ae80a6665424b94c5e23567ea9d6 +Subproject commit e409cfca1765aad5f6cc09c0e0ebd019dd5b37e2 -- cgit v1.2.3 From b38e4732af6a0a880d5ba73bce218ed07a58d823 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 12 Sep 2017 13:08:04 +0300 Subject: Update submodules on '5.6.3' in qt5 Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc Reviewed-by: Jani Heikkinen --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index cf3b1bbd..bb01612a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cf3b1bbd9ee048a28b58a55d76504b1c01e34811 +Subproject commit bb01612a8809efd268903e41b9e3a17cff48f1c0 -- cgit v1.2.3 From a9cf936a6304550b923bd325d05bdb209ca82371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 12 Sep 2017 10:20:38 +0300 Subject: Provision: Move Python3 scripts from win8 to win8.1 folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c Reviewed-by: Dominik Holland Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/python3.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/python3.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/python3.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/python3.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 deleted file mode 100644 index ad3d5950..00000000 --- a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8-x86/python3.ps1 deleted file mode 100644 index 164fbe43..00000000 --- a/coin/provisioning/qtci-windows-8-x86/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 deleted file mode 100644 index 6070c80b..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 deleted file mode 100644 index b0c21996..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..6070c80b --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 -- cgit v1.2.3 From 892833cda910143a8cfd73062c90c8ac080dd8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 4 Sep 2017 12:49:20 +0300 Subject: Provisioning: Invoke installer with Start-Process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By launching an installer with Start-Process and -Wait, we make sure no handles are left holding on to the installer when we try to delete it at cleanup. Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/vc_redist.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 index 95567669..4213dde9 100644 --- a/coin/provisioning/common/vc_redist.ps1 +++ b/coin/provisioning/common/vc_redist.ps1 @@ -59,6 +59,6 @@ echo "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 echo "Installing $package..." -cmd /c "$package /q" +Start-Process -FilePath $package -ArgumentList "/q" -Wait echo "Remove $package..." del $package -- cgit v1.2.3 From 2a5f54d07e9e935a0c86a0d3fdcf223dd0863f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 29 Aug 2017 09:31:43 +0300 Subject: provisioning: install MinGW 530 and 630 for Win10 x64 MinGW is an alternative option for Visual Studio. It's used to create desktop builds and for cross compiling Android and QNX. At this point it is still unclear which version is going to be used for what, but as both are supported, let's think ahead and provide them both. This also allows us to debug with the other, if the other is causing problems. Task-number: QTQAINFRA-1289 Change-Id: I2a922669c07d49370e608c093be80481c8613dc7 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/install-mingw.ps1 | 26 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/09-install-mingw530.ps1 | 10 +++++++++ .../qtci-windows-10-x86_64/09-install-mingw630.ps1 | 8 +++++++ 3 files changed, 44 insertions(+) create mode 100644 coin/provisioning/common/install-mingw.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 new file mode 100644 index 00000000..fc02631d --- /dev/null +++ b/coin/provisioning/common/install-mingw.ps1 @@ -0,0 +1,26 @@ +function InstallMinGW +{ + Param ( + [string] $version = $(BadParam("the version being printed to versions.txt")), + [string] $release = $(BadParam("release part of the file name")) + ) + + $envvar = "MINGW$version" + $envvar = $envvar -replace '["."]' + $targetdir = "C:\$envvar" + $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z" + + $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" + Copy-Item $url_cache $mingwPackage + + Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} + + echo "Adding MinGW environment variable." + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + + echo "Cleaning $mingwPackage.." + Remove-Item -Recurse -Force "$mingwPackage" + + echo "MinGW = $version $release" >> ~\versions.txt + +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 new file mode 100644 index 00000000..ded894a5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 5.3.0 + +$version = "5.3.0" +$release = "release-posix-dwarf-rt_v4-rev0" + +InstallMinGW $version $release + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 new file mode 100644 index 00000000..a2710760 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -0,0 +1,8 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 6.3.0 + +$version = "6.3.0" +$release = "release-posix-dwarf-rt_v5-rev2" + +InstallMinGW $version $release -- cgit v1.2.3 From b0a9259c6ee24673fc5579ba33063e9a7619a3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 25 Aug 2017 11:32:34 +0300 Subject: Provision and build QNX660 on Win 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes the mingw from 4.9 to 5.3. Task-number: QTQAINFRA-1208 Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905 Reviewed-by: Sami Nurmenniemi Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 2 + coin/provisioning/common/install-qnx660.ps1 | 46 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/030-qnx660.ps1 | 1 + 3 files changed, 49 insertions(+) create mode 100644 coin/provisioning/common/install-qnx660.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index b9565ebe..92d55b1f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,6 +9,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packagin qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-7 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-7 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1 new file mode 100644 index 00000000..bf9c9d09 --- /dev/null +++ b/coin/provisioning/common/install-qnx660.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## 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" + +# This script will install QNX 6.6.0 + +$version = "6.6.0" +$nondottedversion = $version -replace '[.]','' +$targetFolder = "c:" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" + +Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} + +[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") +echo "QNX = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 new file mode 100644 index 00000000..39627626 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-qnx660.ps1" -- cgit v1.2.3 From fd76acc661003f7ad48c5c87ffe4e51b6f8f72e9 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 14 Sep 2017 16:38:41 +0200 Subject: Add mqtt to qtci-linux-openSUSE-42.3-x86_64 MQTT provisioning happened concurrently with an OpenSUSE update. Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998 Reviewed-by: Simon Hausmann --- .../qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh | 36 ---------------------- .../qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh | 36 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh deleted file mode 100644 index e367c20b..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" -- cgit v1.2.3 From 12fd0d5b9b486eaf80712d390265402a3bb06f0e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Sep 2017 10:26:29 +0300 Subject: Ensure 'clean' android Installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 7c3220ee..c278a2ce 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -87,7 +87,13 @@ function InstallAndroidPackage { sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir "$targetFolder" +if [ -d "$targetFolder" ]; then + echo "Removing old Android installation" + sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; ) +fi + +sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; ) + # Install Android SDK echo "Installing Android SDK version $sdkPackage..." InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName -- cgit v1.2.3 From b7d943171669a0dfc7c891716ee264f731e9f899 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 15 Sep 2017 10:22:24 +0200 Subject: Fix python installation on OpenSuSE 42.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The move was forgotten in commit dd3d32d13cf03a9e6ca661408b7995e8493c6af4 that merged the 42.1 to 42.3 switch from the 5.9 branch. Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab Reviewed-by: Dominik Holland Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh | 8 -------- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh deleted file mode 100644 index 0b42d5a1..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh +++ /dev/null @@ -1,8 +0,0 @@ -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -sudo pkcon -y refresh -sudo pkcon -y install python-devel python-virtualenv - -# install python3 -sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh new file mode 100644 index 00000000..0b42d5a1 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-virtualenv -- cgit v1.2.3 From 57043fb07bfc30e2f045c2c4ce2cd18fb2a64e48 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 15 Sep 2017 13:38:26 +0200 Subject: Clean up QNX patching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches from ci-files01 instead. Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f Reviewed-by: Simo Fält --- coin/provisioning/common/patch_qnx.ps1 | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 index 2fca7b67..632859a0 100644 --- a/coin/provisioning/common/patch_qnx.ps1 +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" $tempDir = "C:\temp\qnx_path" -Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip Verify-Checksum $zip $sha1 Extract-Zip $zip $tempDir Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh index 19993ecc..ad5c90d3 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -60,5 +60,5 @@ function InstallZipPackageFromURL { echo "Patching QNX" -baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" -- cgit v1.2.3 From f02c2e2fdeb3777a065f0d0a7d3c486efc648c87 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 17 Sep 2017 03:00:53 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ia67db183b40e1bec41677876f7c8c4c4e69f30d9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index ad8a48e8..c23c4a92 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ad8a48e8f1b336099eab2a00c1c1e59abad8e717 +Subproject commit c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 diff --git a/qtcharts b/qtcharts index c245b25d..cd871667 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c245b25dd2ed8b9e141ac85b77f58d3522815823 +Subproject commit cd8716678cf0cf2c9678edf4531a76cc00c7f828 diff --git a/qtdeclarative b/qtdeclarative index 7236b0df..2aba6e35 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7236b0dfdb9ae805f4ba595def2b696859aa3613 +Subproject commit 2aba6e35dc6f1534a764690382ca56b6cf099185 diff --git a/qtqa b/qtqa index b6dbaed8..cdfda1b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b6dbaed8d73ded89d28b1ffd41dacb97a0b62b1c +Subproject commit cdfda1b40ac125bc5639582b0cea05d68e7b6993 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 79057479..7cbf3685 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 790574795b22609a04c5dea71003c5f53fa15766 +Subproject commit 7cbf3685565d7f62c9a01b090a4c1600b4abe220 diff --git a/qtwebengine b/qtwebengine index 6bc675d8..6d7df67a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6bc675d8a7f89cb8c1ce4fc48dfeedcc8028c76f +Subproject commit 6d7df67a75ce1a71c1a248d56dfbfab1d9225980 -- cgit v1.2.3 From 6dd41c84067a213fa98d9b59aed2601a982bf665 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Sep 2017 07:44:31 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index cd467d5f..75697d59 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cd467d5ffc6eaaa7da089ab4acc5284cd11d1109 +Subproject commit 75697d59cb6e3783bd1444816cfc90b4bc8b9aba diff --git a/qtbase b/qtbase index 10601aa7..81a19050 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 10601aa7d2aea597ae5127ef83cea3c7549d5712 +Subproject commit 81a19050d8127e7b05006f793a8797c8f5248191 diff --git a/qtcharts b/qtcharts index 524229e3..f2aaf5f3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 524229e31d7f8141c3f91cdad2cffa36131d6789 +Subproject commit f2aaf5f3b528f954c4ff7b3e6a79acae157cec5e diff --git a/qtdeclarative b/qtdeclarative index 78d574a9..bfab1db3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 78d574a909a4bcf7543fba8d921e8658dfbc0200 +Subproject commit bfab1db38167d31f0487f96d2d4b02d9243bc777 diff --git a/qtlocation b/qtlocation index b13ff055..eb381288 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b13ff055eb64970f545ba590735a38652de7689b +Subproject commit eb3812884d63ffc014f4ac76214e65a6497ae827 diff --git a/qtmultimedia b/qtmultimedia index 500552d1..d41bce99 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 500552d11bc5ca2e762875019a15b02d451de1f6 +Subproject commit d41bce99a531a7968f8c5bc8ec88965372341bd9 diff --git a/qtqa b/qtqa index b6dbaed8..cdfda1b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b6dbaed8d73ded89d28b1ffd41dacb97a0b62b1c +Subproject commit cdfda1b40ac125bc5639582b0cea05d68e7b6993 diff --git a/qttools b/qttools index 56026959..fce89784 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 560269593ba6642e6cb7915a64853a4457f4afe8 +Subproject commit fce8978426b9dbad8ea60412ba34d855a9c90a24 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index dd8c39ea..f3683d17 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit dd8c39ea9312ec1441b3fdd830f9d42fe3258b58 +Subproject commit f3683d17c364c4f84f1591dd60121041628f9a5c diff --git a/qtwayland b/qtwayland index 8828bf4d..3cb09edd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8828bf4dbeb90e479b3b461905f974774d6e20a4 +Subproject commit 3cb09edd71745edda4bbe8de3a6d7ad8e4ea5f58 diff --git a/qtwebchannel b/qtwebchannel index dd04d747..d84318e9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit dd04d74769e1859d571de7c4f2e88cb85a227ab9 +Subproject commit d84318e98aa3cbac11b4f95b3581e95aab96a34a diff --git a/qtwebengine b/qtwebengine index e409cfca..a12a8110 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e409cfca1765aad5f6cc09c0e0ebd019dd5b37e2 +Subproject commit a12a811026baa86d7d8e4728d893114c76feec20 -- cgit v1.2.3 From c4a807ca85ef13fa309f2488b298052f73493d66 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Sep 2017 03:04:51 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I08e75951d175003a670987e1f9ea35296bc12d16 Reviewed-by: Qt Submodule Update Bot --- qtquickcontrols | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtquickcontrols b/qtquickcontrols index 67906d61..c7a43a5d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 67906d61c6f786dbbced67becc25e1a396f3183c +Subproject commit c7a43a5d3d34ff0d7f1f8d88750643ffa8195efb diff --git a/qtwebengine b/qtwebengine index 6d7df67a..56474df1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6d7df67a75ce1a71c1a248d56dfbfab1d9225980 +Subproject commit 56474df111738070f6c55d3712ec07565239bad8 -- cgit v1.2.3 From 1d965fc599dd9e6661806f1c6bedc7d35ccf5a2b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 19 Sep 2017 03:01:03 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ic5c4e7dde129798e0799d74741c69b32c855351f Reviewed-by: Qt Submodule Update Bot --- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtserialport b/qtserialport index 004289a1..671233ea 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 004289a1b7e5ff5c4f19fab3c3d41c009429b352 +Subproject commit 671233ea2b2f2903b153726f4d6358fb5673d279 diff --git a/qtwayland b/qtwayland index 1e6063f6..e1f89e15 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1e6063f6fc9fa02bd2f12ad9e60cbc2529fc0377 +Subproject commit e1f89e15cf00420bd77ac16a867a1cadc9b942fc diff --git a/qtwebengine b/qtwebengine index 56474df1..4dd764a9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56474df111738070f6c55d3712ec07565239bad8 +Subproject commit 4dd764a9a005dcd9a7e9643e7337b787519ad113 -- cgit v1.2.3 From 0c66e761befc8356393ba353fa077f82def502b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 20 Jun 2017 13:09:20 +0300 Subject: provisioning: Windows 10 x64/x86 Vulkan SDK Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64. Task-number: QTQAINFRA-1186 Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f Reviewed-by: Laszlo Agocs --- coin/provisioning/common/vulkansdk.ps1 | 48 ++++++++++++++++++++++ .../qtci-windows-10-x86/09-vulkansdk.ps1 | 1 + .../qtci-windows-10-x86_64/09-vulkansdk.ps1 | 1 + 3 files changed, 50 insertions(+) create mode 100644 coin/provisioning/common/vulkansdk.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 diff --git a/coin/provisioning/common/vulkansdk.ps1 b/coin/provisioning/common/vulkansdk.ps1 new file mode 100644 index 00000000..c572fa47 --- /dev/null +++ b/coin/provisioning/common/vulkansdk.ps1 @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Vulkan SDK + +$version = "1.0.51.0" +$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe" +$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe" + +Copy-Item $url_cache $vulkanPackage +cmd /c "$vulkanPackage /S" + +echo "Cleaning $vulkanPackage.." +Remove-Item -Recurse -Force "$vulkanPackage" + +echo "Vulkan SDK = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 new file mode 100644 index 00000000..38185051 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 new file mode 100644 index 00000000..38185051 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vulkansdk.ps1" -- cgit v1.2.3 From 5d5a6d3a87b82c082b8bac656f52f615219c3ace Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Sep 2017 03:01:04 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ic0421ee85440e9f08f805c6f475238bf8820da0f Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtqa | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 3f03499b..b9a2aee4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3f03499bf8a7cf3c3f8d19a020179c1205980bde +Subproject commit b9a2aee4115a73cfa220349a3100a559006bb2fa diff --git a/qtqa b/qtqa index cdfda1b4..984636b1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cdfda1b40ac125bc5639582b0cea05d68e7b6993 +Subproject commit 984636b109ad3510c4b6c59c95195e20c650fd20 diff --git a/qtwebengine b/qtwebengine index 4dd764a9..d8f18e2b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4dd764a9a005dcd9a7e9643e7337b787519ad113 +Subproject commit d8f18e2b918e2f7c8149d3e6cd1510b27bde7dfd diff --git a/qtxmlpatterns b/qtxmlpatterns index fee0795c..1f7eed11 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fee0795ca96079a8f37473d3aec18757d1e52d24 +Subproject commit 1f7eed111bd1e2b6ba0ffbb236be3ca1b6073097 -- cgit v1.2.3 From 804bfd8700b3825cf4a2eb24c594536c8d36ee91 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Sep 2017 03:03:09 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I6fe7831d598a724eb8796e8a8e97a4946f5d6be4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index c23c4a92..34aa7a18 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 +Subproject commit 34aa7a18af5d355380c662bb1a10b3f0d7b7ed3e diff --git a/qtdeclarative b/qtdeclarative index 2aba6e35..112d668c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2aba6e35dc6f1534a764690382ca56b6cf099185 +Subproject commit 112d668c0fded8c6ab7bf40fd3800cf43e005f95 diff --git a/qtdoc b/qtdoc index 6bed42d8..bff19014 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6bed42d813833dcb8e6d172a123e302c042b4402 +Subproject commit bff19014eb40f0bcf6d4fc64215cf425c2eb0026 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7cbf3685..23c5ae75 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7cbf3685565d7f62c9a01b090a4c1600b4abe220 +Subproject commit 23c5ae751c86eee1a256aad3afe37f4757100f97 diff --git a/qtremoteobjects b/qtremoteobjects index d2269c4e..f73c78ed 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d2269c4e68f283f704547a0a96a662b5feeea732 +Subproject commit f73c78ed109473234a2a3725715d1ab22c95fecd diff --git a/qtserialbus b/qtserialbus index b2e4e7a4..f4ae73d4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b2e4e7a49990a68915820df525680b9c70971527 +Subproject commit f4ae73d430d9bf2bd6432e8e4a4e44d2bf5d806a diff --git a/qtwayland b/qtwayland index e1f89e15..20ebb685 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e1f89e15cf00420bd77ac16a867a1cadc9b942fc +Subproject commit 20ebb685e0fef048e56ed19403575634ce4b3435 diff --git a/qtwebchannel b/qtwebchannel index 749951c1..ba755c28 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 749951c19cbb7d301bed20f24d16dd4e713485c2 +Subproject commit ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b diff --git a/qtwebengine b/qtwebengine index d8f18e2b..9fdc847c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d8f18e2b918e2f7c8149d3e6cd1510b27bde7dfd +Subproject commit 9fdc847c639ef7060a13b10d9fe704e40357a0a8 diff --git a/qtwebglplugin b/qtwebglplugin index 39937996..7cd51e57 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 399379962002306c7281c3a5c318965335595e8a +Subproject commit 7cd51e57b95bd91f698c28ad76e31be3fe4c506e -- cgit v1.2.3 From d82fe5cacf02767827e40841f1bad2452542ba54 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 22 Sep 2017 09:42:29 +0200 Subject: Update submodules on '5.10' in qt5 Change-Id: If7ecb5f1d09e34878a553b287771a8eed395bfd1 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwebglplugin | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 34aa7a18..e5114e10 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 34aa7a18af5d355380c662bb1a10b3f0d7b7ed3e +Subproject commit e5114e10dcb1fc535b4a33a3008448baf4ec7cbf diff --git a/qtqa b/qtqa index 984636b1..416fc118 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 984636b109ad3510c4b6c59c95195e20c650fd20 +Subproject commit 416fc118fc5a2d9259a9c1a63768eb0f3516a873 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 23c5ae75..65abbf23 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 23c5ae751c86eee1a256aad3afe37f4757100f97 +Subproject commit 65abbf2370fa282f68286b17ee95f0c23e8330b0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1f72424b..27df0d34 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1f72424b80ac1b84b4f040f195d74d9f2b646a62 +Subproject commit 27df0d34644ffc553972641abfd3406219c85391 diff --git a/qtwebglplugin b/qtwebglplugin index 7cd51e57..4340ee4b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 7cd51e57b95bd91f698c28ad76e31be3fe4c506e +Subproject commit 4340ee4b467ca5331bb5149a5f4b8eccfd49480b -- cgit v1.2.3 From 6c4eb77aa0f8b07bb48d74ede633c6bc56d1a75c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Sep 2017 09:59:59 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: If34cf07aad9b4b3a539223dd37c40c799ffb7ba3 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 81a19050..92ca0914 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 81a19050d8127e7b05006f793a8797c8f5248191 +Subproject commit 92ca09147fc239762927595165f71a0d1ecff98f diff --git a/qtdeclarative b/qtdeclarative index bfab1db3..221b3f61 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bfab1db38167d31f0487f96d2d4b02d9243bc777 +Subproject commit 221b3f614a9c58cd5ac1aa4c36d36fb8a4cd56d0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 5affaad9..0419cb2b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 5affaad97a8c2116fb53c6709ad09952a8989c89 +Subproject commit 0419cb2b74e6b953fc1d3b02e71a3f0def39177c diff --git a/qtnetworkauth b/qtnetworkauth index 3d93f643..47b80eca 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3d93f6436596e349e43c3798b675af66db71df8a +Subproject commit 47b80ecae6fe0b9a2c74f0b0feb243145695995e diff --git a/qtqa b/qtqa index cdfda1b4..416fc118 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cdfda1b40ac125bc5639582b0cea05d68e7b6993 +Subproject commit 416fc118fc5a2d9259a9c1a63768eb0f3516a873 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d3aef722..391cba9a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d3aef722da533c3b100ba653498c79986a44c9f9 +Subproject commit 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 diff --git a/qttools b/qttools index fce89784..ad184840 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fce8978426b9dbad8ea60412ba34d855a9c90a24 +Subproject commit ad18484063a41328d0e72c75cda151128977e0d8 diff --git a/qtwebengine b/qtwebengine index a12a8110..a8666bc7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a12a811026baa86d7d8e4728d893114c76feec20 +Subproject commit a8666bc741c72b6b21dc0993d83919947cc17575 diff --git a/qtwebsockets b/qtwebsockets index 30de96f6..0f32f4ef 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 30de96f6d7ef01c1c5887405a4ad49cf44a5ab79 +Subproject commit 0f32f4efc5a9a8b33369013c2ba6c27c78498cf2 -- cgit v1.2.3 From b77ab20bf046515f9d058f553410e0314a6442a0 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 22 Sep 2017 12:58:30 +0200 Subject: Provisioning: Update MQTT provisioning MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not being evaluated. Furthermore, a previous installation might need to be removed. Change-Id: I9edaeb13378aa262b453f816260ade01ba414961 Reviewed-by: Simon Hausmann --- coin/provisioning/common/mqtt_broker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/mqtt_broker.sh b/coin/provisioning/common/mqtt_broker.sh index 7c316de2..b52b78b1 100644 --- a/coin/provisioning/common/mqtt_broker.sh +++ b/coin/provisioning/common/mqtt_broker.sh @@ -45,7 +45,8 @@ SHA1="532fe145096cdd8d679f425cbfd883289150c968" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" +sudo rm -fr "$targetFolder" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding MQTT broker path to environment" -echo "export MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" >> ~/.bashrc +sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc -- cgit v1.2.3 From ce1627df927c5710eb3f91d1c5f5cfc8931887f2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Sep 2017 22:22:05 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I60fda85bc418ae5d030608184edc242f82d12227 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtwebglplugin | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index b9a2aee4..e67119b7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b9a2aee4115a73cfa220349a3100a559006bb2fa +Subproject commit e67119b71d1b63c5710100349fa634113e93ada2 diff --git a/qtactiveqt b/qtactiveqt index 580f3366..f263d206 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 580f3366a74e95369a151ed6108c9f94a5cef303 +Subproject commit f263d206341472e23e0e1ad536faa1b0a22286c0 diff --git a/qtbase b/qtbase index e5114e10..282065d4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e5114e10dcb1fc535b4a33a3008448baf4ec7cbf +Subproject commit 282065d443c2a2d6b9e32d786c2c1c7552ba3cb5 diff --git a/qtdoc b/qtdoc index bff19014..813796be 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bff19014eb40f0bcf6d4fc64215cf425c2eb0026 +Subproject commit 813796be66919095c5abea126e50d2c454a75938 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 65abbf23..37a7c1fb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 65abbf2370fa282f68286b17ee95f0c23e8330b0 +Subproject commit 37a7c1fb488ed3aef79e2ae3f81f5143b46bb353 diff --git a/qtwebglplugin b/qtwebglplugin index 4340ee4b..ad251346 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4340ee4b467ca5331bb5149a5f4b8eccfd49480b +Subproject commit ad251346485ef995f6a4094cf6039f88d08b0cb5 diff --git a/qtxmlpatterns b/qtxmlpatterns index 1f7eed11..f8a92101 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1f7eed111bd1e2b6ba0ffbb236be3ca1b6073097 +Subproject commit f8a92101077943131b22011ae48b69687f51a7f1 -- cgit v1.2.3 From 51c26733040d94cb62b6f1d2df32da7ebe80d842 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 24 Sep 2017 12:29:41 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I35d02c6c8d6ce01d10d094302782d81713163ded Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 75697d59..ba9a38ce 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 75697d59cb6e3783bd1444816cfc90b4bc8b9aba +Subproject commit ba9a38ceca15f9bc086a6c9c5d341001e9e73852 diff --git a/qtbase b/qtbase index 92ca0914..b0ffb332 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 92ca09147fc239762927595165f71a0d1ecff98f +Subproject commit b0ffb332f2aa2ffc0b752c2ad740fbb6a69e0167 diff --git a/qtdeclarative b/qtdeclarative index 221b3f61..f17b826a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 221b3f614a9c58cd5ac1aa4c36d36fb8a4cd56d0 +Subproject commit f17b826a72d77379288aa84a933b9231c279cbad diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 0419cb2b..8c4488a7 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 0419cb2b74e6b953fc1d3b02e71a3f0def39177c +Subproject commit 8c4488a77d5fe4fed26b22dbc91b746a77cd0562 diff --git a/qtlocation b/qtlocation index eb381288..6ba14c6d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eb3812884d63ffc014f4ac76214e65a6497ae827 +Subproject commit 6ba14c6d2a6b7eb325cd975393306c4fe6809acd diff --git a/qtmultimedia b/qtmultimedia index d41bce99..f6838120 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d41bce99a531a7968f8c5bc8ec88965372341bd9 +Subproject commit f6838120ead0361463c800c25a711b799fae29ee diff --git a/qtwayland b/qtwayland index 3cb09edd..d4f67d84 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3cb09edd71745edda4bbe8de3a6d7ad8e4ea5f58 +Subproject commit d4f67d8414b8ddac8fb4bd3d70ae65e20a818645 diff --git a/qtwebengine b/qtwebengine index a8666bc7..7f56ce27 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a8666bc741c72b6b21dc0993d83919947cc17575 +Subproject commit 7f56ce273a90aaa2273d9438f16678716275d803 -- cgit v1.2.3 From 90ddfaf35f293e0ec6f27f78b9a50509b24066f8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Sep 2017 03:02:51 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I5ef48890ad2a3c87c1dd89bc4ee35f132bd0d967 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 282065d4..0d0ad598 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 282065d443c2a2d6b9e32d786c2c1c7552ba3cb5 +Subproject commit 0d0ad598c54652dbe04d5716025facd83adc979b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 37a7c1fb..bf1df7be 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 37a7c1fb488ed3aef79e2ae3f81f5143b46bb353 +Subproject commit bf1df7beae8e3ebd2c0b529265bad52703fe8ac8 diff --git a/qtwebengine b/qtwebengine index 9fdc847c..9d962bc9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9fdc847c639ef7060a13b10d9fe704e40357a0a8 +Subproject commit 9d962bc9424c71a451d04741619c9597f3da8010 -- cgit v1.2.3 From 512f8ff0a26dcc50260811d0108b32679b8c1054 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 Sep 2017 13:26:33 +0300 Subject: Change Packaging and iOS builds to macOS 10.12 This changes swap packaging and iOS builds from 10.10 to 10.12 Task-number: QTQAINFRA-1095 Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 5 ++--- coin/platform_configs/qt5.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index acfeba93..a94a6371 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,11 +12,10 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker -qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release +qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch -qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d486061d..727dd7e9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -19,5 +19,5 @@ qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 28ffb0ce8a2f1a9d2003607114ef131cc71d849e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Sep 2017 23:02:12 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtvirtualkeyboard | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index ba9a38ce..72e80520 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ba9a38ceca15f9bc086a6c9c5d341001e9e73852 +Subproject commit 72e80520d36802672eca1e93bc6c6019e6f5ffc3 diff --git a/qtbase b/qtbase index b0ffb332..bd72ead4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0ffb332f2aa2ffc0b752c2ad740fbb6a69e0167 +Subproject commit bd72ead4d12ff56c2856294d84f3e5d7e188b817 diff --git a/qtdeclarative b/qtdeclarative index f17b826a..fa52bb66 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f17b826a72d77379288aa84a933b9231c279cbad +Subproject commit fa52bb665d6beb77a951c14c8edcba3541850afc diff --git a/qtmultimedia b/qtmultimedia index f6838120..020e7b4c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f6838120ead0361463c800c25a711b799fae29ee +Subproject commit 020e7b4c198f5e74dd83da7fa8e64a02b14af2f9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f3683d17..31fcce58 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f3683d17c364c4f84f1591dd60121041628f9a5c +Subproject commit 31fcce584aee8ad323b56ab2965a3dc66320adab -- cgit v1.2.3 From 0b251bbdc058808c4264cbcc473c08f6c8a90f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 25 Sep 2017 10:04:39 +0300 Subject: Provisioning: Install Python3 development libs to OpenSUSE Those are required to build Pyside#5.9 branch. Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a Reviewed-by: Dominik Holland Reviewed-by: Friedemann Kleint --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 254b738d..ce0badc0 100644 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -5,4 +5,4 @@ sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv # install python3 -sudo pkcon -y install python3 python3-pip python3-virtualenv +sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv -- cgit v1.2.3 From 214a38f97455dd134f45e74832c98126a6adac4c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 26 Sep 2017 03:01:26 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I1d4c2064ee31a8adc1a048782824b3d597ea3242 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index e67119b7..fb0c9421 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e67119b71d1b63c5710100349fa634113e93ada2 +Subproject commit fb0c9421b1e172833f3ac2166b9a39bd83a8b6ef diff --git a/qtbase b/qtbase index 0d0ad598..a732e16d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d0ad598c54652dbe04d5716025facd83adc979b +Subproject commit a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bf1df7be..f2e06ce6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bf1df7beae8e3ebd2c0b529265bad52703fe8ac8 +Subproject commit f2e06ce60a8822d844221e77ca0a66f690855452 diff --git a/qtremoteobjects b/qtremoteobjects index f73c78ed..fdfbb84f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f73c78ed109473234a2a3725715d1ab22c95fecd +Subproject commit fdfbb84f150710f7446f86a04d0f5574fbf6737f diff --git a/qttools b/qttools index 4cb8667d..de6b61fd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4cb8667d20ff9f4af1451c54560ea864630f49b9 +Subproject commit de6b61fd34e7e316607a1904605e895ca27bbcbd -- cgit v1.2.3 From 0e4d668e358eb6a025b3173e8a822ddbef7f5aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 26 Sep 2017 09:32:06 +0300 Subject: Add official URL to MinGW Windows 10 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MinGW currently uses only internal URL without backup. Added the official URL to these scripts with SHA1 checksum verification. Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-mingw.ps1 | 50 ++++++++++++++++++++-- .../qtci-windows-10-x86_64/09-install-mingw530.ps1 | 6 +-- .../qtci-windows-10-x86_64/09-install-mingw630.ps1 | 6 +-- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 index fc02631d..f835059a 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/install-mingw.ps1 @@ -1,17 +1,59 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################ + +. "$PSScriptRoot\..\common\helpers.ps1" + function InstallMinGW { Param ( - [string] $version = $(BadParam("the version being printed to versions.txt")), - [string] $release = $(BadParam("release part of the file name")) + [string] $release = $(BadParam("release file name")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")) ) + $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') + + if ($arch -eq "i686") { $win_arch = "Win32" } + elseif ($arch -eq "x86_64") { $win_arch = "Win64" } + $envvar = "MINGW$version" $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" - $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z" + $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" + $url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" - Copy-Item $url_cache $mingwPackage + Download $url_official $url_cache $mingwPackage + Verify-Checksum $mingwPackage $sha1 Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index ded894a5..7c4cd8ac 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -2,9 +2,9 @@ # This script will install MinGW 5.3.0 -$version = "5.3.0" -$release = "release-posix-dwarf-rt_v4-rev0" +$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" +$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" -InstallMinGW $version $release +InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index a2710760..e11f2310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -2,7 +2,7 @@ # This script will install MinGW 6.3.0 -$version = "6.3.0" -$release = "release-posix-dwarf-rt_v5-rev2" +$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" +$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" -InstallMinGW $version $release +InstallMinGW $release $sha1 -- cgit v1.2.3 From 36d633f2fd4bfefb1c040a7c68436571b8e07d0c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Sep 2017 03:00:54 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I1df55eab97f42f44bf68c41bf6e2a0e5f36fe3ae Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwayland | 2 +- qtxmlpatterns | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index a732e16d..f7350ac9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a732e16d5fd9dbf8a0289fec9f948b12e9ba2c19 +Subproject commit f7350ac99ed961ec2f08d1db55b3c3ce088f33f0 diff --git a/qtcanvas3d b/qtcanvas3d index 5be124d7..3b24ef25 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 5be124d7373c36daf9a6c01712e6eab057bbf56d +Subproject commit 3b24ef25fa328bf993891e242c0c3ff677fafbcb diff --git a/qtdeclarative b/qtdeclarative index 112d668c..930aea8b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 112d668c0fded8c6ab7bf40fd3800cf43e005f95 +Subproject commit 930aea8b9ca59a24838cf7f279653e3b2ee40cee diff --git a/qtmultimedia b/qtmultimedia index 230f070c..35a57a4a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 230f070c7ed353605260f9fa79d0a5bc5181321c +Subproject commit 35a57a4af6700f5f483449f61686f14a601c1a51 diff --git a/qtnetworkauth b/qtnetworkauth index 4e681472..c9893ade 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 4e681472f6e25153745151f2b41a8ebf4bc94f54 +Subproject commit c9893adea875610d5e325934ad9681bc8ca17176 diff --git a/qtquickcontrols b/qtquickcontrols index c7a43a5d..c0dbf5da 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c7a43a5d3d34ff0d7f1f8d88750643ffa8195efb +Subproject commit c0dbf5da64e6fc20d6edc59cc849e282e9bfea50 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f2e06ce6..17a2c8bb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f2e06ce60a8822d844221e77ca0a66f690855452 +Subproject commit 17a2c8bb158c099fd2dace002e30405f8e60ec06 diff --git a/qtremoteobjects b/qtremoteobjects index fdfbb84f..5e3c8093 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit fdfbb84f150710f7446f86a04d0f5574fbf6737f +Subproject commit 5e3c8093fe596f1911ae692a743a93c9e96f0aeb diff --git a/qtwayland b/qtwayland index 20ebb685..ffee1b3f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 20ebb685e0fef048e56ed19403575634ce4b3435 +Subproject commit ffee1b3fb8c8e76d9317547376c8f13b0e17b494 diff --git a/qtxmlpatterns b/qtxmlpatterns index f8a92101..9e26cfa1 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit f8a92101077943131b22011ae48b69687f51a7f1 +Subproject commit 9e26cfa167778f3d9444aedcb23c8476683b3785 -- cgit v1.2.3 From 1643c95635b3a21e73b1965aeb121ee9474b9062 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 28 Sep 2017 09:53:23 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: If4c77fbc983d5ee85655efa8ec46785b5ce2584c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index fb0c9421..296aa2ee 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fb0c9421b1e172833f3ac2166b9a39bd83a8b6ef +Subproject commit 296aa2ee18c345ace3ddc424c1d65e62dea810bf diff --git a/qtbase b/qtbase index f7350ac9..36af37c9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f7350ac99ed961ec2f08d1db55b3c3ce088f33f0 +Subproject commit 36af37c99c13244cac54313d38af183ef40133f5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 17a2c8bb..7e85c09d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 17a2c8bb158c099fd2dace002e30405f8e60ec06 +Subproject commit 7e85c09d2575a21a4e4e57eb4a275918ca10f4fd diff --git a/qtwebengine b/qtwebengine index 9d962bc9..ec37477b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9d962bc9424c71a451d04741619c9597f3da8010 +Subproject commit ec37477bf8a9f8f2591670f04c9e21c697d7e4e4 -- cgit v1.2.3 From e9c5f633e01e6867b759ff9d809c906716d0f081 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Sep 2017 03:03:51 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ic6c5ea39d6233ef0cf95f38b7ed8da5079631aef Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 36af37c9..0f5c4ba7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36af37c99c13244cac54313d38af183ef40133f5 +Subproject commit 0f5c4ba7cbd628a29d3e84219834c20c29cd6741 diff --git a/qtmultimedia b/qtmultimedia index 35a57a4a..0c6faf31 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 35a57a4af6700f5f483449f61686f14a601c1a51 +Subproject commit 0c6faf31e643dda71f7068e5124f2e1889918cd2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7e85c09d..e981fd0b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7e85c09d2575a21a4e4e57eb4a275918ca10f4fd +Subproject commit e981fd0b7ec239f093be2e88d157c564c4f59aa2 diff --git a/qtwebengine b/qtwebengine index ec37477b..0fe0b133 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ec37477bf8a9f8f2591670f04c9e21c697d7e4e4 +Subproject commit 0fe0b133b7410940fcba89539d512a7bc13df979 diff --git a/qtwebglplugin b/qtwebglplugin index ad251346..52790359 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ad251346485ef995f6a4094cf6039f88d08b0cb5 +Subproject commit 52790359229cbc52089139186a64db448b37c0a8 diff --git a/qtwebsockets b/qtwebsockets index fdb6d837..71b5fc5d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit fdb6d8370f9ae8fa148124289317c108399853c3 +Subproject commit 71b5fc5dd10e9edce8db886f6c05b7950b3cca6e -- cgit v1.2.3 From 7983297c8b0391b5d28c1c6459dffa71b8056aae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 30 Sep 2017 03:00:52 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I511688940a93b3e86c0d4782cf332788e390933b Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 296aa2ee..205ba768 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 296aa2ee18c345ace3ddc424c1d65e62dea810bf +Subproject commit 205ba7689c3c6c547543cf4d5d7ec968cce9a7a5 diff --git a/qtbase b/qtbase index 0f5c4ba7..bd4506fe 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0f5c4ba7cbd628a29d3e84219834c20c29cd6741 +Subproject commit bd4506fe5be0616c1d1f4cac94bb7399dc2072c2 diff --git a/qtdeclarative b/qtdeclarative index 930aea8b..88b3d672 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 930aea8b9ca59a24838cf7f279653e3b2ee40cee +Subproject commit 88b3d672cbcdc1669de573a39026462ce4fdf86c diff --git a/qtmultimedia b/qtmultimedia index 0c6faf31..41ef172d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0c6faf31e643dda71f7068e5124f2e1889918cd2 +Subproject commit 41ef172d1cee40c42d14ff7824baedf11060b987 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e981fd0b..57f0da5e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e981fd0b7ec239f093be2e88d157c564c4f59aa2 +Subproject commit 57f0da5e6464735cedf3f8624deb827b5fe98b53 diff --git a/qtwebengine b/qtwebengine index 0fe0b133..a6ca622b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0fe0b133b7410940fcba89539d512a7bc13df979 +Subproject commit a6ca622baf9e4f6afee783fd87a6d3f245efd278 -- cgit v1.2.3 From 35a3ba35ef1ee4b584b78595effa19bf8b38f5d8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Oct 2017 03:03:36 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ifae0935db8d9862051b605438a4f713dd7e97a34 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index 205ba768..9c951154 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 205ba7689c3c6c547543cf4d5d7ec968cce9a7a5 +Subproject commit 9c951154256734b36328142e1078382dc2d7ae01 diff --git a/qtdeclarative b/qtdeclarative index 88b3d672..b9e3df1c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 88b3d672cbcdc1669de573a39026462ce4fdf86c +Subproject commit b9e3df1cceb337947c2c701975163b53dbe131d8 -- cgit v1.2.3 From cf0a8af55d75f730e108233a9e183ef41ce1dee4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 2 Oct 2017 03:00:55 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I66c6ad9f0c47757615bf9398ccaa2889d22681fd Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index bd4506fe..5e8b8a93 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd4506fe5be0616c1d1f4cac94bb7399dc2072c2 +Subproject commit 5e8b8a9388dc81a8a98edb2788bbaf2d68917706 -- cgit v1.2.3 From ae9f6019bcd53bdb49cc504f867ed04e24d60bb4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Oct 2017 03:06:04 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: Ifedd5a9d3cce47323ff432d7237b1156f4469bdf Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 9c951154..d4fb24c0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9c951154256734b36328142e1078382dc2d7ae01 +Subproject commit d4fb24c0871320667640f100b743f34f702db6cf diff --git a/qtbase b/qtbase index 5e8b8a93..b8947e91 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5e8b8a9388dc81a8a98edb2788bbaf2d68917706 +Subproject commit b8947e9194f0f88f464448ac51f6a05113d36a33 diff --git a/qtqa b/qtqa index 416fc118..8faa8086 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 416fc118fc5a2d9259a9c1a63768eb0f3516a873 +Subproject commit 8faa8086e77059d5449f946e0bd0f78e61213a2a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 57f0da5e..aab1bcb6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 57f0da5e6464735cedf3f8624deb827b5fe98b53 +Subproject commit aab1bcb619400671fc053f853362213a08353c46 diff --git a/qtwayland b/qtwayland index ffee1b3f..a81fc596 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ffee1b3fb8c8e76d9317547376c8f13b0e17b494 +Subproject commit a81fc596a3cbcc07396be1c0284f1ee8aa44ff8c diff --git a/qtwebglplugin b/qtwebglplugin index 52790359..97275fc5 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 52790359229cbc52089139186a64db448b37c0a8 +Subproject commit 97275fc54abd103ae8f603027ce829ce3429c896 -- cgit v1.2.3 From 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 5 Oct 2017 03:00:56 +0300 Subject: Update submodules on '5.10' in qt5 Change-Id: I2bf9e16177826276d6b6f5f8aa1a6708d62912a8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index b8947e91..5b4cf7af 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b8947e9194f0f88f464448ac51f6a05113d36a33 +Subproject commit 5b4cf7af6a492b6ef5b7c718b346b38ddad4c990 diff --git a/qtconnectivity b/qtconnectivity index ed5a1134..18af3226 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ed5a1134d50f6dbed3fc568c799a39f4e2338056 +Subproject commit 18af3226765b62312acc8f801cc531fde0d9822b diff --git a/qtdeclarative b/qtdeclarative index b9e3df1c..0d3592aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b9e3df1cceb337947c2c701975163b53dbe131d8 +Subproject commit 0d3592aa7fab8bf4d8f80bc3b35323efe6950b1b diff --git a/qtdoc b/qtdoc index 813796be..59cd20b0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 813796be66919095c5abea126e50d2c454a75938 +Subproject commit 59cd20b07364bc1c08217a6d669cb09fa827d097 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index aab1bcb6..0bd5c342 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit aab1bcb619400671fc053f853362213a08353c46 +Subproject commit 0bd5c342013bfae63f1a7e13a0f531cb0a2c8581 diff --git a/qtserialbus b/qtserialbus index f4ae73d4..01df1b7a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f4ae73d430d9bf2bd6432e8e4a4e44d2bf5d806a +Subproject commit 01df1b7a635b11c9d0985f9651cfa4ae3d037890 diff --git a/qtwayland b/qtwayland index a81fc596..04f6ff77 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a81fc596a3cbcc07396be1c0284f1ee8aa44ff8c +Subproject commit 04f6ff77ef0c8858629766e191ecc3d4ef056848 diff --git a/qtwebengine b/qtwebengine index a6ca622b..cf06b687 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a6ca622baf9e4f6afee783fd87a6d3f245efd278 +Subproject commit cf06b687845b6e37ef3cd80fd644bb7d769f0033 diff --git a/qtwebglplugin b/qtwebglplugin index 97275fc5..5b884ad0 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 97275fc54abd103ae8f603027ce829ce3429c896 +Subproject commit 5b884ad0a48358bc50e05b8baa9821161b345433 -- cgit v1.2.3