From 9929aff99ec02ed57ad9693b22eb4a84ac1388c5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2019 11:41:31 +0300 Subject: Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build After adding "-force-debug-info" and "-separate-debug-info" debug information is going in the binaries accidentally & so on exploding binary size. Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as configure argument will prevent debug information not to go inside binaries. Task-number: QTBUG-69767 Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 640196ad..e03cc56d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -79,7 +79,7 @@ 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' + 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' -- cgit v1.2.3 From fbec569aea2de9da30cb4b3820d35912797e9105 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Aug 2019 07:59:37 +0000 Subject: Update submodules on '5.12' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I363647bd417426f6f3629f42bbd1f6e83570c47e Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtmultimedia | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 36cc171b..6ce9404a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36cc171b9314bf77fc84d4273dceb6264aef7134 +Subproject commit 6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52 diff --git a/qtmultimedia b/qtmultimedia index 636f46f0..70ad7699 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 636f46f04ba6d5c63783558ed78eb5f562179e9c +Subproject commit 70ad769934d9c82e1d1dd11e96386ce59db7631e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a826da7d..47d15b13 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a826da7d9bee9bd96c84ceaba5f102f66fc538cd +Subproject commit 47d15b1378621041f612b395ded685fa4e6fbbd0 -- cgit v1.2.3 From 3b0fbe7213fae9b9e891511d3aecce5183b57e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 4 Sep 2018 12:09:08 +0300 Subject: Provisioning: Ubuntu 18.04: Add required packages for b2qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These packages are required for building b2qt module. Needed also on 5.12 branch as meta-qt5 follows Qt branching and will take provisionings from here. Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3 Reviewed-by: Samuli Piippo (cherry picked from commit ee9dd0d8601bbe252a6a99e44a3376016911f1b0) Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index d6c04d5b..c85c989d 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -159,6 +159,11 @@ installPackages+=(dkms) installPackages+=(libspeechd-dev) #Pypdf for PDF reading in RTA tests installPackages+=(python-pypdf2) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) echo "Running update for apt" waitLoop -- cgit v1.2.3 From b96719cb80078cad1f740b413edcee65f81116b5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Aug 2019 18:43:54 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I465bd3b417d3412d7d8d62d868aa8ccb338127f2 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 6ce9404a..7f4f346e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52 +Subproject commit 7f4f346e51b0479a0ab0b927e586e6c626028b4b diff --git a/qtdeclarative b/qtdeclarative index 0647df8c..1adbf16f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0647df8c88d4eaeedd19456b6e382308208e2be1 +Subproject commit 1adbf16f2526b797a70bccf21b1400451f9d4cbb diff --git a/qtmultimedia b/qtmultimedia index 70ad7699..075fa620 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 70ad769934d9c82e1d1dd11e96386ce59db7631e +Subproject commit 075fa6203856bdf9f58e737ee2f5d2a843a85cad diff --git a/qtwayland b/qtwayland index 5ca9f28f..25a46893 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5ca9f28f4b272d3265b97c16029071a0070195a6 +Subproject commit 25a46893782979c74f57ab725b1ce55fbfc4fa2f -- cgit v1.2.3 From 24f0367a60fdd3379014e507fa7f4553d433c601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 27 Feb 2019 13:22:06 +0200 Subject: Add Suse Linux Enteprise Server 12 to the CI Task-number: QTQAINFRA-2851 Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 ++ .../common/linux/disable-notifications.sh | 4 +- .../qtci-linux-SLES-12-x86_64/01-systemsetup.sh | 69 ++++++++++++++++ .../02-disable-gnome-notifications.sh | 4 + .../qtci-linux-SLES-12-x86_64/02-disable-ntp.sh | 3 + .../qtci-linux-SLES-12-x86_64/02-zypperpackages.sh | 96 ++++++++++++++++++++++ .../qtci-linux-SLES-12-x86_64/08-libclang.sh | 7 ++ .../qtci-linux-SLES-12-x86_64/08-pythondev.sh | 59 +++++++++++++ .../qtci-linux-SLES-12-x86_64/09-cmake.sh | 5 ++ .../09-install-openssl.sh | 6 ++ .../qtci-linux-SLES-12-x86_64/18-icc.sh | 86 +++++++++++++++++++ .../qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh | 37 +++++++++ .../qtci-linux-SLES-12-x86_64/55-emsdk.sh | 39 +++++++++ .../qtci-linux-SLES-12-x86_64/90-squish.sh | 4 + .../qtci-linux-SLES-12-x86_64/99-unset-proxy.sh | 39 +++++++++ .../qtci-linux-SLES-12-x86_64/99-version.sh | 48 +++++++++++ 16 files changed, 509 insertions(+), 2 deletions(-) create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e03cc56d..5ed26734 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -75,6 +75,11 @@ 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-RHEL-7.4-x86_64' Compiler: 'GCC' diff --git a/coin/provisioning/common/linux/disable-notifications.sh b/coin/provisioning/common/linux/disable-notifications.sh index 7e805833..28d21656 100755 --- a/coin/provisioning/common/linux/disable-notifications.sh +++ b/coin/provisioning/common/linux/disable-notifications.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -sudo gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false -sudo gsettings set org.gnome.desktop.notifications show-banners false +gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false +gsettings set org.gnome.desktop.notifications show-banners false diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..0bf3ce24 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' + +sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc + +while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sleep 0.5 +done + +# shellcheck disable=SC2031 +if [ "$http_proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..38707a8a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh new file mode 100755 index 00000000..cdea163f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +sudo zypper -nq install git gcc gcc-c++ + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +sudo zypper -nq install p7zip + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + +# gtk3 style for QtGui/QStyle +sudo zypper -nq install gtk3-devel + +# Xinput2 +sudo zypper -nq install libXi-devel postgresql10 postgresql10-devel mysql-devel mysql mysql-server + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu52_1 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +# speech-dispatcher +sudo zypper -nq install libspeechd-devel +# https://bugzilla.suse.com/show_bug.cgi?id=1129586 +sudo mv /usr/include/speech-dispatcher/speech-dispatcher/* /usr/include/speech-dispatcher/ + +# ODBC support +sudo zypper -nq install unixODBC-devel unixODBC + +# freetds support +sudo zypper -nq install libfreetds freetds-devel + +# sqlite2 support +sudo zypper -nq install sqlite2 sqlite2-devel + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh new file mode 100755 index 00000000..bbe2b4b4 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" 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 new file mode 100755 index 00000000..cc9385e9 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +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 + +export +python3 --version + +pip3 install --user wheel +pip3 install --user virtualenv + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh new file mode 100755 index 00000000..5eb53566 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" 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 new file mode 100755 index 00000000..7ab8528a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install Intel Parallel Studio XE Composer Edition for C++ Linux + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" +localMount="/mnt/storage/" + +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackageSource="$localMount/intel/$iccPackage" +iccInstallPath="/opt/intel" +iccTmpPath="/tmp/icc" + +iccLicense="l_icc_2018.lic" +iccLicenseSource="$localMount/semisecure/$iccLicense" +iccLicenseTarget="/home/qt/$iccLicense" + +iccInstallInstructions="$iccTmpPath/instructions.txt" + +sudo mkdir -p "$localMount" +sudo mount "$mainStorage" "$localMount" +mkdir -p "$iccTmpPath" +tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 + +cp "$iccLicenseSource" "$iccLicenseTarget" + +sudo umount "$localMount" + +cat >"$iccInstallInstructions" <>~/.bashrc +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt + +rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh new file mode 100755 index 00000000..09a76778 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh @@ -0,0 +1,39 @@ +#!/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/linux/emsdk.sh +source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh @@ -0,0 +1,48 @@ +#!/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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" -- cgit v1.2.3 From 8e32f46764ec8b06ac1ce4cc4e3a70580328ce23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Mar 2019 12:02:57 +0200 Subject: Add Suse Linux Enteprise Server 15 to the CI Task-number: QTQAINFRA-3123 Change-Id: I725c58c7d319945f7470118dec99b5360385da7b Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 ++ .../provisioning/common/linux/disable-ntp_linux.sh | 2 + .../qtci-linux-SLES-15-x86_64/01-systemsetup.sh | 71 ++++++++++++++++ .../02-disable-gnome-notifications.sh | 4 + .../qtci-linux-SLES-15-x86_64/02-disable-ntp.sh | 3 + .../qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 94 ++++++++++++++++++++++ .../qtci-linux-SLES-15-x86_64/08-libclang.sh | 7 ++ .../qtci-linux-SLES-15-x86_64/08-pythondev.sh | 58 +++++++++++++ .../09-install-openssl.sh | 6 ++ .../qtci-linux-SLES-15-x86_64/18-icc.sh | 86 ++++++++++++++++++++ .../qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh | 37 +++++++++ .../qtci-linux-SLES-15-x86_64/55-emsdk.sh | 39 +++++++++ .../qtci-linux-SLES-15-x86_64/90-squish.sh | 4 + .../qtci-linux-SLES-15-x86_64/99-unset-proxy.sh | 39 +++++++++ .../qtci-linux-SLES-15-x86_64/99-version.sh | 48 +++++++++++ 15 files changed, 503 insertions(+) create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5ed26734..cc1f7083 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -80,6 +80,11 @@ 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' diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index b73e44a5..4ded6042 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -39,6 +39,8 @@ echo "Disable Network Time Protocol (NTP)" if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false +elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then + sudo timedatectl set-ntp false else (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..ee0b6894 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' + +sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc + +sudo systemctl stop packagekit +sudo systemctl disable packagekit +while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sleep 5 +done + +# shellcheck disable=SC2031 +if [ "$http_proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..38707a8a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh new file mode 100755 index 00000000..080bc43b --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -0,0 +1,94 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +sudo zypper -nq install git gcc gcc-c++ + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +sudo zypper -nq install cmake + +sudo zypper -nq install p7zip + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + +# gtk3 style for QtGui/QStyle +sudo zypper -nq install gtk3-devel + +# Xinput2 +sudo zypper -nq install libXi-devel postgresql10 postgresql10-devel mysql-devel mysql mysql-server + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu60_2 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +# speech-dispatcher +sudo zypper -nq install libspeechd-devel +#sudo sed -i 's:includedir=/usr/include:includedir=/usr/include/speech-dispatcher:' /usr/lib64/pkgconfig/speech-dispatcher.pc + +# ODBC support +sudo zypper -nq install unixODBC-devel unixODBC + +# sqlite support +sudo zypper -nq install sqlite3 sqlite3-devel + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh new file mode 100755 index 00000000..bbe2b4b4 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh new file mode 100755 index 00000000..cda48de7 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh @@ -0,0 +1,58 @@ +#!/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$ +## +############################################################################# + +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +set -ex + +sudo zypper -nq install python-devel + +wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh +bash build_python3.sh + +export +python3 --version + +pip3 install --user wheel +pip3 install --user virtualenv + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" 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 new file mode 100755 index 00000000..7ab8528a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh @@ -0,0 +1,86 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install Intel Parallel Studio XE Composer Edition for C++ Linux + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" +localMount="/mnt/storage/" + +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackageSource="$localMount/intel/$iccPackage" +iccInstallPath="/opt/intel" +iccTmpPath="/tmp/icc" + +iccLicense="l_icc_2018.lic" +iccLicenseSource="$localMount/semisecure/$iccLicense" +iccLicenseTarget="/home/qt/$iccLicense" + +iccInstallInstructions="$iccTmpPath/instructions.txt" + +sudo mkdir -p "$localMount" +sudo mount "$mainStorage" "$localMount" +mkdir -p "$iccTmpPath" +tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 + +cp "$iccLicenseSource" "$iccLicenseTarget" + +sudo umount "$localMount" + +cat >"$iccInstallInstructions" <>~/.bashrc +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt + +rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh new file mode 100755 index 00000000..09a76778 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh @@ -0,0 +1,39 @@ +#!/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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/linux/emsdk.sh +source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh @@ -0,0 +1,48 @@ +#!/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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" -- cgit v1.2.3 From 53c6c8a1ba7917f49de686acdd6d4df081aa6fd5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 22:30:51 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Id2425a28299ca3653bc7d217855c276493bbccfe Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 7f4f346e..0d024bd0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7f4f346e51b0479a0ab0b927e586e6c626028b4b +Subproject commit 0d024bd0a63fa7a741f4f118a3b48806b695594f diff --git a/qtmultimedia b/qtmultimedia index 075fa620..9fba45e9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 075fa6203856bdf9f58e737ee2f5d2a843a85cad +Subproject commit 9fba45e999f7c65f3cecf8fc914befd3d8b6db80 diff --git a/qtwayland b/qtwayland index 25a46893..43d8a309 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 25a46893782979c74f57ab725b1ce55fbfc4fa2f +Subproject commit 43d8a3091894ceb4ab934167b2f3eda27564eb6d -- cgit v1.2.3 From 9d69ef09e34c554633d6e4a6d97761bebd5f61a9 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Wed, 5 Jun 2019 14:44:09 +0300 Subject: Add Packaging to Saferenderer static builds Task-number: QSR-432 Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3 Reviewed-by: Iikka Eklund --- coin/platform_configs/qtsaferenderer.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index c2bc05e0..031d31ff 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,9 +5,10 @@ - Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -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% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' -- cgit v1.2.3 From 965653136183870854739a0b3d284719ac15d3cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Aug 2019 23:30:59 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I8de6a77d460db6497b76dac92be674fe9e790b7d Reviewed-by: Qt Submodule Update Bot --- qtandroidextras | 2 +- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index a50f613a..9039930c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a50f613a37acf32886ab94c0be780c1f25493d52 +Subproject commit 9039930c44d94fd101c260ef3abde680fc369501 diff --git a/qtbase b/qtbase index 0d024bd0..257bd49c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d024bd0a63fa7a741f4f118a3b48806b695594f +Subproject commit 257bd49c1f47ba5fca6930082fdcf108f9d24e3f diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 diff --git a/qttools b/qttools index a690022b..40a7f2c6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a690022b7e56b2e36a95ef22b854af4c82c5fdc8 +Subproject commit 40a7f2c6469e1702e791c66414051fed385a7930 diff --git a/qtwayland b/qtwayland index 43d8a309..3e96fa1d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 43d8a3091894ceb4ab934167b2f3eda27564eb6d +Subproject commit 3e96fa1df8d2bc0ec8ab66abae1f20439b786b40 -- cgit v1.2.3 From 61acd9e95d86c71833e41ab95aec226034024803 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 12 Aug 2019 16:09:31 +0300 Subject: Provisioning: Update iOS signing tools new apple id is required with notarization Task-number: QTBUG-77359 Change-Id: I2aafda37d40608296d598b1d9ade83a025bcac8d Reviewed-by: Iikka Eklund --- .../provisioning/qtci-macos-10.13-x86_64/55-signtools.sh | 16 ++++++++-------- .../provisioning/qtci-macos-10.14-x86_64/55-signtools.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index 0b8595a0..aa61f549 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment_2019.p12" -shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iosDevelopment2019CiTeam.p12" +shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution_2019.p12" -shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iosDistribution2019CiTeam.p12" +shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" -Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" +Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh index 0b8595a0..aa61f549 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment_2019.p12" -shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iosDevelopment2019CiTeam.p12" +shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution_2019.p12" -shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iosDistribution2019CiTeam.p12" +shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" -Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" +Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" -- cgit v1.2.3 From 6e601907b9f92d0ca104c35d5f403654cbc93e81 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Aug 2019 23:31:00 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Icd7419b3717c164db5f978610a2e821b683d8b22 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtscxml | 2 +- qttools | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 257bd49c..fc049052 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 257bd49c1f47ba5fca6930082fdcf108f9d24e3f +Subproject commit fc049052812bfa0b63af1f3c5fcadf1eb582e775 diff --git a/qtscxml b/qtscxml index db44c53e..9bba89da 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit db44c53e73479ee8ea98f911078b387735906f38 +Subproject commit 9bba89da77b73f016f22bc5d3f195d9c0212c7bc diff --git a/qttools b/qttools index 40a7f2c6..a8aa0849 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 40a7f2c6469e1702e791c66414051fed385a7930 +Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 diff --git a/qtwayland b/qtwayland index 3e96fa1d..37a03693 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3e96fa1df8d2bc0ec8ab66abae1f20439b786b40 +Subproject commit 37a03693f22cba7a17a5e7bdc3c340e7646aa6ef -- cgit v1.2.3 From 8a5d86d88826cd4db6e3993d8fcb14db0bbab015 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 20 Aug 2019 09:49:21 +0300 Subject: Suppress QEMU syscall and ioctl debug messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compile QEMU with "Unsupported syscall" and "Unsupported ioctl" messages suppressed, those can be shown by set/unset environment variable QEMU_SYSCALL_DEBUG. Task-number: QTQAINFRA-2808 Change-Id: If0b28c47f2599c4ebca9cae6a6d38f9a4fd00458 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index 4ca84072..9a4558e2 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -121,6 +121,43 @@ index 11a311f9db..94d8abc745 100644 2.17.1 EOT +patch -p1 < +Date: Tue, 20 Aug 2019 09:46:46 +0300 +Subject: [PATCH] Suppress unsupported syscall and ioctl debug messages + +Those messages were spamming the CI tests output, thus they can +only be shown by defining environment variable QEMU_SYSCALL_DEBUG=true + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 94d8abc745..e72cfb0cb5 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -5479,7 +5479,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) + ie = ioctl_entries; + for(;;) { + if (ie->target_cmd == 0) { +- gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); ++ if (getenv("QEMU_SYSCALL_DEBUG")) ++ gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); + return -TARGET_ENOSYS; + } + if (ie->target_cmd == cmd) +@@ -12172,7 +12173,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + + default: + unimplemented: +- gemu_log("qemu: Unsupported syscall: %d\n", num); ++ if (getenv("QEMU_SYSCALL_DEBUG")) ++ gemu_log("qemu: Unsupported syscall: %d\n", num); + #if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname) || defined(TARGET_NR_set_robust_list) + unimplemented_nowarn: + #endif +-- +2.17.1 +EOT + ./configure --target-list=arm-linux-user,aarch64-linux-user --static --disable-werror make sudo make install -- cgit v1.2.3 -- cgit v1.2.3 From 98d9e2ebaa16e0d070c65e50158985fd3b9cb9be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Aug 2019 23:30:59 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I0fafe70aa1dcb74cd6e06eb37dca1175a50c568e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 6388eb98..29541954 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 +Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 diff --git a/qtbase b/qtbase index fc049052..96ff6e8e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc049052812bfa0b63af1f3c5fcadf1eb582e775 +Subproject commit 96ff6e8ebe80215a0d35055c7382bb1cf58fc660 diff --git a/qtdeclarative b/qtdeclarative index 1adbf16f..4d080635 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1adbf16f2526b797a70bccf21b1400451f9d4cbb +Subproject commit 4d080635872fbb77a2adfb736d3f108b62cc058a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index f9664053..718d2ec5 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit f9664053132affe48a069235eb6561a32d38b2a7 +Subproject commit 718d2ec554185f91db8e57e6ece14c7cf1b4caef diff --git a/qtlocation b/qtlocation index 63cd689a..aa8bb4d6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 63cd689a400ee57f7e898e81290366c266537982 +Subproject commit aa8bb4d64864e0c3cfb9374a367e783602b75eba diff --git a/qtmultimedia b/qtmultimedia index 9fba45e9..a409efbc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9fba45e999f7c65f3cecf8fc914befd3d8b6db80 +Subproject commit a409efbc5530ad1e8becb018e1ad3319b931b2f3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da06da57..62c45cdc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da06da57002b64cf4bcde0ca708b3275a5f919ae +Subproject commit 62c45cdcd48e436c7d81d668b4da36c30928f871 diff --git a/qtwayland b/qtwayland index 37a03693..f5a28afe 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 37a03693f22cba7a17a5e7bdc3c340e7646aa6ef +Subproject commit f5a28afe4c2cb82540c94616e7a9e3e72e0e8327 diff --git a/qtwebengine b/qtwebengine index a2c365cb..5c579b95 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 +Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 -- cgit v1.2.3 From 11d6401d9855e765c8d37ca323bacccdc1c97c24 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 22 Aug 2019 12:09:58 +0300 Subject: Update Saferenderer static builds DisableTests on qtci-windows-10-x86_64-10 Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64 Task-number: QSR-432 Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 031d31ff..42325b6d 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,10 +5,10 @@ - Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' - Features: ['Packaging'] + Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -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% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -qt-libpng' -- cgit v1.2.3 From 90d59cb4c70b455656400fee74057d6793989339 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 26 Aug 2019 22:07:18 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I7f044a3d3a1aed8d1f9b97a1e73871ea91e9719e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 29541954..855295c3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 +Subproject commit 855295c3748239ae65e874b579f5449e4ea6723f diff --git a/qtbase b/qtbase index 96ff6e8e..b3dc0c13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 96ff6e8ebe80215a0d35055c7382bb1cf58fc660 +Subproject commit b3dc0c13e88f3bd859c96144a9d4280c675665bc diff --git a/qtdeclarative b/qtdeclarative index 4d080635..4b944cb6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4d080635872fbb77a2adfb736d3f108b62cc058a +Subproject commit 4b944cb61fb3ceee2f1b743823e4a83b686bafd6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 62c45cdc..5189f2bc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 62c45cdcd48e436c7d81d668b4da36c30928f871 +Subproject commit 5189f2bc470da7ff6ae83d0108dd4e6abf35e04e diff --git a/qtremoteobjects b/qtremoteobjects index 2bcda9d9..47c6aa50 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2bcda9d9f45858ac196d9972162c870ac0a6f217 +Subproject commit 47c6aa50d0423b6ccc40abdc16556d60d4fa9342 -- cgit v1.2.3 From 163bd8006e32184ad77654dd36d3cba417c65028 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 27 Aug 2019 11:20:22 +0300 Subject: Update Saferenderer static builds qtci-windows-10-x86_64-10 static build: remove flag '-developer-build' qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig' and '-qt-freetype', remove flag '-developer-build' Task-number: QSR-491 Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc Reviewed-by: Samuli Piippo --- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 42325b6d..f0d33f8a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -6,9 +6,9 @@ Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -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% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -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% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' -- cgit v1.2.3