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 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 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 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 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 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 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 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