From 5958b8d3f0bded6c3839f7919d181bca68e222ad Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 20 Jul 2017 13:47:19 +0200 Subject: Turn off line ending conversion for .commit-template When committing a change, the automatically generated git commit message consists of 1) The content of .commit-template 2) Informative text for the current commit, generated by git. While 2) always has LF line endings, even on Windows, 1) might have CRLF line endings if core.autocrlf=true. The result is a text with mixed line endings. With the default editor vim, every line of the commit template part ends with ^M. Fix this by forcing the line endings of .commit-template to be LF regardless of core.autocrlf. Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576 Reviewed-by: Simon Hausmann Reviewed-by: Oliver Wolff Reviewed-by: Oswald Buddenhagen --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 084cdfd6..11a643c0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ .tag export-subst .gitignore export-ignore .gitattributes export-ignore -.commit-template export-ignore +.commit-template export-ignore eol=lf init-repository export-ignore README.git export-ignore -- cgit v1.2.3 From 74fa40d9789b1f0b50051eb8c372f3c104b89b38 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 24 Jul 2017 15:01:09 +0200 Subject: Replace QNX7 target with QNX6.6 for all Qt modules Reason being that it's much easier to trigger compile errors with the QNX6.6 toolchain than with the newer QNX7, so these show up at once and not only at qt5.git integration. Task-number: QTBUG-62047 Change-Id: Ib45728c92488206dbede019e4583bc9a5386b90f Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 7ee4df05..e2fbebd1 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -20,4 +20,4 @@ qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index fec2a44c..0b38af20 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -15,8 +15,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -- cgit v1.2.3 From 36d7e7a8da5053cdf77c95eba1da896f09ee0294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 15 Jun 2017 12:52:46 +0300 Subject: Update Xcode to 8.3.3 in macOS 10.12 Change-Id: I990d2ac89044a5afc6170da9f5c22bc144021036 Reviewed-by: Simon Hausmann Reviewed-by: Jake Petroules --- coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index 97ce19ba..ea8613ad 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -48,4 +48,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz 8.2.1 +InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 -- cgit v1.2.3 From c60e90a2c8f6a55eb4edf2c2ff8eda50970a14dc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 31 Jul 2017 14:50:00 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e90d083f..2c8d4135 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e90d083fa87e7c94b2391f894b1466976688916f +Subproject commit 2c8d413510b7b7897f308873b78622395c891d27 diff --git a/qtdeclarative b/qtdeclarative index caa273e3..7ed7f10b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit caa273e3bc6a2bece76c190b4135103eb7bbeab9 +Subproject commit 7ed7f10b9e3a345b6125602910b02afd7fdeb026 diff --git a/qtrepotools b/qtrepotools index 8980e505..6d98fbe0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8980e505b5cdc8b6b9beb397887dc743dfc845c4 +Subproject commit 6d98fbe0f35d2d525541c532d9a758f46681fc19 diff --git a/qtwebengine b/qtwebengine index e4ae85ee..ee719ad3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e4ae85ee05d1eca3f58e34d3d0f594c01216e163 +Subproject commit ee719ad313e564d4e6f06d74b313ae179169466f -- cgit v1.2.3 From 830f8ac7f2d575cf2d3cdbcbf9bb86cc56a7d67e Mon Sep 17 00:00:00 2001 From: Harald Vistnes Date: Tue, 1 Aug 2017 23:24:12 +0200 Subject: Make Qt3D depend on qtbase and optionally on qtdeclarative This change will make the pure C++ libs of Qt3D be built even if qtdeclarative is skipped. Task-number: QTBUG-62256 Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6 Reviewed-by: Thiago Macieira Reviewed-by: Sean Harmer --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 145fac4f..9ea5c3b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,8 +146,8 @@ branch = 5.9 status = addon [submodule "qt3d"] - depends = qtdeclarative - recommends = qtimageformats qtgamepad + depends = qtbase + recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = 5.9 -- cgit v1.2.3 From d1d36cbbf181cd9d5f63950265db23d39a6375f5 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 22 Jun 2017 14:49:39 +0200 Subject: Add Documentation feature to one Ubuntu 14.04 build When creating packages, we build the docs on one configuration. Previously that was done by magic inside the continuous integration system. Make it a bit less magic by having a flag for it. Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 3da4c983..b1e90fc4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -11,7 +11,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release -- cgit v1.2.3 From 49ccf716dca2a14d21ce6869cdcd64b861c53834 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 25 Jul 2017 16:42:44 +0200 Subject: Remove unused provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt 5.6 branch. Let's remove the scripts to avoid confusion. Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc Reviewed-by: Simo Fält Reviewed-by: Oswald Buddenhagen --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 5 -- .../qtci-linux-RHEL-7.2-x86_64/09-cmake.sh | 53 ---------------------- .../001-suppress-shutdown-indicator.sh | 4 -- .../001-suppress-shutdown-indicator.sh | 4 -- .../003-apt-update.sh | 2 - .../006-qt-build-dependencies.sh | 46 ------------------- .../qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh | 53 ---------------------- 7 files changed, 167 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh deleted file mode 100644 index ad1bf18f..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh +++ /dev/null @@ -1,5 +0,0 @@ -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -sudo subscription-manager refresh -sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh deleted file mode 100644 index dd35e01d..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh deleted file mode 100644 index f11263b7..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -# Disable questions on shutdown. -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh deleted file mode 100644 index f11263b7..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -# Disable questions on shutdown. -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh deleted file mode 100644 index 2f7e2e47..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -sudo apt-get update diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh deleted file mode 100644 index 30a6caad..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -sudo apt-get -y build-dep qt5-default - -# qtbase -sudo apt-get -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev -sudo apt-get -y install libxcb-xinerama0-dev libdbus-1-dev libatspi2.0-dev - -# qtmultimedia -sudo apt-get -y install libasound2-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev - -# qtwebengine -sudo apt-get -y install libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh deleted file mode 100644 index dd35e01d..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc -- cgit v1.2.3 From 55227444e35f5b6c346d0919f589471b599b758c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 4 Aug 2017 21:22:15 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6 Reviewed-by: Simon Hausmann --- qtconnectivity | 2 +- qtwebengine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index 825c0c8d..f7bfd2ad 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 825c0c8d54a7009c6af5cb73736138150cc5cc63 +Subproject commit f7bfd2adb82e3a8797e168a37287510e4a004b2e diff --git a/qtwebengine b/qtwebengine index ee719ad3..04fa812e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ee719ad313e564d4e6f06d74b313ae179169466f +Subproject commit 04fa812ef5025aa991d9a79dd26e9ecfcb3182a1 -- cgit v1.2.3 From d841f901224f7c8f12164a5f25e017dd5ed3743d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 6 Aug 2017 11:11:04 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e Reviewed-by: Simon Hausmann --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 2c8d4135..df6f5383 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2c8d413510b7b7897f308873b78622395c891d27 +Subproject commit df6f538391a32781762288e9aac16aaa288e6957 -- cgit v1.2.3 From e4ba13a0380b2f609313ea3246255c0154dbba78 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Aug 2017 09:36:37 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index df6f5383..3e379bcc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit df6f538391a32781762288e9aac16aaa288e6957 +Subproject commit 3e379bcc799edb6a78bc8cea093a278dbe32f33c diff --git a/qtdoc b/qtdoc index 2646d39b..27f88300 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2646d39b11242088771aab9c0370a75ce8e13e8f +Subproject commit 27f883002b9fba6e5bbcbc84ad0d366fb8149808 -- cgit v1.2.3 From 043e54c7c6de5ae262731ab48e8960c66d4cc89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 3 Aug 2017 10:44:21 +0300 Subject: Update provisioning scripts with new intra.qt.io address Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake.ps1 | 2 +- coin/provisioning/common/msvc_2015_update3_patch.ps1 | 4 ++-- coin/provisioning/common/python.ps1 | 4 ++-- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/android.sh | 2 +- coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 | 4 ++-- coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/06-android.ps1 | 4 ++-- coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 88e2a10c..197eec57 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" -Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/msvc_2015_update3_patch.ps1 index 6a02f6bd..02c5e61e 100644 --- a/coin/provisioning/common/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/msvc_2015_update3_patch.ps1 @@ -37,10 +37,10 @@ $version = "2015 update3 (KB3165756)" $package = "C:\Windows\Temp\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe" $url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" $sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" -$preparedPackage="\\ci-files01-hki.ci.local\provisioning\windows\vs14-kb3165756-update" +$preparedPackage="\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update" if (Test-Path $preparedPackage) { echo "Using prepared package" diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index ef4be200..6c88689a 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi" if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" - $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi" + $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index dd35e01d..7cdfc25c 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -41,7 +41,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" version="3.6.2" -PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" targetFolder="/opt/cmake-$version" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 1d0630ce..7c3220ee 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -45,7 +45,7 @@ set -e targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" +baseUrl="http://ci-files01-hki.intra.qt.io/input/android" # SDK sdkPackage="android-sdk_r24.4.1-linux.tgz" diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh index dd35e01d..7cdfc25c 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh @@ -41,7 +41,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" version="3.6.2" -PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" targetFolder="/opt/cmake-$version" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh index da37ad52..ac1a02d3 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh @@ -43,7 +43,7 @@ set -e targetFolder="/opt/android" -basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android" +basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" # SDK sdkVersion="android-sdk_r24.4.1-macosx.zip" diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index 56b78f47..26d33291 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -65,7 +65,7 @@ try { # Install x64 bit version $architecture = "x64" $installFolder = "C:\Utils\my_sql\my_sql" -$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip" DownloadAndInstall $internalUrl $packagex64 $installFolder @@ -76,7 +76,7 @@ echo "Set environment variables ..." # Install x86 bit version $architecture = "x86" $installFolder = "C:\Utils\my_sql\my_sql$architecture" -$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip" DownloadAndInstall $internalUrl $packagex86 $installFolder diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index bd9afd5a..ee101fa5 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -36,7 +36,7 @@ $version = "11_2_2" $openglPackage = "C:\Windows\SysWOW64\opengl32.dll" -$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" +$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" echo "Take ownership of existing opengl32.dll from SysWOW64" diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 index cd0115d2..2d63106f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" $architecture = "x64" $installFolder = "C:\openssl" $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" echo "Fetching from URL ..." @@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..." $architecture = "x86" $installFolder = "C:\openssl$architecture" $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" echo "Fetching from URL ..." diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 index b73c3778..f1824a81 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" $architecture = "x64" $installFolder = "C:\Utils\postgresql\pgsql" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" -$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" # Delete any leftovers @@ -69,7 +69,7 @@ echo "Set $architecture environment variables ..." $architecture = "x86" $installFolder = "C:\Utils\postgresql$architecture\pgsql" $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" -$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip" $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" echo "Fetching from URL..." diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 index fdb70ef8..9c1d90d4 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -3,7 +3,7 @@ # This script will install msys which is needed for configuring openssl for Android $version = "1.0.11" -$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z" +$url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z" $zip = "c:\users\qt\downloads\msys-$version.7z" $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 index aa4a4fa5..2c26c5e2 100644 --- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 @@ -8,7 +8,7 @@ # NDK $ndkVersion = "r10e" -$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" $ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" $ndkFolder = "c:\utils\android-ndk-$ndkVersion" @@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1" $sdkApi = "ANDROID_API_VERSION" $sdkApiLevel = "android-18" $sdkBuildToolsVersion = "23.0.3" -$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip" +$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip" $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" $sdkFolder = "c:\utils\android-sdk-windows" diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 index 14a5a085..553f9560 100644 --- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 @@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz" $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" $destination = "C:\Utils\openssl-android-master" -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip +Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils -- cgit v1.2.3 From bd3ddeddd256557a8b0820f0958b630347344c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 29 Jun 2017 13:46:35 +0300 Subject: Make CI use a new win 8.1 provisioning instead of win 8 Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 10 +-- coin/platform_configs/qt5.txt | 2 +- .../common/allow-remote-desktop-access.ps1 | 36 +++++++++ coin/provisioning/common/disable-sleep.ps1 | 39 ++++++++++ coin/provisioning/common/disable-uac.ps1 | 36 +++++++++ coin/provisioning/common/disable-windefender.ps1 | 5 ++ .../common/disable-windows-updates.ps1 | 37 +++++++++ .../common/install-dependencywalker.ps1 | 56 ++++++++++++++ coin/provisioning/common/install-git.ps1 | 50 ++++++++++++ coin/provisioning/common/install-java.ps1 | 46 +++++++++++ coin/provisioning/common/install-notepad++.ps1 | 54 +++++++++++++ coin/provisioning/common/install-ruby.ps1 | 51 +++++++++++++ coin/provisioning/common/install-sevenzip.ps1 | 51 +++++++++++++ .../common/install-strawberry-perl.ps1 | 51 +++++++++++++ coin/provisioning/common/mysql.ps1 | 88 +++++++++++++++++++++ .../provisioning/common/network_test_server_ip.txt | 1 + coin/provisioning/common/openssl.ps1 | 86 +++++++++++++++++++++ coin/provisioning/common/postgresql.ps1 | 89 ++++++++++++++++++++++ .../common/set-network-test-server.ps1 | 42 ++++++++++ coin/provisioning/common/wsearch-off.ps1 | 3 + .../004-disable-windefender.ps1 | 1 + .../qtci-windows-10-x86/005-wsearch-off.ps1 | 1 + .../qtci-windows-10-x86/04-disable-windefender.ps1 | 5 -- .../qtci-windows-10-x86/05-wsearch-off.ps1 | 3 - .../004-disable-windefender.ps1 | 1 + .../qtci-windows-10-x86_64/005-wsearch-off.ps1 | 1 + .../qtci-windows-10-x86_64/009-openssl.ps1 | 1 + .../04-disable-windefender.ps1 | 5 -- .../qtci-windows-10-x86_64/05-wsearch-off.ps1 | 3 - coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 88 +-------------------- .../qtci-windows-10-x86_64/openssl.ps1 | 86 --------------------- .../qtci-windows-10-x86_64/postgresql.ps1 | 89 +--------------------- .../qtci-windows-7-x86/004-disable-windefender.ps1 | 1 + .../qtci-windows-7-x86/005-wsearch-off.ps1 | 1 + .../qtci-windows-7-x86/04-disable-windefender.ps1 | 5 -- .../qtci-windows-7-x86/05-wsearch-off.ps1 | 3 - .../01-windows_removethemall.ps1 | 1 - .../04-disable-windefender.ps1 | 5 -- .../qtci-windows-8-x86_64/05-wsearch-off.ps1 | 3 - .../qtci-windows-8-x86_64/06-python.ps1 | 1 - .../qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/icu.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/jom.ps1 | 1 - .../qtci-windows-8.1-x86_64/001-disable-uac.ps1 | 1 + .../004-disable-windows-updates.ps1 | 1 + .../009-set-network-test-server.ps1 | 1 + .../01-allow-remote-desktop-access.ps1 | 1 + .../qtci-windows-8.1-x86_64/02-disable-sleep.ps1 | 1 + .../02-install-notepad++.ps1 | 1 + .../03-install-sevenzip.ps1 | 1 + .../04-disable-windefender.ps1 | 1 + .../qtci-windows-8.1-x86_64/05-wsearch-off.ps1 | 1 + .../qtci-windows-8.1-x86_64/06-python.ps1 | 1 + .../qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8.1-x86_64/08-install-git.ps1 | 1 + .../qtci-windows-8.1-x86_64/08-install-java.ps1 | 1 + .../09-install-dependencywalker.ps1 | 1 + .../qtci-windows-8.1-x86_64/09-install-ruby.ps1 | 1 + .../09-install-strawberry-perl.ps1 | 1 + .../qtci-windows-8.1-x86_64/09-mysql.ps1 | 1 + .../qtci-windows-8.1-x86_64/09-postgresql.ps1 | 1 + .../provisioning/qtci-windows-8.1-x86_64/cmake.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 | 1 + .../qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 | 51 +++++++++++++ .../qtci-windows-8.1-x86_64/openssl.ps1 | 1 + 67 files changed, 909 insertions(+), 305 deletions(-) create mode 100644 coin/provisioning/common/allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/common/disable-sleep.ps1 create mode 100644 coin/provisioning/common/disable-uac.ps1 create mode 100644 coin/provisioning/common/disable-windefender.ps1 create mode 100644 coin/provisioning/common/disable-windows-updates.ps1 create mode 100644 coin/provisioning/common/install-dependencywalker.ps1 create mode 100644 coin/provisioning/common/install-git.ps1 create mode 100644 coin/provisioning/common/install-java.ps1 create mode 100644 coin/provisioning/common/install-notepad++.ps1 create mode 100644 coin/provisioning/common/install-ruby.ps1 create mode 100644 coin/provisioning/common/install-sevenzip.ps1 create mode 100644 coin/provisioning/common/install-strawberry-perl.ps1 create mode 100644 coin/provisioning/common/mysql.ps1 create mode 100644 coin/provisioning/common/network_test_server_ip.txt create mode 100644 coin/provisioning/common/openssl.ps1 create mode 100644 coin/provisioning/common/postgresql.ps1 create mode 100644 coin/provisioning/common/set-network-test-server.ps1 create mode 100644 coin/provisioning/common/wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/icu.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b1e90fc4..57820fcc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,17 +1,17 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples -qtci-windows-8-x86_64-2 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples +qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation +qtci-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 8751f38c..b7a49bd0 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,6 +1,6 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/common/allow-remote-desktop-access.ps1 b/coin/provisioning/common/allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..06ea20a4 --- /dev/null +++ b/coin/provisioning/common/allow-remote-desktop-access.ps1 @@ -0,0 +1,36 @@ +############################################################################ +## +## 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 allows the Windows Remote Desktop Access + +reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f diff --git a/coin/provisioning/common/disable-sleep.ps1 b/coin/provisioning/common/disable-sleep.ps1 new file mode 100644 index 00000000..dda785ac --- /dev/null +++ b/coin/provisioning/common/disable-sleep.ps1 @@ -0,0 +1,39 @@ +############################################################################ +## +## 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 prevents Windows from going to sleep + +powercfg -change -monitor-timeout-ac 0 +powercfg -change -standby-timeout-ac 0 +powercfg -change -disk-timeout-ac 0 +powercfg -change -hibernate-timeout-ac 0 diff --git a/coin/provisioning/common/disable-uac.ps1 b/coin/provisioning/common/disable-uac.ps1 new file mode 100644 index 00000000..757c4a7e --- /dev/null +++ b/coin/provisioning/common/disable-uac.ps1 @@ -0,0 +1,36 @@ +############################################################################ +## +## 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 disables the Windows UAC + +C:\Windows\System32\cmd.exe /k %windir%\System32\reg.exe ADD HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v EnableLUA /t REG_DWORD /d 0 /f diff --git a/coin/provisioning/common/disable-windefender.ps1 b/coin/provisioning/common/disable-windefender.ps1 new file mode 100644 index 00000000..2d1f0783 --- /dev/null +++ b/coin/provisioning/common/disable-windefender.ps1 @@ -0,0 +1,5 @@ +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/common/disable-windows-updates.ps1 b/coin/provisioning/common/disable-windows-updates.ps1 new file mode 100644 index 00000000..1a014733 --- /dev/null +++ b/coin/provisioning/common/disable-windows-updates.ps1 @@ -0,0 +1,37 @@ +############################################################################ +## +## 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 disables the automatic Windows updates + +stop-service wuauserv +set-service wuauserv –startup disabled diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/install-dependencywalker.ps1 new file mode 100644 index 00000000..a9a56f7a --- /dev/null +++ b/coin/provisioning/common/install-dependencywalker.ps1 @@ -0,0 +1,56 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Dependency Walker 2.2.6000 + +$version = "2.2.6000" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip" +$url_official = "http://www.dependencywalker.com/depends22_x64.zip" +$dependsPackage = "C:\Windows\Temp\depends-$version.zip" +$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" + +$TARGETDIR = "C:\Utils\dependencywalker" +if(!(Test-Path -Path $TARGETDIR )){ + New-Item -ItemType directory -Path $TARGETDIR +} +Download $url_official $url_cache $dependsPackage +Verify-Checksum $dependsPackage $sha1 + +Get-ChildItem $dependsPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} + +echo "Cleaning $dependsPackage.." +Remove-Item -Recurse -Force "$dependsPackage" + +echo "Dependency Walker = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/install-git.ps1 new file mode 100644 index 00000000..d3543138 --- /dev/null +++ b/coin/provisioning/common/install-git.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# Install Git version 2.13.0 + +$version = "2.13.0" +$gitPackage = "C:\Windows\Temp\Git-" + $version + "-64-bit.exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + "-64-bit.exe" +$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + "-64-bit.exe" +$sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7" + +echo "Fetching Git $version..." +Download $url_official $url_cache $gitPackage +Verify-Checksum $gitPackage $sha1 +echo "Installing Git $version..." +cmd /c "$gitPackage /SILENT /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh"" +remove-item $gitPackage + +echo "Git = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 new file mode 100644 index 00000000..06bcf6a1 --- /dev/null +++ b/coin/provisioning/common/install-java.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Java + +$version = "7u7" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe" +$javaPackage = "C:\Windows\Temp\java-$version.exe" + +Copy-Item $url_cache $javaPackage +cmd /c "$javaPackage /s SPONSORS=0" +echo "Cleaning $javaPackage.." +Remove-Item -Recurse -Force "$javaPackage" +echo "Java = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/install-notepad++.ps1 new file mode 100644 index 00000000..15a8c004 --- /dev/null +++ b/coin/provisioning/common/install-notepad++.ps1 @@ -0,0 +1,54 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Notepad++ + +$version = "7.3" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer.x64.exe" +$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer.x64.exe" +$sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA" +$nppPackage = "C:\Windows\Temp\npp-$version.exe" + +Download $url_official $url_cache $nppPackage +Verify-Checksum $nppPackage $sha1 +cmd /c "$nppPackage /S" + +echo "Cleaning $nppPackage.." +Remove-Item -Recurse -Force "$nppPackage" + +echo "Notepad++ = $version" >> ~\versions.txt + +Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +echo "Auto-updating disabled." diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 new file mode 100644 index 00000000..332a3a89 --- /dev/null +++ b/coin/provisioning/common/install-ruby.ps1 @@ -0,0 +1,51 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Ruby + +$version = "2.2.6" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + "-x64.exe" +$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + "-x64.exe" +$rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" +$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" + +Download $url_official $url_cache $rubyPackage +Verify-Checksum $rubyPackage $sha1 +cmd /c "$rubyPackage /silent" + +echo "Cleaning $rubyPackage.." +Remove-Item -Recurse -Force "$rubyPackage" + +echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1 new file mode 100644 index 00000000..91442500 --- /dev/null +++ b/coin/provisioning/common/install-sevenzip.ps1 @@ -0,0 +1,51 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs 7-Zip + +$version = "1604" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + "-x64.exe" +$url_official = "http://www.7-zip.org/a/7z" + $version + "-x64.exe" +$7zPackage = "C:\Windows\Temp\7zip-$version.exe" +$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" + +Download $url_official $url_cache $7zPackage +Verify-Checksum $7zPackage $sha1 +cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\" + +echo "Cleaning $7zPackage.." +Remove-Item -Recurse -Force "$7zPackage" + +echo "7-Zip = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/install-strawberry-perl.ps1 new file mode 100644 index 00000000..83b63897 --- /dev/null +++ b/coin/provisioning/common/install-strawberry-perl.ps1 @@ -0,0 +1,51 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs Strawberry Perl + +$version = "5.26.0.1" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + "-64bit.msi" +$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" +$version+ "-64bit.msi" +$strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi" +$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" + +Download $url_official $url_cache $strawberryPackage +Verify-Checksum $strawberryPackage $sha1 +cmd /c "$strawberryPackage /QB INSTALLDIR=C:\strawberry REBOOT=REALLYSUPPRESS" + +echo "Cleaning $strawberryPackage.." +Remove-Item -Recurse -Force "$strawberryPackage" + +echo "strawberry = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1 new file mode 100644 index 00000000..9bd9929b --- /dev/null +++ b/coin/provisioning/common/mysql.ps1 @@ -0,0 +1,88 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs MySQL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "5.6.11" +$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip" +$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip" + +function DownloadAndInstall +{ + Param ( + [string]$internalUrl, + [string]$package, + [string]$installPath + ) + + echo "Fetching from URL ..." + Copy-Item $internalUrl $package + + $zipDir = [io.path]::GetFileNameWithoutExtension($package) + Extract-Dev-Folders-From-Zip $package $zipDir $installPath + + Remove-Item $package +} + +# Remove any leftovers +try { + Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted +} catch {} + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\Utils\my_sql\my_sql" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip" + +DownloadAndInstall $internalUrl $packagex64 $installFolder + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\my_sql\my_sql$architecture" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip" + +DownloadAndInstall $internalUrl $packagex86 $installFolder + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "MySQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/network_test_server_ip.txt b/coin/provisioning/common/network_test_server_ip.txt new file mode 100644 index 00000000..ec3d058a --- /dev/null +++ b/coin/provisioning/common/network_test_server_ip.txt @@ -0,0 +1 @@ +network_test_server_ip=10.212.2.216 diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/openssl.ps1 new file mode 100644 index 00000000..2d63106f --- /dev/null +++ b/coin/provisioning/common/openssl.ps1 @@ -0,0 +1,86 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2j" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\openssl" +$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" +$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\openssl$architecture" +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" +$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +cmd /c "$packagex86 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x86", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x86", "$installFolder\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 new file mode 100644 index 00000000..2ff97761 --- /dev/null +++ b/coin/provisioning/common/postgresql.ps1 @@ -0,0 +1,89 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs postgresql $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "9.1.9-1" +$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip" +$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" + +# Install x64 bit versions +$architecture = "x64" +$installFolder = "C:\Utils\postgresql\pgsql" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" +$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" + +# Delete any leftovers +try { + Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted +} catch {} + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\postgresql$architecture\pgsql" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip" +$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "PostgreSQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/set-network-test-server.ps1 b/coin/provisioning/common/set-network-test-server.ps1 new file mode 100644 index 00000000..1a1f50b7 --- /dev/null +++ b/coin/provisioning/common/set-network-test-server.ps1 @@ -0,0 +1,42 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will set the network test server IP in to hosts file + +$n = Get-Content "$PSScriptRoot\network_test_server_ip.txt" +$n = $n.Split('=') +New-Variable -Name $n[0] -Value $n[1] + +Add-Content -Path C:\Windows\System32\drivers\etc\hosts. -Value "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" diff --git a/coin/provisioning/common/wsearch-off.ps1 b/coin/provisioning/common/wsearch-off.ps1 new file mode 100644 index 00000000..09c45bbd --- /dev/null +++ b/coin/provisioning/common/wsearch-off.ps1 @@ -0,0 +1,3 @@ + +# Disable the windows search indexing service +sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 deleted file mode 100644 index 2d1f0783..00000000 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Turning off win defender. -# -# If disabled manually, windows will automatically enable it after -# some period of time. Disabling it speeds up the builds. -REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 deleted file mode 100644 index 09c45bbd..00000000 --- a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 +++ /dev/null @@ -1,3 +0,0 @@ - -# Disable the windows search indexing service -sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 new file mode 100644 index 00000000..f3906f78 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 2d1f0783..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Turning off win defender. -# -# If disabled manually, windows will automatically enable it after -# some period of time. Disabling it speeds up the builds. -REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 deleted file mode 100644 index 09c45bbd..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 +++ /dev/null @@ -1,3 +0,0 @@ - -# Disable the windows search indexing service -sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index 26d33291..f6902153 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -1,88 +1,2 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# +. "$PSScriptRoot\..\common\mysql.ps1" -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script installs MySQL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine - -$version = "5.6.11" -$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip" -$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip" - -function DownloadAndInstall -{ - Param ( - [string]$internalUrl, - [string]$package, - [string]$installPath - ) - - echo "Fetching from URL ..." - Copy-Item $internalUrl $package - - $zipDir = [io.path]::GetFileNameWithoutExtension($package) - Extract-Dev-Folders-From-Zip $package $zipDir $installPath - - Remove-Item $package -} - -# Remove any leftovers -try { - Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted -} catch {} - -# Install x64 bit version -$architecture = "x64" -$installFolder = "C:\Utils\my_sql\my_sql" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip" - -DownloadAndInstall $internalUrl $packagex64 $installFolder - -echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") - -# Install x86 bit version -$architecture = "x86" -$installFolder = "C:\Utils\my_sql\my_sql$architecture" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip" - -DownloadAndInstall $internalUrl $packagex86 $installFolder - -echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine") - -# Store version information to ~/versions.txt, which is used to print version information to provision log. -echo "MySQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 deleted file mode 100644 index 2d63106f..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script installs OpenSSL $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine - -$version = "1_0_2j" -$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" -$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" - -# Install x64 bit version -$architecture = "x64" -$installFolder = "C:\openssl" -$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe" -$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" - -echo "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex64 -Verify-Checksum $packagex64 $sha1 -echo "Installing $packagex64 ..." -cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -echo "Remove downloaded $packagex64 ..." -Remove-Item $packagex64 - -echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine") -[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine") - -# Install x86 bit version -$architecture = "x86" -$installFolder = "C:\openssl$architecture" -$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" -$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" - -echo "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -echo "Installing $packagex86 ..." -cmd /c "$packagex86 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" - -echo "Remove downloaded $packagex86 ..." -Remove-Item $packagex86 - -echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x86", "$installFolder\bin\openssl.cfg", "Machine") -[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x86", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x86", "$installFolder\lib", "Machine") - -# Store version information to ~/versions.txt, which is used to print version information to provision log. -echo "OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 index f1824a81..c1d8e13e 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -1,89 +1,2 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# +. "$PSScriptRoot\..\common\postgresql.ps1" -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script installs postgresql $version. -# Both x86 and x64 versions needed when x86 integrations are done on x64 machine - -$version = "9.1.9-1" -$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip" -$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" - -# Install x64 bit versions -$architecture = "x64" -$installFolder = "C:\Utils\postgresql\pgsql" -$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" -$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" - -# Delete any leftovers -try { - Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted -} catch {} - -echo "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex64 -Verify-Checksum $packagex64 $sha1 -echo "Installing $packagex64 ..." -Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder - -echo "Remove downloaded $packagex64 ..." -Remove-Item $packagex64 - -echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") - -# Install x86 bit version -$architecture = "x86" -$installFolder = "C:\Utils\postgresql$architecture\pgsql" -$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" -$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip" -$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" - -echo "Fetching from URL..." -Download $externalUrl $internalUrl $packagex86 -Verify-Checksum $packagex86 $sha1 -echo "Installing $packagex86 ..." -Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder - -echo "Remove downloaded $packagex86 ..." -Remove-Item $packagex86 - -echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine") - -# Store version information to ~/versions.txt, which is used to print version information to provision log. -echo "PostgreSQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 deleted file mode 100644 index 2d1f0783..00000000 --- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Turning off win defender. -# -# If disabled manually, windows will automatically enable it after -# some period of time. Disabling it speeds up the builds. -REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 deleted file mode 100644 index 09c45bbd..00000000 --- a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 +++ /dev/null @@ -1,3 +0,0 @@ - -# Disable the windows search indexing service -sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 2d1f0783..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1,5 +0,0 @@ -# Turning off win defender. -# -# If disabled manually, windows will automatically enable it after -# some period of time. Disabling it speeds up the builds. -REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 deleted file mode 100644 index 09c45bbd..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 +++ /dev/null @@ -1,3 +0,0 @@ - -# Disable the windows search indexing service -sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 deleted file mode 100644 index 44c1c5ff..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 deleted file mode 100644 index b405191e..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 deleted file mode 100644 index 8dbe0372..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 deleted file mode 100644 index 325be36a..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 deleted file mode 100644 index 842c65dd..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 new file mode 100644 index 00000000..2303699c --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..e8e24995 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 new file mode 100644 index 00000000..ae3f327d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 new file mode 100644 index 00000000..ee3f36a9 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 new file mode 100644 index 00000000..44c1c5ff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 new file mode 100644 index 00000000..f9129cff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 new file mode 100644 index 00000000..07c4f487 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..8d549455 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..18109622 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 new file mode 100644 index 00000000..a41035da --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 new file mode 100644 index 00000000..92339a45 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 new file mode 100644 index 00000000..325be36a --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 new file mode 100644 index 00000000..842c65dd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 new file mode 100644 index 00000000..8540c67d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# Install Visual Studio 2013 update 5 + +$version = "2013 Update 5 (KB2829760)" +$package = "C:\Windows\Temp\vs12-kb2829760.exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe" + +echo "Fetching patch for Visual Studio $version..." +Copy-Item $url_cache $package +$commandLine = $package + +echo "Installing Update 5 for Visual Studio $version..." +. $commandLine /norestart /passive + +echo "Removing $package ..." +remove-item $package + +echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 new file mode 100644 index 00000000..f3906f78 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\openssl.ps1" -- cgit v1.2.3 From d5967be09493384ce517a2307fec916b54820b0a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Aug 2017 15:58:23 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: Ia834fffa1951ba804dbf76af3d62652b17d947db Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index cadfd44c..aa16ae56 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cadfd44c77de9ad3d66e936df140e4ba6efb0d74 +Subproject commit aa16ae56f6a3f559e4d195717fbdb9c57c7579cd diff --git a/qtactiveqt b/qtactiveqt index d36199ce..9a6d5738 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d36199ce84191e029bb5c81382367976bd0ade85 +Subproject commit 9a6d57385c49fa702319139ae1f2e471520963ee diff --git a/qtbase b/qtbase index 70b976ec..8bebded9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 70b976ece1ad36b1e59d2b67f6cda8ff6b86017c +Subproject commit 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c diff --git a/qtcharts b/qtcharts index eedb1c76..1f47b1a7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit eedb1c76538cac3c11e7ac57eaa571d6ce07a632 +Subproject commit 1f47b1a7ae58702dccc57a9ccbaa905441f4fecb diff --git a/qtconnectivity b/qtconnectivity index b0089abb..687ec9eb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b0089abb05e6f60cc252068be1ba40be32e29bd3 +Subproject commit 687ec9eb370e9538264280b58bed4d3b1c889579 diff --git a/qtdatavis3d b/qtdatavis3d index cec5d284..3f8ae713 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit cec5d284e2b70199ab28c4e0ff7a67d79f531270 +Subproject commit 3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f diff --git a/qtdeclarative b/qtdeclarative index b9767f03..1b21b73e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b9767f03bdfcc06dae49661150fbeb0f19a8547b +Subproject commit 1b21b73e89942d567c90a17a3bf7a7ecae3de258 diff --git a/qtdoc b/qtdoc index df47da65..0718372f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit df47da6534e40ca28c8067ac41fc6323bc59a500 +Subproject commit 0718372fec57aae22aaab544f39c2fbbdb0119a2 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 698eb995..b6ff12df 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 698eb995b8c77cdfb1f151bd9ad46f8db87cfb26 +Subproject commit b6ff12df5496f3d296bb438ae343d5f771e93fec diff --git a/qtlocation b/qtlocation index d4cb4961..c832af78 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d4cb4961ed0a15d0746d96da38228787658d87bd +Subproject commit c832af789766fcebd8cfb15e53ce14f36278ca6d diff --git a/qtmultimedia b/qtmultimedia index eed32d94..116cd7bd 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit eed32d94de9faca7380f7497e7ab0d119ef3cf5c +Subproject commit 116cd7bdbd1e148aef05c27602780d65be335205 diff --git a/qtnetworkauth b/qtnetworkauth index 11b711bc..3d93f643 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 11b711bc97b66b5976d24f9411fe76a2f858eab9 +Subproject commit 3d93f6436596e349e43c3798b675af66db71df8a diff --git a/qtqa b/qtqa index f2fea571..b6dbaed8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f2fea571b9e17dc31eff349f6b744603c670dcd6 +Subproject commit b6dbaed8d73ded89d28b1ffd41dacb97a0b62b1c diff --git a/qtquickcontrols b/qtquickcontrols index 490f0704..a7749414 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 490f0704ac817c3e5d87e74b665cc770f7ab28f8 +Subproject commit a77494140324c3ede1f7c16086593c070d81e2b3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cc188f89..63f2f554 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cc188f897af27daf47b0937e38ccb76ac2310abb +Subproject commit 63f2f55462f2f040cfe175ada8aa1e01168597fc diff --git a/qtremoteobjects b/qtremoteobjects index 3af6618f..6e0341bc 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3af6618f98fe53e0288bc604fca4d03b3fd5d906 +Subproject commit 6e0341bc878ff82d3c1039dcce09f92269546189 diff --git a/qtrepotools b/qtrepotools index 8980e505..f9427cec 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 8980e505b5cdc8b6b9beb397887dc743dfc845c4 +Subproject commit f9427cec15cdcfd37c13fc883fd17d16f23bdcfb diff --git a/qtscxml b/qtscxml index 38eb39a8..8af8db38 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 38eb39a8873f4341cff7165655bb6e2aed40a793 +Subproject commit 8af8db3810ec2d8d2d923f39e23512d30ae234d9 diff --git a/qtsensors b/qtsensors index 18132193..1673dbed 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 18132193d83ab94777943c67258d93b3f8b1aa0f +Subproject commit 1673dbed00ba68209b6de95981f1e3b4a2a24682 diff --git a/qtserialbus b/qtserialbus index af8f4430..1d37c357 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit af8f4430c93ae4898075da6f3c62c463a4ee25f5 +Subproject commit 1d37c357c843a2622d2af7e1684576e19a8c7c30 diff --git a/qttools b/qttools index b2a1066e..fdc5749b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b2a1066e108678aa66d7e6f22cadf9c01d646ec9 +Subproject commit fdc5749b5603653c5d0c59db267f44fd1609457e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a50b8787..dd8c39ea 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a50b87870cf84e14eebfc2b00151342ec0d7e0f4 +Subproject commit dd8c39ea9312ec1441b3fdd830f9d42fe3258b58 diff --git a/qtwayland b/qtwayland index 6f3d6926..7f70da6a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6f3d69264b6640c94ecfdb89c4bbf90319534b09 +Subproject commit 7f70da6a644bc5b690066f0ab4814e1358f57e81 diff --git a/qtwebchannel b/qtwebchannel index 01bd2b3c..b5229df6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 01bd2b3ca88b42b9daac7cb00d196eb90d168570 +Subproject commit b5229df6a08a902b11a2fc9529af6385f4d985d5 diff --git a/qtwebengine b/qtwebengine index 630f7b24..d4c621f6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 630f7b24f67646b05a2222761b192316123d8931 +Subproject commit d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad diff --git a/qtwebsockets b/qtwebsockets index 11a6f90d..fb71c823 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 11a6f90d62a1c6e705a581ebf60b4ed02424d248 +Subproject commit fb71c823a7ae823345518ca33ccfe273fcf76494 diff --git a/qtwebview b/qtwebview index 1842c5e5..e4016a67 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1842c5e5d566117d80f0ca2db1f0fc71a6dfeca6 +Subproject commit e4016a67bbffefed71a407494e249e978d212b3d diff --git a/qtx11extras b/qtx11extras index c34e05e5..bd2e0d1d 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit c34e05e5d9bdc9ef29c27d105a51d72390f7aefa +Subproject commit bd2e0d1d87adfec3ba3fe8d9b5bd1c70c34c7a3e diff --git a/qtxmlpatterns b/qtxmlpatterns index 6a62e7bb..fcfa8244 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6a62e7bb1c3a2d9acb135434c24cd6ee7dc07cb9 +Subproject commit fcfa824402bb4edaf644fad786dac3560c743ebe -- cgit v1.2.3 From 5a0dc401fad4adccbd975392295d2c77d936900f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 8 Aug 2017 13:49:40 +0200 Subject: Remove QtWebKit and QtWebKit examples from Qt 5 They are subject to a separate release. Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262 Reviewed-by: Konstantin Tokarev --- .gitmodules | 18 +----------------- qtwebkit | 1 - qtwebkit-examples | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 160000 qtwebkit delete mode 160000 qtwebkit-examples diff --git a/.gitmodules b/.gitmodules index 9ea5c3b2..b4988927 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,7 +38,7 @@ status = essential [submodule "qttools"] depends = qtbase - recommends = qtdeclarative qtactiveqt qtwebkit + recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git branch = 5.9 @@ -69,21 +69,6 @@ branch = master status = essential project = - -[submodule "qtwebkit"] - depends = qtbase - recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns - path = qtwebkit - url = ../qtwebkit.git - branch = 5.9 - status = obsolete - project = WebKit.pro - priority = 20 -[submodule "qtwebkit-examples"] - depends = qtwebkit qttools - path = qtwebkit-examples - url = ../qtwebkit-examples.git - branch = 5.9 - status = obsolete [submodule "qtqa"] depends = qtbase path = qtqa @@ -238,7 +223,6 @@ [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools - serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git branch = 5.9 diff --git a/qtwebkit b/qtwebkit deleted file mode 160000 index 97c4a80a..00000000 --- a/qtwebkit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 97c4a80a1282c8c3eaa343011286b76fd4838c5f diff --git a/qtwebkit-examples b/qtwebkit-examples deleted file mode 160000 index a24c780b..00000000 --- a/qtwebkit-examples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a24c780b60d7d8bc00c4a48042cf7f32db777d55 -- cgit v1.2.3 From 15b608cbc559ba3dfa7fc04d16e4677ff5c265db Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Aug 2017 16:59:35 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtsvg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 3e379bcc..c86a75e9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e379bcc799edb6a78bc8cea093a278dbe32f33c +Subproject commit c86a75e9e5fac56f0a9c87ce87264f8f020791ce diff --git a/qtdeclarative b/qtdeclarative index 7ed7f10b..f724b538 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7ed7f10b9e3a345b6125602910b02afd7fdeb026 +Subproject commit f724b5380c911fbc841ff8ed4831dccd37fff6e9 diff --git a/qtqa b/qtqa index f2fea571..b6dbaed8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f2fea571b9e17dc31eff349f6b744603c670dcd6 +Subproject commit b6dbaed8d73ded89d28b1ffd41dacb97a0b62b1c diff --git a/qtrepotools b/qtrepotools index 6d98fbe0..f9427cec 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 6d98fbe0f35d2d525541c532d9a758f46681fc19 +Subproject commit f9427cec15cdcfd37c13fc883fd17d16f23bdcfb diff --git a/qtsvg b/qtsvg index 810b6def..cf5fa755 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 810b6defac666c7652a77b5e4fd5b70a6fbe0c54 +Subproject commit cf5fa755ecd07b0f52a151ea322d52fe1bfd8d76 -- cgit v1.2.3 From 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 9 Aug 2017 15:39:29 +0300 Subject: Provisioning: Disable system updates This change will disable system updates from App Store to prevent unnecessary network load Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0 Reviewed-by: Simon Hausmann --- coin/provisioning/common/system_updates.sh | 40 ++++++++++++++++++++++ .../qtci-osx-10.10-x86_64/001-system_updates.sh | 4 +++ .../qtci-osx-10.11-x86_64/001-system_updates.sh | 4 +++ .../qtci-osx-10.8-x86_64/001-system_updates.sh | 4 +++ .../qtci-osx-10.9-x86_64/001-system_updates.sh | 4 +++ 5 files changed, 56 insertions(+) create mode 100755 coin/provisioning/common/system_updates.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh create mode 100755 coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh create mode 100755 coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/system_updates.sh new file mode 100755 index 00000000..2dee2708 --- /dev/null +++ b/coin/provisioning/common/system_updates.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Disable "Download newly available updates in the background" from App Store +sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE + +# Disable "Install system data files and security updates" from App Store +sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate CriticalUpdateInstall -boolean FALSE diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh new file mode 100755 index 00000000..b05dcf1c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh new file mode 100755 index 00000000..b05dcf1c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh new file mode 100755 index 00000000..b05dcf1c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh new file mode 100755 index 00000000..b05dcf1c --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/system_updates.sh -- cgit v1.2.3 From 890a478e07bea5ed25d6ea43d56cd0f70ce81a3e Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Tue, 15 Aug 2017 15:55:42 +0300 Subject: Update libusb version Use an unreleased version that does not have a crash on Windows 7, since there is not yet an official release that would include the fix. Task-number: QTBUG-62430 Change-Id: I14d83d01fe3d4b0bfebe7514fbec7d25e99af731 Reviewed-by: Simon Hausmann --- coin/provisioning/common/libusb.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1 index ed575886..a0e2d07d 100644 --- a/coin/provisioning/common/libusb.ps1 +++ b/coin/provisioning/common/libusb.ps1 @@ -35,11 +35,11 @@ . "$PSScriptRoot\helpers.ps1" -$archive = "C:\users\qt\downloads\libusb-1.0.21.7z" +$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196.7z" $libusb_location = "C:\Utils\libusb-1.0" -Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z http://ci-files01-hki.ci.local/input/libusb-1.0/libusb-1.0.21.7z $archive -Verify-Checksum $archive "37c8884a0ddca97d492b8ef3e08970ae3ba20653" +Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196.7z $archive +Verify-Checksum $archive "160892df83742639da32acc8dabd4f95a4f448e1" Extract-7Zip $archive $libusb_location -- cgit v1.2.3 From 1720ed0b6ffa9b1b36c8eec73d0f6625ff23edbd Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Tue, 15 Aug 2017 16:02:40 +0300 Subject: Adapt comments to qdb repository move Change-Id: I3ecdc952d1323a14471cdc87b6854b857d4297a7 Reviewed-by: Simon Hausmann --- coin/provisioning/common/libusb.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1 index a0e2d07d..929c42d7 100644 --- a/coin/provisioning/common/libusb.ps1 +++ b/coin/provisioning/common/libusb.ps1 @@ -31,7 +31,7 @@ # ############################################################################ -# lisbusb-1.0 is needed by tqtc-boot2qt/qdb +# libusb-1.0 is needed by qt-apps/qdb . "$PSScriptRoot\helpers.ps1" @@ -43,5 +43,5 @@ Verify-Checksum $archive "160892df83742639da32acc8dabd4f95a4f448e1" Extract-7Zip $archive $libusb_location -# Tell tqtc-boot2qt/qdb build system where to find libusb +# Tell qt-apps/qdb build system where to find libusb [Environment]::SetEnvironmentVariable("LIBUSB_PATH", $libusb_location, "Machine") -- cgit v1.2.3 From c9f842af8459f7441957aba17e4545db26700424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 13 Jul 2017 14:47:04 +0300 Subject: Provisioning: Install virtualenv for macOS 10.12 Python virtualenv command is used when building pyside modules, which installs additional Python modules during build time and requires access to installation directories. Change-Id: Id34ac8b36710ba04d8db263acdaf2bd31e314de8 Reviewed-by: Simon Hausmann --- coin/provisioning/common/virtualenv.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh | 4 ++++ 2 files changed, 7 insertions(+) create mode 100755 coin/provisioning/common/virtualenv.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh diff --git a/coin/provisioning/common/virtualenv.sh b/coin/provisioning/common/virtualenv.sh new file mode 100755 index 00000000..b6a9a796 --- /dev/null +++ b/coin/provisioning/common/virtualenv.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# Will install virtual env for python +sudo pip install virtualenv diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh new file mode 100755 index 00000000..9e4f1d3e --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/virtualenv.sh -- cgit v1.2.3 From 7db6a1cd0f8759649c84d18e0cca0299270a8c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 3 Aug 2017 09:13:00 +0300 Subject: Provisioning: Reduce verbosity of uncompressing Xcode Change-Id: Id09ace3fcdf53c3b6921ed277c9fe571b5c43e3b Reviewed-by: Simon Hausmann --- coin/provisioning/common/install_xcode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh index f8336bad..82c05a45 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/install_xcode.sh @@ -58,7 +58,7 @@ function InstallXCode() try ( echo "Uncompressing and installing '$sourceFile'" - xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -vdmi) || throw $ExceptionCPIO + xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO echo "Accept license" sudo xcodebuild -license accept || throw $ExceptionAcceptLicense -- cgit v1.2.3 From f238362a4bd9d7ef23c8cff2c45478bec0ff54c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 3 Aug 2017 15:21:50 +0300 Subject: Provisioning: move installing Android NDK and SDK back in line Installing the NDK and SDK takes a lot of time and finding potential other problems require us to first download the entire Android SDK. By moving it back in line, we first make sure the other stuff work before taking care of this. Change-Id: Ibae82dca247c8ae063548dbafa5a348102bf8ddb Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh | 117 --------------------- .../qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh | 117 +++++++++++++++++++++ 2 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh deleted file mode 100644 index 87569d72..00000000 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 - -# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. - -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-21 API version in Qt 5.9. - -set -e -targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" - -# SDK -sdkPackage="android-sdk_r24.4.1-linux.tgz" -sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-21" -sdkUrl="$baseUrl/$sdkPackage" -sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkPackage" -sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" -sdkFolderName="android-sdk-linux" -sdkName="sdk" - -# NDK -ndkVersion="r10e" -ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkPackage" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkPackage" -ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-$ndkVersion" -ndkName="ndk" - -function InstallAndroidPackage { - targetFolder=$1 - version=$2 - url=$3 - sha1=$4 - targetFile=$5 - extract=$6 - folderName=$7 - name=$8 - - sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" - echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" - sudo chmod 755 "$targetFile" - sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users "$targetFolder"/"$folderName" - sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" - sudo rm -fr "$targetFolder"/"$version" -} - -sudo mkdir "$targetFolder" - -# Install Android SDK -echo "Installing Android SDK version $sdkPackage..." -InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName - -# Install Android NDK -echo "Installing Android NDK version $ndkPackage..." -InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName - -# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" - -# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 -# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. -# echo 'export ANDROID_API_VERSION=$sdkApiLevel' >> ~/.bashrc - -# Storage version information to ~/versions.txt, which is used to print version information to provision log. -echo "***** Android SDK *****" >> ~/versions.txt -echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt -echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt -platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" -echo "Android Platform Tools = $platformTools" >> ~/versions.txt -sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" -echo "Android SDK Tools = $sdkTools" >> ~/versions.txt -echo "***** Android NDK *****" >> ~/versions.txt -echo "Android NDK Version = $ndkVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh new file mode 100644 index 00000000..87569d72 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh @@ -0,0 +1,117 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script install Android sdk and ndk. + +# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 + +# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. + +# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. +# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-21 API version in Qt 5.9. + +set -e +targetFolder="/opt/android" +baseUrl="http://ci-files01-hki.ci.local/input/android" + +# SDK +sdkPackage="android-sdk_r24.4.1-linux.tgz" +sdkBuildToolsVersion="23.0.3" +sdkApiLevel="android-21" +sdkUrl="$baseUrl/$sdkPackage" +sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" +sdkTargetFile="$targetFolder/$sdkPackage" +sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" +sdkFolderName="android-sdk-linux" +sdkName="sdk" + +# NDK +ndkVersion="r10e" +ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" +ndkUrl="$baseUrl/$ndkPackage" +ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" +ndkTargetFile="$targetFolder/$ndkPackage" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-$ndkVersion" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" + echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo chmod 755 "$targetFile" + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:users "$targetFolder"/"$folderName" + sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" + sudo rm -fr "$targetFolder"/"$version" +} + +sudo mkdir "$targetFolder" + +# Install Android SDK +echo "Installing Android SDK version $sdkPackage..." +InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkPackage..." +InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName + +# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools +echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." +echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" + +# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 +# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. +# echo 'export ANDROID_API_VERSION=$sdkApiLevel' >> ~/.bashrc + +# Storage version information to ~/versions.txt, which is used to print version information to provision log. +echo "***** Android SDK *****" >> ~/versions.txt +echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt +echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt +platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" +echo "Android Platform Tools = $platformTools" >> ~/versions.txt +sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" +echo "Android SDK Tools = $sdkTools" >> ~/versions.txt +echo "***** Android NDK *****" >> ~/versions.txt +echo "Android NDK Version = $ndkVersion" >> ~/versions.txt -- cgit v1.2.3 From 3690fe06a43468edf345ad039683baa76831027b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 27 Jul 2017 12:40:46 +0300 Subject: Provisioning: Update CMake on osx 10.10 Pyside requires cmake 3.1.0 or more recent. Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake.sh | 51 +++++++++++++++++++++ .../qtci-osx-10.10-x86_64/004-cmake.sh | 4 ++ .../qtci-osx-10.11-x86_64/025-cmake.sh | 53 ++-------------------- 3 files changed, 58 insertions(+), 50 deletions(-) create mode 100755 coin/provisioning/common/cmake.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/cmake.sh new file mode 100755 index 00000000..fe84cd0e --- /dev/null +++ b/coin/provisioning/common/cmake.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=./InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" +SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" +appPrefix="cmake-3.6.2-Darwin-x86_64" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc +echo "CMake = 3.6.2" >> ~/versions.txt diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh new file mode 100755 index 00000000..ddb01d64 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh index 085225d7..ddb01d64 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh @@ -1,51 +1,4 @@ -#!/bin/bash +#!/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 installs CMake - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" - -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" -SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" -appPrefix="cmake-3.6.2-Darwin-x86_64" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" - -echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc -echo "CMake = 3.6.2" >> ~/versions.txt +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake.sh -- cgit v1.2.3 From 62c6676f87b4bc6adb5a108a0ce5b044341bb585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 27 Jul 2017 09:20:42 +0300 Subject: Provisioning: Install pip for macOS 10.12 Pip is required to provision python packages. Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7 Reviewed-by: Simon Hausmann --- coin/provisioning/common/pip.sh | 5 +++++ coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh | 4 ++++ 2 files changed, 9 insertions(+) create mode 100755 coin/provisioning/common/pip.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh diff --git a/coin/provisioning/common/pip.sh b/coin/provisioning/common/pip.sh new file mode 100755 index 00000000..c9af5fbc --- /dev/null +++ b/coin/provisioning/common/pip.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# Will install pip utility for python +curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py +sudo python get-pip.py +rm get-pip.py diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh new file mode 100755 index 00000000..07c9a617 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/pip.sh -- cgit v1.2.3 From 629e24b979e9a567cde0e977d5c7ef6b41dc52e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 14 Jul 2017 10:20:57 +0300 Subject: Provisioning: Install libclang to OpenSUSE The script will install custom package, which is known to match with pyside requirements. Change-Id: I28ff7877ef1bba50f8d32007af87e70c0ddc398a Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh new file mode 100755 index 00000000..abbda212 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/sw_versions.txt +VERSION=$libclang_version +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +SHA1="bbdbbc0296f42310077539b7247d285386119ef4" + +$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" -- cgit v1.2.3 From 896bb94c7464eb51db342e63b3cb391e3f08dd48 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 5 Aug 2017 19:51:30 +0200 Subject: Remove outdated provisioning scripts Ubuntu 14.04 and OS X 10.8 are no longer relevant Change-Id: Ib18dda605501fbbf2a6cac578a1b34d82102fae4 Reviewed-by: Simon Hausmann Reviewed-by: Heikki Halmet --- .../001-suppress-shutdown-indicator.sh | 4 -- .../qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh | 6 --- .../qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh | 53 ---------------------- .../qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh | 49 -------------------- .../qtci-linux-Ubuntu-14.04-x86_64/libusb.sh | 3 -- .../qtci-osx-10.8-x86_64/08-libclang.sh | 5 -- 6 files changed, 120 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh delete mode 100755 coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh deleted file mode 100644 index f11263b7..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -# Disable questions on shutdown. -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh deleted file mode 100644 index 205f598b..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh +++ /dev/null @@ -1,6 +0,0 @@ -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside - -sudo apt-get update -sudo apt-get install -y python-dev diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh deleted file mode 100644 index dd35e01d..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh deleted file mode 100644 index b14e94a6..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -sudo apt-get update -sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev - -TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" -trap "sudo rm -fr $TEMPDIR" EXIT -cd $TEMPDIR -git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua -cd freeopcua -git checkout 57b6993d39b6761af773fa4fa37c3fbd39c764f1 -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. -make -sudo make install diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh deleted file mode 100644 index f48a6e36..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/env bash -# Required for tqtc-boot2qt/qdb -sudo apt-get install -y libusb-1.0-0-dev diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh deleted file mode 100755 index d257ffa1..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh -- cgit v1.2.3 From 79db6fc85647a8b63ce7e450c38baf80294b86b6 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Thu, 17 Aug 2017 13:18:14 +0300 Subject: Do not use font files from boot2qt toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously font configuration files were used from the host system. Updating the toolchain to Morty introduces Cantarell font which causes toolchain fonts to be used by Qemu. This change forces also the actual font files to be used from the host system regardless of what is in the toolchain. Task-number: QTBUG-62528 Change-Id: I00de0baa952c9b898edc6b9da8d1d8814f6c722b Reviewed-by: Tony Sarajärvi Reviewed-by: Simon Hausmann --- .../qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh index 9c906562..20fb83ad 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -66,13 +66,23 @@ sudo update-binfmts --package qemu-arm --install arm \ sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk # If normal fontconfig paths are used, qemu parses what ever files it finds from -# the toolchain sysroot and the rest from the system fonts. Fix by copying the -# system font configurations to a location which prefix that can't be found from -# the toolchain sysroot. Links must also be dereferenced or their targets remain -# pointing to the toolchain sysroot. +# the toolchain sysroot and the rest from the system fonts. QEMU_FONTCONFPATH=~/qemu_fonts QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf mkdir -p $QEMU_FONTCONFPATH + +# Copy system font configuration files from system to a location with prefix that can't be found from +# the toolchain sysroot cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH + +# Create links to the actual system font files +ln -s /usr/share/fonts $QEMU_FONTCONFPATH/fonts +ln -s /usr/local/share/fonts $QEMU_FONTCONFPATH/local_fonts + +# Change font configuration file to point to files that can't be found from the toolchain sysroot sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE +sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i +sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i + +# Set QEMU font configuration variables echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile -- cgit v1.2.3 From c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Thu, 17 Aug 2017 12:20:39 +0300 Subject: Use libusb compiled with MSVC 2015 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QDB has to change to using Windows 10 for releases, because Windows 8.1 is no longer available for non-qt5 builds as a packaging platform in 5.9 branch. Don't provision libusb on earlier Windows versions, since they don't have a compatible compiler. Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55 Reviewed-by: Simon Hausmann Reviewed-by: JÄ™drzej Nowacki --- coin/provisioning/common/libusb.ps1 | 6 +++--- coin/provisioning/qtci-windows-7-x86/libusb.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/libusb.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-7-x86/libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1 index 929c42d7..38d8b8e6 100644 --- a/coin/provisioning/common/libusb.ps1 +++ b/coin/provisioning/common/libusb.ps1 @@ -35,11 +35,11 @@ . "$PSScriptRoot\helpers.ps1" -$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196.7z" +$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z" $libusb_location = "C:\Utils\libusb-1.0" -Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196.7z $archive -Verify-Checksum $archive "160892df83742639da32acc8dabd4f95a4f448e1" +Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive +Verify-Checksum $archive "396a3224c306480f24a583850d923d06aa4377c1" Extract-7Zip $archive $libusb_location diff --git a/coin/provisioning/qtci-windows-7-x86/libusb.ps1 b/coin/provisioning/qtci-windows-7-x86/libusb.ps1 deleted file mode 100644 index a853ffef..00000000 --- a/coin/provisioning/qtci-windows-7-x86/libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86/libusb.ps1 deleted file mode 100644 index a853ffef..00000000 --- a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 deleted file mode 100644 index a853ffef..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\libusb.ps1" -- cgit v1.2.3 From 9d65cd5ca52ce14af239f019a486604792917770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 22 Aug 2017 09:02:16 +0300 Subject: Provisioning: Install libclang and its dependencies to macos 10.12 Libs and llvm-config is required by pyside. In order to extract libclang package, we need to install 7zip. 7zip is installed with homebrew. Change-Id: I35367dca1f79dbc9e2f1513480f6fc9bb69730d3 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh | 4 ++++ coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh | 4 ++++ coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh | 5 +++++ 3 files changed, 13 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh new file mode 100755 index 00000000..63ec9b69 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh new file mode 100755 index 00000000..4fb9ddbc --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Install 7z to be used from command line +brew update +brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh new file mode 100755 index 00000000..d257ffa1 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +# There is only one mac package and common script uses it as a default +$BASEDIR/../common/libclang.sh -- cgit v1.2.3 From f1b1f3dc097defe3c7cb9a571598583376eddf5f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 23 Aug 2017 16:01:10 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: I12a0463f0b91624649abe6da4cb745f6c20ed69f Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index aa16ae56..58639dab 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit aa16ae56f6a3f559e4d195717fbdb9c57c7579cd +Subproject commit 58639dab0360add8ccb23ca96141113fedf39866 diff --git a/qtactiveqt b/qtactiveqt index 9a6d5738..c2751b1d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9a6d57385c49fa702319139ae1f2e471520963ee +Subproject commit c2751b1d664748cfbd05d2e397f95f2cc0bec13f diff --git a/qtbase b/qtbase index 8bebded9..b65e30c8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c +Subproject commit b65e30c861af308d142c36b5f96f1a4cfedde1f3 diff --git a/qtconnectivity b/qtconnectivity index 687ec9eb..94cc2b91 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 687ec9eb370e9538264280b58bed4d3b1c889579 +Subproject commit 94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4 diff --git a/qtdeclarative b/qtdeclarative index 1b21b73e..363189a3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1b21b73e89942d567c90a17a3bf7a7ecae3de258 +Subproject commit 363189a3d351ace484180ede0f2f6c4ed04f8401 diff --git a/qtgamepad b/qtgamepad index 17c9df2e..1fc40dee 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 17c9df2e5945a06944d8e9d75d1cba25bc885ecb +Subproject commit 1fc40deed6993265c436783cc367285bf9a2266a diff --git a/qtlocation b/qtlocation index c832af78..d22e6d09 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c832af789766fcebd8cfb15e53ce14f36278ca6d +Subproject commit d22e6d09f1607e694694d2ae5b2f447605a8782e diff --git a/qtmultimedia b/qtmultimedia index 116cd7bd..343e281f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 116cd7bdbd1e148aef05c27602780d65be335205 +Subproject commit 343e281f0e7cc7fd9e1558e4d92f5019fa565181 diff --git a/qtquickcontrols b/qtquickcontrols index a7749414..633c5642 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a77494140324c3ede1f7c16086593c070d81e2b3 +Subproject commit 633c5642611234cf204569471598c3d3c083b84c diff --git a/qtrepotools b/qtrepotools index f9427cec..21574ed0 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f9427cec15cdcfd37c13fc883fd17d16f23bdcfb +Subproject commit 21574ed0092c596d46bd4639262c1918ea28af6c diff --git a/qtscxml b/qtscxml index 8af8db38..a1dff1a1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8af8db3810ec2d8d2d923f39e23512d30ae234d9 +Subproject commit a1dff1a11ad303a1f82f181e6386194de90ec08f diff --git a/qtsvg b/qtsvg index 0fcd0160..bdcd7a97 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0fcd0160662941a9ba800b36671e88d82790bd95 +Subproject commit bdcd7a97449502f92069d36196cc81064b1c02a0 diff --git a/qttools b/qttools index fdc5749b..28b1b88a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fdc5749b5603653c5d0c59db267f44fd1609457e +Subproject commit 28b1b88a0b85f4ce7765ed5cc5f3780f97e5ea4f diff --git a/qtwebengine b/qtwebengine index d4c621f6..0f6908b5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d4c621f6a6b87f2a86069fa393b9f7c4f9e7b9ad +Subproject commit 0f6908b5f9eca09cf086410344a862b9d59ef727 diff --git a/qtx11extras b/qtx11extras index bd2e0d1d..f65d50eb 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit bd2e0d1d87adfec3ba3fe8d9b5bd1c70c34c7a3e +Subproject commit f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8 -- cgit v1.2.3 From dfaabde5dcbdecf24d24dce4172c976687085bb6 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 16 Aug 2017 15:09:04 +0200 Subject: Enable developer mode on macOS platforms Previously when a VM user tried to attach lldb to a process via ssh, lldb would fail with the following error message: "error: process exited with status -1 (unable to attach)". If this were done over VNC rather than ssh, the user would instead get a UI popup to enter a password to allow debugging the process. When trying to debug an application using Xcode for the first time, Xcode will offer to enable the so called "Developer Mode" which allows attaching a debugger without specifying a password every time. This change enables "Developer Mode", so that every VM user doesn't have to. Change-Id: Ie4e473a982c908afd456ac1773bbdaf4ce778094 Reviewed-by: Edward Welbourne Reviewed-by: Simon Hausmann --- coin/provisioning/common/install_xcode.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh index 82c05a45..c6f00ee7 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/install_xcode.sh @@ -51,6 +51,7 @@ function InstallXCode() { ExceptionCPIO=103 ExceptionAcceptLicense=105 + ExceptionDeveloperMode=113 sourceFile=$1 version=$2 @@ -63,6 +64,9 @@ function InstallXCode() echo "Accept license" sudo xcodebuild -license accept || throw $ExceptionAcceptLicense + echo "Enabling developer mode, so that using lldb does not require interactive password entry" + sudo /usr/sbin/DevToolsSecurity -enable || throw $ExceptionDeveloperMode + echo "Xcode = $version" >> ~/versions.txt ) catch || { @@ -71,6 +75,10 @@ function InstallXCode() echo "Failed to unarchive .cpio." exit 1; ;; + $ExceptionDeveloperMode) + echo "Failed to enable developer mode." + exit 1; + ;; $ExceptionAcceptLicense) echo "Failed to accept license." exit 1; -- cgit v1.2.3