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