From 13b721c62de3ddbe33a6e18e42e4db1049550758 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 14 Oct 2020 10:13:35 +0300 Subject: Adjust submodule branches Change-Id: Icd14fca8be320e3d606d88f7bd441324712e558c --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..be85efdc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.10 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.10 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.10 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.10 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.10 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.10 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.10 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.10 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.10 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.10 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.10 status = addon -- cgit v1.2.3 From 01752b6e21d9287f574223452994fcb8282f83e9 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 21 Oct 2020 15:21:03 +0300 Subject: Provisioning: Install Microsoft Visual C++ Redistributable Script will install Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019 Change-Id: I4366855c8d5679e3b7b201d79a82e47199b3ad8c Reviewed-by: Jani Heikkinen --- .../qtci-windows-10-x86_64/10-install-vcredist.ps1 | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-install-vcredist.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-vcredist.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-vcredist.ps1 new file mode 100644 index 00000000..eeffa463 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-vcredist.ps1 @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2020 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\windows\helpers.ps1" + +# This script will install VC Redistributable + +$sha1 = "a55510a8c9708b2c68b39cd50bbcaf86e2c885f0" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VC_redist.x64.exe" +# https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads +$url_official = "https://aka.ms/vs/16/release/vc_redist.x64.exe" +$package = "C:\Windows\Temp\vc_redist.x64.exe" + +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +Run-Executable "$package" "/install /quiet /norestart" + +Remove-Item -Recurse -Force -Path $package -- cgit v1.2.3 From 9616544a559d5a0ab4fbb1aec8ce187827d9f9b8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 21 Oct 2020 20:56:24 +0300 Subject: Provisioning: Enable access to SMB server in Windows 10 x64 Windows don't allow insecure guest login anymore by default. It need to be enabled through Group Policy restrictions Task-number: QTQAINFRA-3980 Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828 Reviewed-by: Timur Pocheptsov (cherry picked from commit 586856e180b65470d0e5d119081e18abbde83152) Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 new file mode 100644 index 00000000..3cf989d3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F -- cgit v1.2.3 From 5467b00de477f784b06c4773a49fc237898f8b8f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 26 Oct 2020 01:30:44 +0000 Subject: Update submodules on '5.12.10' in qt/qt5 Change-Id: I6c2b291aaaffb74e6a57763540382321c9db1a8d Reviewed-by: Qt CI Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 648daeb8..c9d86b59 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 648daeb81994f95e8827fd1e76893557b3182a48 +Subproject commit c9d86b593e62c880d567a0672bd86283d8242f15 diff --git a/qtactiveqt b/qtactiveqt index 94044c19..d09457fa 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 94044c1991755133bf5322ab71fa1c4785797149 +Subproject commit d09457fadc277388667f2f3755b2abd418743e69 diff --git a/qtandroidextras b/qtandroidextras index 43c6aa63..b6a10faf 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 43c6aa63bb85efdb4f945101cfd7db871fa8d4b6 +Subproject commit b6a10faf9657b774acffee882a22a2f9c1fa3558 diff --git a/qtbase b/qtbase index 991fb57e..d2578984 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 991fb57e781e18ca3db3eb64f0038dafe501fd09 +Subproject commit d2578984e00dd52de34ca672871cae16610e7cd7 diff --git a/qtcanvas3d b/qtcanvas3d index 898baba2..b977d8c1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 898baba2f62cf9da854562c5489bcaae79518ebb +Subproject commit b977d8c14cda8159dfd669e0bd42b263e936a12d diff --git a/qtcharts b/qtcharts index f6ddb04a..754f8d15 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f6ddb04a31bc8acaf66a156acc7cbf818b1bff11 +Subproject commit 754f8d15a01bae966c43749e3cc833d2def7e808 diff --git a/qtconnectivity b/qtconnectivity index 526caeb2..568c411f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 526caeb24ab207ec25a462bd93d8da70a0cc1c0b +Subproject commit 568c411f2751a97e9cc39f58adfa16f2465c4bae diff --git a/qtdatavis3d b/qtdatavis3d index d057ce79..dae7527b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d057ce79a8bf4fde1ee80ca273cbddff84b66aa1 +Subproject commit dae7527bee9f86bc0e6254068aeeb908df5a6de5 diff --git a/qtdeclarative b/qtdeclarative index 25969463..36e4e9bb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2596946398c3a97459b304f34ad73fc9944db1ae +Subproject commit 36e4e9bbd402cefab9d7b68635a94a02e0b41187 diff --git a/qtdoc b/qtdoc index a4e9fea1..0a78fdaf 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a4e9fea17e14add8bb7ba3087be0c2dc5bff7f3c +Subproject commit 0a78fdafa390a7c1d1194ad35c67c1dc8d2185f0 diff --git a/qtgamepad b/qtgamepad index c7466b99..93b710eb 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c7466b99489b981f58e38c9f2030991663d7b7a8 +Subproject commit 93b710ebc59a5fac6f9f657c5afe8770bf7506ab diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e15565d6..fabaae2f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e15565d63fb4d383ef34706ac74b1be14108188a +Subproject commit fabaae2f8039d9f12e8531e2dc215b24ffe8d445 diff --git a/qtimageformats b/qtimageformats index 39e7b00a..7518d381 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 39e7b00a7225e6ea6b11534a6bfe3b12565eda93 +Subproject commit 7518d381be0f58f943bd8bead901356d2528e26b diff --git a/qtlocation b/qtlocation index bafd8aa9..3c7489c3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit bafd8aa9a4a74c8b909a1aba3ae09d0df6b34d3f +Subproject commit 3c7489c3802a11bf62b7f851fb088f9671b76262 diff --git a/qtmacextras b/qtmacextras index dddd4504..1fc8c238 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit dddd4504c2266e5fe99567b4a07af1d46aa4b681 +Subproject commit 1fc8c238f362ee44799faf38ad42ebd269b3d4b1 diff --git a/qtmultimedia b/qtmultimedia index 9fc291c7..c0bd851e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9fc291c75f5fae829deeb01ceba303ad67f4a533 +Subproject commit c0bd851e6e89723db36f2b69dc2d00ed385c67e1 diff --git a/qtnetworkauth b/qtnetworkauth index cd823aa7..2bcf17c3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit cd823aa708d3876537adcd72f230b28f4dd5dda8 +Subproject commit 2bcf17c3e4131b0b5b15c96ed104fceede3c3990 diff --git a/qtpurchasing b/qtpurchasing index 8cee104e..f3cbd453 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 8cee104e629e3b1d92839f64d231d1b01fc6f059 +Subproject commit f3cbd4531566f6c0d0b14ba179b8396bf4270083 diff --git a/qtquickcontrols b/qtquickcontrols index 747def90..8c37f9ee 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 747def904fb62c914bfb8dd556a86cc3a2629a7d +Subproject commit 8c37f9ee025057ab27f9a8c92e8d3e2b585ebf6c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dff76611..63f73a2a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dff76611bcb921b20218c99548a61418dbdbf23d +Subproject commit 63f73a2aee40f9bec5ef63fdd416877a6737110d diff --git a/qtremoteobjects b/qtremoteobjects index 0624860b..bfd4ed0f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0624860bcfc869f83e35dcc469d12b7377b78def +Subproject commit bfd4ed0f9a6edf9217dcea99e2f045f532453783 diff --git a/qtscript b/qtscript index def57382..2ec32b5f 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit def57382aaa52a69a4b72504ab67c4cc6c11c613 +Subproject commit 2ec32b5fdb9671f44e506964ae03109e557dfb99 diff --git a/qtscxml b/qtscxml index c307d59a..878112bf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c307d59a3e2c40da921001d097ea91ef8d0220b5 +Subproject commit 878112bf670bb9f9caa09de290c63b0f9078d3f0 diff --git a/qtsensors b/qtsensors index eb4ea7ce..903ed99b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit eb4ea7cee81d63cc77c5ab88a80f32630117878d +Subproject commit 903ed99bcc92417cd76d79ac598daf5f299b80cd diff --git a/qtserialbus b/qtserialbus index f1ecfb23..dbddf24b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f1ecfb23ae12736d78e4c954a39df05d9cccfcc7 +Subproject commit dbddf24b08141ffd2f1ed98fbcf64b1220161e05 diff --git a/qtserialport b/qtserialport index 16dd2087..9431549e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 16dd2087f22cc3c289d2c7734a2ded155e5cc1f7 +Subproject commit 9431549e2e3c75dafa38a6bd7d45cbaa091a632f diff --git a/qtspeech b/qtspeech index 8acc6db8..e5f94476 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8acc6db8acacfa7adc4fde4de9570b34853cf13d +Subproject commit e5f94476d1f255816c1d1e4d2f45a303541ff64c diff --git a/qtsvg b/qtsvg index efa92038..4491fd66 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit efa920382e0ad29bf2ab3a8e1457cb4a3538362e +Subproject commit 4491fd66db8e36204f6d36d0002897afd119bc80 diff --git a/qttools b/qttools index 850e1101..1d665e7f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 850e11014691f14f44ca7ec2308ecf08451c4aa8 +Subproject commit 1d665e7f4ac2a426e702c2935f11aa160e27bddb diff --git a/qttranslations b/qttranslations index b2ceff19..e281294a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b2ceff197a00ccda81beee9db0ee85dbf8a14f41 +Subproject commit e281294aeb5e74e93fb2f71233b133a4177593d6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 33c358e5..bb9fd3b9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 33c358e5766b488b866381a4195d178c1e5be655 +Subproject commit bb9fd3b992d716ebba392bc3cf21da41e5562d08 diff --git a/qtwayland b/qtwayland index d950d9fc..971ed94a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d950d9fc77b9118cbd0aea1691f3ca75ee9f5b41 +Subproject commit 971ed94adbf538af5a09e4136921fc0e8cee9815 diff --git a/qtwebchannel b/qtwebchannel index 0b4d40b7..7219a32c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 0b4d40b7d97cc34a04ac99f47832f98e8d8f0f07 +Subproject commit 7219a32c30d21bc6cc8fe2121e28d19da3d67b00 diff --git a/qtwebengine b/qtwebengine index 8060a6ab..07fcac04 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8060a6ab6535e93e3baa4f0df48ea98dab1adc8f +Subproject commit 07fcac049e7b362b703f31ec559f5097f804588e diff --git a/qtwebglplugin b/qtwebglplugin index 3de83d62..954a898b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 3de83d62b51496b676cf54aa5a3f9c2934635295 +Subproject commit 954a898bea7af04cb619c05637a651e3a0d925f3 diff --git a/qtwebsockets b/qtwebsockets index 7ce1a6c2..4156135c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7ce1a6c286f1035ba6f288c023434fdbc1698476 +Subproject commit 4156135c236ae2799f40fae1741c038d1f150934 diff --git a/qtwebview b/qtwebview index 9cbb229a..14a616da 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9cbb229a5caca20127299abaaa05919c6d9f2cd8 +Subproject commit 14a616da97106ce08fae58329c211c4688c7fbdf diff --git a/qtwinextras b/qtwinextras index be49d3ff..9ec782f2 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit be49d3ffd3175903e47fa94c674eddcfb960b0a7 +Subproject commit 9ec782f24f2a852d351619e174e1bec79112ff43 diff --git a/qtx11extras b/qtx11extras index 122c4f7a..be7f01d1 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 122c4f7a986efc9d71b73652cbac4e3a20c2c9f1 +Subproject commit be7f01d16d143681be394a13e19eb4d816aa8a97 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2350c3f0..2e532e96 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2350c3f037cf80cdf3c274585a1b834ef2b5c72d +Subproject commit 2e532e96db74bc666af800c2530827eea75a2107 -- cgit v1.2.3 From 83d940842cccd845140f132e0ee8ebfc046680c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 29 Oct 2020 01:30:45 +0000 Subject: Update submodules on '5.12.10' in qt/qt5 Change-Id: Idedfde0d4bac6afd3fc71697d4584d9b5337ce55 Reviewed-by: Qt CI Bot --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtsvg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index d2578984..d43c6f1b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d2578984e00dd52de34ca672871cae16610e7cd7 +Subproject commit d43c6f1bada49b8c0a90feb96a7b8297f9f1ab05 diff --git a/qtdoc b/qtdoc index 0a78fdaf..e10560e0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0a78fdafa390a7c1d1194ad35c67c1dc8d2185f0 +Subproject commit e10560e0e3ac3248489acf81a3da9e4264d8e395 diff --git a/qtmultimedia b/qtmultimedia index c0bd851e..67ab370d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c0bd851e6e89723db36f2b69dc2d00ed385c67e1 +Subproject commit 67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e diff --git a/qtsvg b/qtsvg index 4491fd66..261ed79b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4491fd66db8e36204f6d36d0002897afd119bc80 +Subproject commit 261ed79b966065f4ce398f1a701be6298dd49be9 -- cgit v1.2.3 From d94fd443b64e221728248795339a0c6af0863ce5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Nov 2020 01:30:48 +0000 Subject: Update submodules on '5.12.10' in qt/qt5 Change-Id: If00a7a8230ef9e8a618fccd65e06231f16e99e9c Reviewed-by: Qt CI Bot Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index d43c6f1b..c919fc5f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d43c6f1bada49b8c0a90feb96a7b8297f9f1ab05 +Subproject commit c919fc5f65c1c509370df7e616263ed007931a7a diff --git a/qtqa b/qtqa index bb930947..bc1b16f5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bb9309475c4075983d90b05a2dbc410f35685a4e +Subproject commit bc1b16f51bf95a96dbc5f1ee0b75acd5a7e7fe91 -- cgit v1.2.3 From 92ea8f4884c429c2198a64327c48039ebdd166e0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 Feb 2021 12:22:23 +0200 Subject: Provisioning: Latest pip versions don't support Python 2 anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can't upgrade pip anymore to the latest version. pip 20.3 was the last version of pip that supported Python 2 Task-number: QTQAINFRA-4235 Change-Id: I2add6939614f282416a39b00734bc1d22906de47 Reviewed-by: Tony Sarajärvi (cherry picked from commit d6e3aa0869e5a7ed1db843dd6c798ab39fa3992e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 17c654f6001a36e9f51d430eaec82975dfe82f9e) Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index b956d6a3..e0810b74 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -122,7 +122,7 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 # We shouldn't use yum to install virtualenv. The one found from package repo is not # working, but we can use installed pip -sudo pip install --upgrade pip +sudo pip install --upgrade "pip < 21.0" sudo pip install virtualenv wheel sudo /usr/local/bin/pip3 install wheel -- cgit v1.2.3 From 9c71fcd258f3b35b4a135769421b7eb583caa92d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Sun, 24 Jan 2021 13:02:44 +0200 Subject: Provisioning: get-pip.py address changed for python 2.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For python27 get-pip file's location has been changed and we need to use two different get-pip files for different python versions. Let's also cache these python files and use cache as primary url. Task-number: QTQAINFRA-4210 Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi (cherry picked from commit 6d20944daf78c50b0de03e516293c87959616623) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit b66e4773c82d6508e5952244cabf955a487cb6af) Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/pip.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/pip.sh b/coin/provisioning/common/macos/pip.sh index 2d07db85..b1c9a864 100755 --- a/coin/provisioning/common/macos/pip.sh +++ b/coin/provisioning/common/macos/pip.sh @@ -1,11 +1,18 @@ #!/usr/bin/env bash +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + function InstallPip { python=$1 # Will install pip utility for python - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py + if [[ $python == "python2.7" ]]; then + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0" + else + DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2" + fi sudo "$python" get-pip.py rm get-pip.py } -- cgit v1.2.3 From 2baf83b180b354c7befedf02bccd6c0d37b34a43 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 14 Jan 2021 13:25:30 +0200 Subject: Provisioning: Add --ignore-signature to ICC installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ICC installation fails when checking digital signature Task-number: QTQAINFRA-4174 Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e Reviewed-by: Tony Sarajärvi (cherry picked from commit d238c03742fb7568ad794017875f63f6a854b5ff) (cherry picked from commit 105f54c0908540d93e5a84ffcfebaae8224cfb59) Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh | 2 +- coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh index 7ab8528a..0bfae515 100755 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh @@ -76,7 +76,7 @@ ARCH_SELECTED=ALL COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature) # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh index 7ab8528a..0bfae515 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh @@ -76,7 +76,7 @@ ARCH_SELECTED=ALL COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature) # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh index 7ab8528a..0bfae515 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh @@ -76,7 +76,7 @@ ARCH_SELECTED=ALL COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset EOT -(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu) +(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu --ignore-signature) # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -- cgit v1.2.3 From e41c48ebf81f64de394cda2240810f2a43cdcb17 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 29 Oct 2020 14:13:40 +0200 Subject: Upgrade msys2 package and the installation script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change will upgrade the msys2 package Change also updates the script to use cached prebuilt package if available. This will also remove unneeded x86 installation Task-number: QTQAINFRA-3986 Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102 Reviewed-by: Tony Sarajärvi (cherry picked from commit 134c2a1cb0d41d773577d4c499004b93fb03d3c9) (cherry picked from commit 08a384605a5c3984f1c724eb12fa6127b9ee76f5) Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/install-msys2.ps1 | 56 +++++++++++++--------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index e88c8f07..fa4f9c35 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -33,40 +33,50 @@ . "$PSScriptRoot\helpers.ps1" -$version = "20181211" +# This script will installs msys2 + +$version = "20200903" $prog = "msys2" -if (Is64BitWinHost) { - $arch = "x86_64" - $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" - $folder = "msys64" -} else { - $arch = "i686" - $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" - $folder = "msys32" -} -$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$arch = "x86_64" +$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03" +$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8" +$folder = "msys64" +$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package" -$PackagePath = "C:\Windows\Temp\$package" $TargetLocation = "C:\Utils" -Download $url_official $url_cache $PackagePath -Verify-Checksum $PackagePath $sha1 -Extract-tar_gz $PackagePath $TargetLocation -$bash = "$TargetLocation\$folder\usr\bin\bash" +if ((Test-Path $url_cache_prebuilt)) { + $PackagePath = "C:\Windows\Temp\$package_prebuilt" + Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath + Verify-Checksum $PackagePath $sha1_prebuilt + Extract-7Zip $PackagePath $TargetLocation +} else { + $PackagePath = "C:\Windows\Temp\$package" + Download $url_official $url_cache $PackagePath + Verify-Checksum $PackagePath $sha1 + Extract-tar_gz $PackagePath $TargetLocation + $msys = "$TargetLocation\$folder\msys2_shell.cmd" + + # install perl + # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. + cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" + Start-Sleep -s 60 + cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`"" -# install perl -Run-Executable "$bash" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Run-Executable "$bash" "`"-l`" `"-c`" `"yes | cpan -i Text::Template Test::More`"" + # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. + # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. + Start-Sleep -s 360 + if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } + if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } +} Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" -# pacman-key launches gpg-agent and dirmngr in the background, see https://github.com/Alexpux/MSYS2-pacman/issues/56 -Stop-Process -Name "gpg-agent" -ErrorAction Ignore -Stop-Process -Name "dirmngr" -ErrorAction Ignore - Write-Output "MSYS2 = $version" >> ~\versions.txt -- cgit v1.2.3 From a3c179f7546d901f2ac5136c7e3f51289491a817 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 7 Jan 2021 14:51:41 +0200 Subject: Provisioning: Install p7zip using --build-from-source parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit brew install p7zip isn't working anymore with macOS 10.13 and 10.12. Let's use --build-from-source parameter with brew installation Task-number: QTQAINFRA-4128 Change-Id: Ib1a2db1cd3176955cca450e5ebe0d0fc1bee3aa4 Reviewed-by: Tony Sarajärvi (cherry picked from commit c470301c34c653124cb4a093382782e347913921) Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh index 15511332..507463f8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh @@ -4,4 +4,4 @@ set -ex brew update -brew install p7zip +brew install --build-from-source p7zip diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh index 15511332..507463f8 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh @@ -4,4 +4,4 @@ set -ex brew update -brew install p7zip +brew install --build-from-source p7zip -- cgit v1.2.3 From 8c83faf39ef9fd78d52853baad516edbce4be0a0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 8 Jan 2021 09:00:01 +0200 Subject: Provisioning: Remove brew cask list query MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit brew cask list --versions don't work anymore with macOS 10.13: Calling brew cask list is disabled! Change-Id: I44d64bea36577212d0d8ff1fbd4f40111b8cadee Reviewed-by: Tony Sarajärvi (cherry picked from commit e3c294489fa658a5ae4affeb90cde3f42af22b18) Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/macos-version.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh index 9f357b8c..c88cd9b8 100755 --- a/coin/provisioning/common/macos/macos-version.sh +++ b/coin/provisioning/common/macos/macos-version.sh @@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt echo "***** All installed packages *****" >> ~/versions.txt echo "***** HomeBrew *****" >> ~/versions.txt brew list --versions >> ~/versions.txt -echo "***** HomeBrew Casks*****" >> ~/versions.txt -brew cask list --versions >> ~/versions.txt echo "***** Apple's installer *****" >> ~/versions.txt pkgutil --pkgs >> ~/versions.txt echo "*********************************************" >> ~/versions.txt -- cgit v1.2.3 From b9bb764e8d4b7c5a185853d61112b0de98ed966a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Nov 2020 12:09:48 +0200 Subject: Provisioning: Install Dotnet SDK 2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dotnet is needed for Azure installation Task-number: QTQAINFRA-4042 Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2 Reviewed-by: Tony Sarajärvi (cherry picked from commit 8846d0d52d86940af6e57b495a5c20e08c7d47d0) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5888d1c9ba33a1e316b45f6e56fd6674b115ee35) Reviewed-by: Heikki Halmet --- .../provisioning/common/windows/install-dotnet.ps1 | 59 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/90-install-dotnet.ps1 | 2 + 2 files changed, 61 insertions(+) create mode 100644 coin/provisioning/common/windows/install-dotnet.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 diff --git a/coin/provisioning/common/windows/install-dotnet.ps1 b/coin/provisioning/common/windows/install-dotnet.ps1 new file mode 100644 index 00000000..8578c9b4 --- /dev/null +++ b/coin/provisioning/common/windows/install-dotnet.ps1 @@ -0,0 +1,59 @@ +############################################################################# +## +## Copyright (C) 2020 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 Dotnet SDK which is required for Azure installation + +$version = "2.1" +if (Is64BitWinHost) { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe" + $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8" +} else { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe" + $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161" +} +$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe" + +Write-Host "Installing Dotnet SDK $version" +Download $urlOfficial $urlCache $installer +Verify-Checksum $installer $sha1 +Run-Executable "$installer" "/install /passive" +Prepend-Path "C:\Program Files\dotnet" +Remove $installer + +Write-Output "Dotnet SDK = $version" >> ~/versions.txt + + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 new file mode 100644 index 00000000..a2ecfba2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + -- cgit v1.2.3 From 7e2fd354b01663040a7b26f804f9ee9f1cec0bb0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Nov 2020 12:35:59 +0200 Subject: Provisioning: Install Azure tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-4042 Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e Reviewed-by: Tony Sarajärvi (cherry picked from commit cdea442a3a60421100e1bf80d8fa107995cda1ef) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 883b9a41927d35e4a75125fccc24388fdee4de76) Reviewed-by: Heikki Halmet --- .../common/windows/install-azure-tool.ps1 | 40 ++++++++++++++++++++++ .../91-install-azure-tool.ps1 | 1 + 2 files changed, 41 insertions(+) create mode 100644 coin/provisioning/common/windows/install-azure-tool.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 diff --git a/coin/provisioning/common/windows/install-azure-tool.ps1 b/coin/provisioning/common/windows/install-azure-tool.ps1 new file mode 100644 index 00000000..937804fd --- /dev/null +++ b/coin/provisioning/common/windows/install-azure-tool.ps1 @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2020 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 Azure singtool using Dotnet SDK +$dotnet = "C:\Program Files\dotnet\dotnet.exe" + +$version = "2.0.17" +Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 new file mode 100644 index 00000000..f1d5acc3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" -- cgit v1.2.3 From bc3e3ad85f05491420433d1c04ccca920d0eadd1 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 30 Mar 2020 15:18:59 +0300 Subject: Enable tests for installer-framework Remove DisableTests feature from build configurations. Task-number: QTIFW-1638 Change-Id: I6a66547306c732f6c5815e8ca6e8955f55d6cc5b Reviewed-by: Antti Kokko Reviewed-by: Katja Marttila (cherry picked from commit 5f1199953ff863047e0eee43bdc412b2759a0472) --- coin/platform_configs/installer-framework.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index aaa563ef..f50bbdd5 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -5,19 +5,19 @@ Configurations: Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Target arch: 'x86' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' - Template: 'qtci-linux-RHEL-7.4-x86_64' -- cgit v1.2.3 From 351e5f2f5f8903f2abd1d03302d20f8d05eab1ac Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Tue, 16 Jun 2020 11:10:54 +0300 Subject: Add platform config for tqtc-installer-framework MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is similar to installer-framework.yaml with added configurations for QtInstaller specific builds. This enables two sets of builds from the same branch of tqtc-installer-framework. First set is for plain tqtc-installer-framework builds i.e. the commercial deliverable. The "QtInstaller" set is for the consumption of Qt Installer creation. Task-number: QTIFW-1027 Change-Id: Ifff750eef2631ce4e16edb32a7f7df593c698944 Reviewed-by: Simo Fält (cherry picked from commit 307038829fc53bfc99d0148cce0547fca902ac67) Reviewed-by: Katja Marttila --- .../platform_configs/tqtc-installer-framework.yaml | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 coin/platform_configs/tqtc-installer-framework.yaml diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml new file mode 100644 index 00000000..ac5910f1 --- /dev/null +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -0,0 +1,44 @@ +Version: 2 +Module only: True +Configurations: +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'MSVC2015' + Target arch: 'x86' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] + Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] +- + Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Compiler: 'GCC' + Features: ['Packaging'] + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Compiler: 'GCC' + Features: ['Documentation', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-windows-10-x86_64-10' + Compiler: 'MSVC2015' + Target arch: 'x86' + Features: ['Packaging', 'QtInstaller'] + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] + Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] +- + Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['Packaging', 'QtInstaller'] + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' +- + Template: 'qtci-linux-RHEL-7.4-x86_64' + Compiler: 'GCC' + Features: ['Packaging', 'QtInstaller'] + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' -- cgit v1.2.3 From 12b090a24c31a434455de4e80809501e4e7bd33f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 14 Oct 2020 11:19:59 +0300 Subject: Fix installer configure args to create only release executables Fixes: QTIFW-1999 Change-Id: I0efe695e8bdab9bc23e8122deb6b4e7f8aafa7bd Reviewed-by: Katja Marttila (cherry picked from commit 2d76b3d64d466713d8b6e9831bc0b25a9ddc54bf) --- coin/platform_configs/tqtc-installer-framework.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index ac5910f1..259d89b6 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -29,16 +29,16 @@ Configurations: Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging', 'QtInstaller'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging', 'QtInstaller'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'QtInstaller'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' -- cgit v1.2.3 From 5770eaaa52cb47484a2fcbb45c107e55c876f68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 17 Nov 2020 09:57:35 +0200 Subject: Fix tqtc-installer-framework platform configs Change-Id: Ib5625c56507d2331e75b97a3757e0930cdee06a2 Reviewed-by: Iikka Eklund (cherry picked from commit 53680499c8d29a4a4fde5823a936f882b27333c0) Reviewed-by: Katja Marttila --- .../platform_configs/tqtc-installer-framework.yaml | 26 ++-------------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 259d89b6..3ff2dea7 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -1,31 +1,9 @@ Version: 2 Module only: True +Include: [ installer-framework.yaml ] Configurations: - - Template: 'qtci-windows-10-x86_64-10' - Compiler: 'MSVC2015' - Target arch: 'x86' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' - Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] - Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] -- - Template: 'qtci-macos-10.13-x86_64-2' - Compiler: 'Clang' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Documentation', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-windows-10-x86_64-10' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging', 'QtInstaller'] -- cgit v1.2.3 From e206ed1b3762b63d773b4ab6ac495f4ec08b165b Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Mon, 25 Jan 2021 08:58:00 +0200 Subject: IFW Coin: Build only release builds Without the '-release' option IFW tools are built as debug. In Windows it means unnecessary large installers and dependencies to msvc debug libraries. Change-Id: I3197216c91e82934ea11bdc3d635ce61516bc64e Reviewed-by: Jani Heikkinen (cherry picked from commit 8da20a0a1b028a958ad7767b7abe44622a4ed19c) Reviewed-by: Katja Marttila --- coin/platform_configs/installer-framework.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index f50bbdd5..377bf750 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -6,19 +6,19 @@ Configurations: Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' -- cgit v1.2.3 From 9574f6ae66d2eafa78e2175920bc1819ae391610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 1 Jun 2021 09:41:33 +0300 Subject: Provisioning: Install prebuilt qdoc Change-Id: I7991388b027bb8550618f5a2c78902dc98550c12 Reviewed-by: Toni Saario --- .../qtci-windows-10-x86_64/90-prebuilt-qdoc.ps1 | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-prebuilt-qdoc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-prebuilt-qdoc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-prebuilt-qdoc.ps1 new file mode 100644 index 00000000..3c39c387 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-prebuilt-qdoc.ps1 @@ -0,0 +1,44 @@ +############################################################################ +## +## Copyright (C) 2021 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\windows\helpers.ps1" + +# Installs prebuilt qdoc for creating documentation + +$url = "http://ci-files01-hki.intra.qt.io/input/windows/qdoc_for_ifw/qt-bin-5.12.7-x86-msvc2015_shared.zip" + +$destination = "C:\Windows\temp\qdoc.zip" + +Download $url $url $destination +Extract-7Zip "$destination" "C:\Utils" +Remove-Item -Path "$destination" -- cgit v1.2.3 From 66ed11f58bbd54671cb33ea83db8b4872fc7db76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 11 Feb 2021 11:36:45 +0200 Subject: Install static version of OpenSSL to Windows Building Qt with static runtime requires static libs of OpenSSL. Change-Id: Ifba2e88fefed341cafd804f29fe8dde7001eafa7 Reviewed-by: Toni Saario --- coin/provisioning/common/windows/openssl.ps1 | 65 ++++------------------------ 1 file changed, 9 insertions(+), 56 deletions(-) diff --git a/coin/provisioning/common/windows/openssl.ps1 b/coin/provisioning/common/windows/openssl.ps1 index 08f7d60f..15bca367 100644 --- a/coin/provisioning/common/windows/openssl.ps1 +++ b/coin/provisioning/common/windows/openssl.ps1 @@ -33,61 +33,14 @@ . "$PSScriptRoot\helpers.ps1" -# This script installs OpenSSL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine +# This script installs static OpenSSL . -$version = "1_1_1g" -$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" -$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" +# For static runtime build we need static only version from openssl libs +$static_lib_url = "http://ci-files01-hki.intra.qt.io/input/openssl/opensslx86_static-1-1.1d.7z" +$static_package = "C:\Windows\Temp\opensslx86_static-1-1.1d.7z" +Download $static_lib_url $static_lib_url $static_package +Extract-7Zip $static_package C:\Utils\ +Set-EnvironmentVariable "STATIC_OPENSSL_LIB_x86" "C:\Utils\opensslx86_static\lib" +Set-EnvironmentVariable "STATIC_OPENSSL_INCLUDE_x86" "C:\Utils\opensslx86_static\include" +Remove-Item -Path $static_package -if (Is64BitWinHost) { - - # 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 = "7643561c372720f55de51454a707ede334db086e" - - Write-Host "Fetching from URL ..." - Download $externalUrl $internalUrl $packagex64 - Verify-Checksum $packagex64 $sha1 - Write-Host "Installing $packagex64 ..." - Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - - Write-Host "Remove downloaded $packagex64 ..." - Remove-Item -Path $packagex64 - - Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg" - Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include" - Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib" -} - -# Install x86 bit version -$architecture = "x86" - -if (Is64BitWinHost) { - $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 = "c7d4b096c2413d1af819ccb291214fa3c4cece07" - -Write-Host "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -Write-Host "Installing $packagex86 ..." -Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -Write-Host "Remove downloaded $packagex86 ..." -Remove-Item -Path $packagex86 - -Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg" -Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include" -Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib" - -# Store version information to ~/versions.txt, which is used to print version information to provision log. -Write-Output "OpenSSL = $version" >> ~/versions.txt -- cgit v1.2.3 From 00527b1fb4494be11f526b8de260c92f61e2bf06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 1 Jun 2021 09:09:10 +0300 Subject: Remove Conan provisioning script It is breaking currently and it doesn't provide anything which IFW would need. Change-Id: Id2187fa98fb024921edeac9533396dd6caa27d37 Reviewed-by: Toni Saario --- .../qtci-windows-10-x86_64/11-conan.ps1 | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 deleted file mode 100644 index 4a7414d1..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ /dev/null @@ -1,53 +0,0 @@ -. "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86_64 ` - -Arch x86_64 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2015-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 14 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86_64 ` - -Arch x86_64 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir MSVC2017-x86 ` - -Arch x86 ` - -Compiler "Visual Studio" ` - -CompilerVersion 15 ` - -CompilerRuntime MD - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` - -Arch x86 ` - -Compiler "gcc" ` - -CompilerVersion 8 ` - -CompilerLibcxx "libstdc++" ` - -CompilerException "dwarf2" ` - -CompilerThreads "posix" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw-x86_64 ` - -Arch x86_64 ` - -Compiler "gcc" ` - -CompilerVersion 8 ` - -CompilerLibcxx "libstdc++" ` - -CompilerException "seh" ` - -CompilerThreads "posix" -- cgit v1.2.3 From 3fd82a915c141381bec6c937c988a6ad6aa81ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 1 Jun 2021 09:16:41 +0300 Subject: Add static-runtime configure argument Change-Id: I93b7b8bbe795a8a194ac34dca962ddd8956ec1a6 Reviewed-by: Katja Marttila --- coin/platform_configs/installer-framework.yaml | 2 +- coin/platform_configs/tqtc-installer-framework.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index 377bf750..5fc8af6b 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -6,7 +6,7 @@ Configurations: Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 3ff2dea7..432d59b2 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -7,7 +7,7 @@ Configurations: Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging', 'QtInstaller'] - Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl_static -llibcrypto_static -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - -- cgit v1.2.3 From 52bd6da0410a9fff28be04b386d323d72be83f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 1 Jun 2021 09:18:20 +0300 Subject: Hide LLVM_INSTALL_DIR from qdoc in Windows Currently provisioned libclang is not working with static runtime build in Windows. To allow integration to pass, we need to skip building of qdoc by hiding required libs from it. Change-Id: I2b2bbc20d1bb016552ed1b3d4e70dc9c0544fcce Reviewed-by: Katja Marttila --- coin/platform_configs/installer-framework.yaml | 2 +- coin/platform_configs/tqtc-installer-framework.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index 5fc8af6b..555b520f 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' - Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] + Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG='] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - Template: 'qtci-macos-10.13-x86_64-2' diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 432d59b2..45577e9a 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -8,7 +8,7 @@ Configurations: Target arch: 'x86' Features: ['Packaging', 'QtInstaller'] Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' - Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;'] + Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG='] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - Template: 'qtci-macos-10.13-x86_64-2' -- cgit v1.2.3 From 55a2b79e223aa2c39e3e78a2d3b1b1deb5c51b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 1 Mar 2021 10:16:11 +0200 Subject: Disable not needed platform configs from ifw specific branch While the branch is installer-framework specific, there is no need to re-verify such platform configurations which are not used by installer-framework. Change-Id: If7023b98e83167260e8d4a06a9575e3aaa75fe4c Reviewed-by: Qt CI Bot Reviewed-by: Katja Marttila --- coin/platform_configs/default.yaml | 172 ++----------------------- coin/platform_configs/installer-framework.yaml | 5 - coin/platform_configs/qt5.yaml | 126 ------------------ 3 files changed, 8 insertions(+), 295 deletions(-) delete mode 100644 coin/platform_configs/qt5.yaml diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4b023c13..e330772c 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,181 +1,25 @@ +Version: 2 +Module only: True +Configurations: - Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' -- - Template: 'qtci-windows-10-x86_64-16' - Target arch: 'x86' - Compiler: 'MSVC2017' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%' -- - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'MSVC2015' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'WinRT_10' - Target arch: 'x86' - Compiler: 'MSVC2015' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'WinRT_10' - Target arch: 'armv7' - Compiler: 'MSVC2015' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' -- - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'MSVC2017' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'Android_ANY' Target arch: 'x86' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' -- - Template: 'qtci-linux-Ubuntu-16.04-x86_64-2' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Features: ['OutOfSourceBuild', 'Documentation'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-opengl -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - -- - Template: 'qtci-linux-openSUSE-42.3-x86_64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-openSUSE-42.3-x86_64' - Compiler: 'ICC_18' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-openSUSE-42.3-x86_64' - Target os: 'WebAssembly' - Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' -- - Template: 'qtci-linux-SLES-12-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-SLES-15-x86_64' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' -- - Template: 'qtci-macos-10.13-x86_64-2' - Compiler: 'Clang' - Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' -- - Template: 'qtci-macos-10.12-x86_64-9' - Compiler: 'Clang' - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' + Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG='] + Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'IOS_ANY' - Target arch: 'multi' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'TvOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'WatchOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-freetype -prefix /Users/qt/work/install' - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'Android_ANY' - Target arch: 'x86' Compiler: 'GCC' - Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'armv7' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck'] -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'INTEGRITY_11_04' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index 555b520f..a2e3a823 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -19,11 +19,6 @@ Configurations: Compiler: 'GCC' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -qt-zlib -qt-libpng -qt-libjpeg -no-cups -openssl-linked -qt-xcb -no-icu -no-libudev -qt-pcre -no-glib -no-egl -no-sm -qt-harfbuzz -prefix /home/qt/work/install OPENSSL_LIBS="{{.Env.OPENSSL_HOME}}/lib/libssl.a {{.Env.OPENSSL_HOME}}/lib/libcrypto.a -ldl -lpthread" -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/libs' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Compiler: 'GCC' - Features: ['Documentation', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -qt-zlib -qt-libpng -qt-libjpeg -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml deleted file mode 100644 index d67738ab..00000000 --- a/coin/platform_configs/qt5.yaml +++ /dev/null @@ -1,126 +0,0 @@ -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'WinRT_10' - Compiler: 'MSVC2015' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'WinRT_10' - Target arch: 'x86' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017' -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' -- - Template: 'qtci-windows-10-x86_64-16' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'WinRT_10' - Target arch: 'armv7' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'WinRT_10' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch armeabi-v7a' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'QNX_700' - Target arch: 'x86' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-windows-10-x86_64-16' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-linux-RHEL-7.4-x86_64' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' -- cgit v1.2.3 From 5ba9b7c9799c3c20dd62ce8bf4316a79ee52a7cf Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 21 May 2021 15:22:46 +0300 Subject: Disable D3D12 on Windows IFW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If8264c87078ca5f3d883ecadebc70e435b06ef05 Reviewed-by: Simo Fält --- coin/platform_configs/installer-framework.yaml | 3 +++ coin/platform_configs/tqtc-installer-framework.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/coin/platform_configs/installer-framework.yaml b/coin/platform_configs/installer-framework.yaml index a2e3a823..dc3090e3 100644 --- a/coin/platform_configs/installer-framework.yaml +++ b/coin/platform_configs/installer-framework.yaml @@ -9,6 +9,9 @@ Configurations: Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG='] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] + QmakeArguments: [ + 'qtdeclarative': '-no-feature-d3d12' + ] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' diff --git a/coin/platform_configs/tqtc-installer-framework.yaml b/coin/platform_configs/tqtc-installer-framework.yaml index 45577e9a..6672a1b5 100644 --- a/coin/platform_configs/tqtc-installer-framework.yaml +++ b/coin/platform_configs/tqtc-installer-framework.yaml @@ -10,6 +10,9 @@ Configurations: Configure arguments: '-opensource -confirm-license -verbose -nomake examples -nomake tests -accessibility -static -release -no-sql-sqlite -no-icu -mp -openssl-linked OPENSSL_LIBS="-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32" -I %STATIC_OPENSSL_INCLUDE_x86% -L %STATIC_OPENSSL_LIB_x86% -prefix c:\Users\qt\work\install -static-runtime' Environment variables: ['TARGET_ARCHITECTURE=amd64_x86', 'PATH=%PATH%;%CI_JOM_PATH%;C:\Utils\gnuwin32\bin;', 'LLVM_INSTALL_DIR=', 'LLVM_INSTALL_DIR_msvc=', 'QDOC_USE_STATIC_LIBCLANG='] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat', 'amd64_x86'] + QmakeArguments: [ + 'qtdeclarative': '-no-feature-d3d12' + ] - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' -- cgit v1.2.3 From f7f32fa29339cb00e01ebcc9b976fee01832f553 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 4 Feb 2020 18:30:04 +0100 Subject: 08-pythondev build should not execute external script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The important bits of the script were copied and modified. NOTE that we no longer build openssl from source, the distro (SLES15) provides a version that works well. Task-number: QTQAINFRA-3528 Change-Id: Iad63d75055a7efc3e104789e4a515b8511cf0880 Reviewed-by: Heikki Halmet (cherry picked from commit db23c64876028d8c4584b58c049f0211764c775a) Reviewed-by: Arttu Tarkiainen Reviewed-by: Tony Sarajärvi --- .../qtci-linux-SLES-12-x86_64/08-pythondev.sh | 45 +++++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh index cc9385e9..ab35a009 100755 --- a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -41,12 +41,45 @@ set -ex sudo zypper -nq install python-devel -wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh -sed -i 's/12.3/12.4/g' build_python3.sh -bash build_python3.sh +# Selected installation instructions coming from: +# https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh +export PACKAGE_NAME="python" +export PACKAGE_VERSION="3.7.2" +( -export -python3 --version + sudo zypper install -y gcc gcc-c++ make ncurses patch wget tar zlib-devel zlib libffi-devel libopenssl-devel + + printf -- 'Configuration and Installation started \n' + + #Downloading Source code + wget "https://www.python.org/ftp/${PACKAGE_NAME}/${PACKAGE_VERSION}/Python-${PACKAGE_VERSION}.tar.xz" + tar -xvf "Python-${PACKAGE_VERSION}.tar.xz" + + #Configure and Build + cd "Python-${PACKAGE_VERSION}" + ./configure --prefix=/usr/local --exec-prefix=/usr/local + make + sudo make install + + export PATH="/usr/local/bin:${PATH}" + printf -- '\nInstalled python successfully \n' + + #Cleanup + cd - + rm "Python-${PACKAGE_VERSION}.tar.xz" + + #Verify python installation + if command -V "$PACKAGE_NAME"${PACKAGE_VERSION:0:1} >/dev/null + then + printf -- "%s installation completed. Please check the Usage to start the service.\n" "$PACKAGE_NAME" + else + printf -- "Error while installing %s, exiting with 127 \n" "$PACKAGE_NAME" + exit 127 + fi +) + + +python3 --version | fgrep "$PACKAGE_VERSION" pip3 install --user wheel pip3 install --user virtualenv -- cgit v1.2.3 From 0253936025da524ab8a510cad65fc9243b48dc6f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 26 Aug 2021 12:48:33 +0300 Subject: Provisioning: Add needed packages for supporting libarchive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required by IFW Task-number: QTIFW-2310 Change-Id: Iade1ff6339bfe43f3f35486377f6c77ae593cec3 Reviewed-by: Tony Sarajärvi --- .../04-install-packages.sh | 4 ++ coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh | 52 -------------------- coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh | 42 ++++++++++++++++ .../qtci-macos-10.13-x86_64/35-libiconv.sh | 5 ++ .../qtci-windows-10-x86_64/35-bzip2.ps1 | 53 ++++++++++++++++++++ coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1 | 56 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/35-zlib.ps1 | 54 +++++++++++++++++++++ 7 files changed, 214 insertions(+), 52 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index e0810b74..cbe4e512 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -115,6 +115,10 @@ installPackages+=(unixODBC-devel) installPackages+=(unixODBC) # Vulkan support installPackages+=(vulkan-devel) +# IFW +installPackages+=(zlib-devel) +installPackages+=(lzma) +installPackages+=(bzip2-devel) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh deleted file mode 100755 index 9a667c64..00000000 --- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs XZ-Utils - -# XZ-Utils are needed for uncompressing xz-compressed files - -set -ex - -# shellcheck source=../common/macos/InstallPKGFromURL.sh -source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" - -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" -AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" -SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" -DestDir="/" - -InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" - -echo "XZ = 5.0.7" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh new file mode 100755 index 00000000..b2766808 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-xz.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs XZ + +# XZ are needed for uncompressing xz-compressed files + +set -ex + +brew install xz diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh new file mode 100755 index 00000000..d02cea5c --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-libiconv.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex +# Needed by IFW +brew install libiconv; brew unlink libiconv diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1 new file mode 100644 index 00000000..1054a1f5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/35-bzip2.ps1 @@ -0,0 +1,53 @@ +############################################################################ +## +## Copyright (C) 2021 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\windows\helpers.ps1" + +# This script will install prebuilt PZIB2 for IFW + +# Prebuilt instructions: +# Download https://www.sourceware.org/pub/bzip2/bzip2-latest.tar.gz +# Extract to C:\Utils +# cd C:\Utils\bzip2-$version +# Run in powershell: (Get-Content C:\Utils\bzip2-$version\makefile.msc) | ForEach-Object { $_ -replace "-DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo", "-DWIN32 -MT -Ox -D_FILE_OFFSET_BITS=64 -nologo" } | Set-Content C:\Utils\bzip2-$version\makefile.msc +# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +# nmake -f makefile.msc + +$version = "1.0.8" +$sha1 = "4397208f4c4348d6662c9aa459cb3e508a872d42" +Download http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/bzip2-$version-prebuilt.zip C:\Windows\Temp\bzip2-$version.zip +Verify-Checksum "C:\Windows\Temp\bzip2-$version.zip" "$sha1" +Extract-7Zip "C:\Windows\Temp\bzip2-$version.zip" C:\Utils +Remove-Item -Path "C:\Windows\Temp\bzip2-$version.zip" + +Write-Output "Bzip2 = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1 new file mode 100644 index 00000000..be464515 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/35-xz.ps1 @@ -0,0 +1,56 @@ +############################################################################ +## +## Copyright (C) 2021 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\windows\helpers.ps1" + +# This script will install prebuilt XZ for IFW + +# Prebuilt instructions: +# Download http://ci-files01-hki.intra.qt.io/input/windows/xz-5.2.5.zip or from original donwload page https://tukaani.org/xz/ +# Extract to C:\Utils +# mkdir C:\Utils\xz-5.2.5\windows\vs2015 +# cd C:\Utils\xz-$version +# copy "C:\Utils\xz-$version\windows\vs2017\*" "C:\Utils\xz-$version\windows\vs2015\" +# Run in powershell: (Get-Content C:\Utils\xz-$version\windows\vs2015\liblzma.vcxproj) | ForEach-Object { $_ -replace "v141", "v140" } | Set-Content C:\Utils\xz-$version\windows\vs2015\liblzma.vcxproj +# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +# msbuild /property:Configuration=ReleaseMT windows/vs2015/liblzma.vcxproj + +$version = "5.2.5" +$sha1 = "75570c1826428cfd86efd9835e342334f1493f7b" +Download http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/xz-$version-prebuilt.zip C:\Windows\Temp\xz-$version.zip +Verify-Checksum "C:\Windows\Temp\xz-$version.zip" "$sha1" +Extract-7Zip "C:\Windows\Temp\xz-$version.zip" C:\Utils +Remove-Item -Path "C:\Windows\Temp\xz-$version.zip" + +Write-Output "XZ = $version" >> ~\versions.txt + diff --git a/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1 b/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1 new file mode 100644 index 00000000..a47d9dc2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/35-zlib.ps1 @@ -0,0 +1,54 @@ +############################################################################ +## +## Copyright (C) 2021 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\windows\helpers.ps1" + +# This script will install prebuilt ZLIB for IFW + +# Prebuilt instructions: +# Download https://zlib.net/zlib1211.zip +# Extract to C:\Utils +# cd C:\Utils\zlib-$version +# (Get-Content C:\Utils\zlib-$version\win32\makefile.msc) | ForEach-Object { $_ -replace "-MD -W3 -O2 -Oy- -Zi", "-MT -W3 -O2 -Oy- -Zi" } | Set-Content C:\Utils\zlib-$version\win32\makefile.msc +# "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +# nmake -f win32\makefile.msc + +$version = "1.2.11" +$sha1 = "e1992ff9ad58ad6631a84c1557e2a158ec90c5ce" +Download http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-prebuilt.zip http://ci-files01-hki.intra.qt.io/input/windows/zlib-$version-prebuilt.zip C:\Windows\Temp\zlib-$version.zip +Verify-Checksum "C:\Windows\Temp\zlib-$version.zip" "$sha1" +Extract-7Zip "C:\Windows\Temp\zlib-$version.zip" C:\Utils +Remove-Item -Path "C:\Windows\Temp\zlib-$version.zip" + +Write-Output "ZLIB = $version" >> ~\versions.txt + -- cgit v1.2.3