From 3a000ed41add5a2400b83d78366992054764b33d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 24 Aug 2017 17:10:56 +0200 Subject: Fix target architecture for Boot2Qt declarative tests Amends 7456e028a701ff31f63a465fb8fadca63c453b97 and therefore allows the re-use of the boot2qt build artifacts. Change-Id: I4b01bf13e0004c4c3c3a2be00b02760e0ad3ffdd Reviewed-by: Sami Nurmenniemi Reviewed-by: Simon Hausmann --- coin/platform_configs/qtdeclarative.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c8ac9c47..1cc88584 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC DeveloperBuild -- cgit v1.2.3 From 207eb4069be3ec44baed7be2eab41ed5107c50ec Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 28 Aug 2017 09:52:25 +0200 Subject: Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The merge commit 74eb853384473dbe18123f9731b6f9529d68d2cf accidentally brought forward the removal of files from commit 49ccf716dca2a14d21ce6869cdcd64b861c53834 that were not supposed to propagate. Change-Id: Ia5d6b2205c75f0856c3fed104149980c75a55840 Reviewed-by: Dominik Holland Reviewed-by: Iikka Eklund Reviewed-by: Simo Fält --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 5 ++ .../qtci-linux-RHEL-7.2-x86_64/09-cmake.sh | 53 ++++++++++++++++++++++ .../qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh | 53 ++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh new file mode 100644 index 00000000..ad1bf18f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -0,0 +1,5 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo subscription-manager refresh +sudo yum install -y python-devel python-virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc -- cgit v1.2.3 From f05289d62231fc38c0e8094870d917a14cd11654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 28 Aug 2017 09:42:02 +0300 Subject: Provisioning: Add $PATH properly in .bashrc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index 7cdfc25c..c23cf9b2 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -50,4 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc +echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh index 7cdfc25c..c23cf9b2 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh @@ -50,4 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc +echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc -- cgit v1.2.3 From 835ef953f026dcad106b9fe00e1504f4526d5a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 22 Aug 2017 15:06:23 +0300 Subject: Provisioning: Fine tune cmake provisioning script Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake.ps1 | 55 +++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 197eec57..50e2e82c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -1,10 +1,57 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" +$majorminorversion = "3.6" +$version = "3.6.2" + +$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" +$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" +$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" -Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip +Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: -Remove-Item C:\CMake -Force -Recurse -Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake +# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS +if((Test-Path -Path "C:\CMake" )){ + try { + Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old + } catch {} +} +$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" +Rename-Item $defaultinstallfolder C:\CMake + +echo "CMake = $version" >> ~\versions.txt + -- cgit v1.2.3 From c7a9bb92e1ed46464a38006832a010a719290779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 25 Aug 2017 09:02:36 +0300 Subject: Fix adding to path lines for Windows provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the path addition command will forget the previous addition when adding a new string. This hasn't been found out because python was the only script using this command. Now we also need to set the path for ruby, so the python string is left out. Change-Id: I39721d78111550189e52a9f095030033f9660c0a Reviewed-by: Tony Sarajärvi Reviewed-by: Joni Jäntti --- coin/provisioning/common/install-ruby.ps1 | 3 +++ coin/provisioning/common/python.ps1 | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 332a3a89..be0bc3eb 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -48,4 +48,7 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" +$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine) + echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 6c88689a..29114456 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -62,7 +62,9 @@ echo "Chancing allowZip64 value to 'True'..." (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py echo "Remove $package..." del $package -[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) + +$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) C:\Python27\python.exe -m ensurepip # Install python virtual env -- cgit v1.2.3 From 1bd2b2acfa5eff4a78b20fb9a0b49c79107a2b3a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 28 Aug 2017 12:55:16 +0200 Subject: Fix code duplication for cmake installation on Linux Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake_linux.sh | 53 +++++++++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 54 +--------------------- .../qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh | 54 +--------------------- 3 files changed, 55 insertions(+), 106 deletions(-) create mode 100755 coin/provisioning/common/cmake_linux.sh (limited to 'coin') diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh new file mode 100755 index 00000000..c23cf9b2 --- /dev/null +++ b/coin/provisioning/common/cmake_linux.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index c23cf9b2..d7abd285 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1,53 +1 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh index c23cf9b2..d7abd285 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh @@ -1,53 +1 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" - -version="3.6.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" -SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" -targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" - -InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" - -echo "Adding $targetFolder/bin to PATH" -echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc +$(dirname $0)/../common/cmake_linux.sh -- cgit v1.2.3 From a99d3432f71c4be5045ae2cdcc3b7070de5abe23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 26 Jul 2017 10:19:45 +0300 Subject: Install python3 on all platforms Python3 is required in 5.6 by pyside-setup. Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann (cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7) --- coin/provisioning/common/InstallPKGFromURL.sh | 104 +++++++++++++++++++++ coin/provisioning/common/python3.ps1 | 70 ++++++++++++++ coin/provisioning/common/python3.sh | 52 +++++++++++ coin/provisioning/common/vc_redist.ps1 | 64 +++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 14 +++ .../qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh | 4 +- .../qtci-osx-10.10-x86_64/025-python3.sh | 1 + .../qtci-osx-10.11-x86_64/025-python3.sh | 1 + .../qtci-osx-10.8-x86_64/025-python3.sh | 1 + .../qtci-osx-10.9-x86_64/025-python3.sh | 1 + coin/provisioning/qtci-windows-10-x86/python3.ps1 | 1 + .../qtci-windows-10-x86_64/python3.ps1 | 1 + .../qtci-windows-7-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/python3.ps1 | 1 + .../qtci-windows-8-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8-x86/python3.ps1 | 1 + .../qtci-windows-8-x86_64/07-vc_redist.ps1 | 1 + .../provisioning/qtci-windows-8-x86_64/python3.ps1 | 1 + 18 files changed, 319 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/InstallPKGFromURL.sh create mode 100644 coin/provisioning/common/python3.ps1 create mode 100755 coin/provisioning/common/python3.sh create mode 100644 coin/provisioning/common/vc_redist.ps1 create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/python3.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh new file mode 100644 index 00000000..c00b646c --- /dev/null +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -0,0 +1,104 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +ExceptionCreateTmpFile=100 +ExceptionDownloadPrimaryUrl=101 +ExceptionDownloadAltUrl=102 +ExceptionSHA1=103 +ExceptionInstallerPKG=104 +ExceptionDeleteTmpFile=105 + + +function InstallPKGFromURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + targetDirectory=$4 + + try + ( + echo "Creating temporary file" + targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg") || trow $ExceptionCreateTmpFile + try + ( + echo "Downloading PKG from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl + ) + catch || { + case $ex_code in + $ExceptionDownloadPrimaryUrl) + echo "Failed to download '$url' multiple times" + echo "Downloading PKG from alternative URL '$url_alt'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl + ;; + esac + } + echo "Checking SHA1 on PKG '$targetFile'" + echo "$expectedSha1 *$targetFile" > $targetFile.sha1 + /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1 + echo "Run installer on PKG" + sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG + echo "Removing file '$targetFile'" + rm "$targetFile" || throw $ExceptionDeleteTmpFile + ) + + catch || { + case $ex_code in + $ExceptionCreateTmpFile) + echo "Failed to create temporary file" + exit 1; + ;; + $ExceptionDownloadAltUrl) + echo "Failed downloading PKG from primary and alternative URLs" + exit 1; + ;; + $ExceptionSHA1) + echo "Failed to check sha1sum." + exit 1; + ;; + $ExceptionInstallerPKG) + echo "Failed running installer on PKG." + exit 1; + ;; + $ExceptionDeleteTmpFile) + echo "Failed deleting temporary file." + exit 1; + ;; + esac + } +} diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/python3.ps1 new file mode 100644 index 00000000..3c565874 --- /dev/null +++ b/coin/provisioning/common/python3.ps1 @@ -0,0 +1,70 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +param([Int32]$archVer=32) +. "$PSScriptRoot\helpers.ps1" + +# This script installs Python $version. +# Python3 is required for building some qt modules. + +$version = "3.6.1" +$package = "C:\Windows\temp\python-$version.exe" +$install_path = "C:\Python36" + +# check bit version +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe" + $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" +} +else { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe" + $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" +} + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q TargetDir=$install_path" +echo "Remove $package..." +del $package + +[Environment]::SetEnvironmentVariable("PYTHON3_PATH", "$install_path", [EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine) + +# Install python virtual env +cmd /c "$install_path\Scripts\pip3.exe install virtualenv" diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh new file mode 100755 index 00000000..56e82386 --- /dev/null +++ b/coin/provisioning/common/python3.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs python3 + +source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" +SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv + +echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +echo "python3 = 3.6.1" >> ~/versions.txt diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 new file mode 100644 index 00000000..95567669 --- /dev/null +++ b/coin/provisioning/common/vc_redist.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +param([Int32]$archVer=32) +. "$PSScriptRoot\helpers.ps1" + +# This script installs Visual C++ Redistributable for Visual Studio 2015 +# This is a dependency of the current python3 version + +# check bit version +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" + $arch = "x64" + $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe" + $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c" +} +else { + $arch = "x86" + $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe" + $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1" +} + +$package = "C:\Windows\temp\vc_redist.$arch.exe" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q" +echo "Remove $package..." +del $package diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index b419f217..0003127a 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -2,3 +2,17 @@ # version: provided by default Linux distribution repository # needed to build pyside sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm +sudo rpm -Uvh epel-release-latest-6.noarch.rpm +sudo rm -f epel-release-latest-6.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh index 205f598b..d4cd60e8 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh @@ -3,4 +3,6 @@ # needed to build pyside sudo apt-get update -sudo apt-get install -y python-dev +sudo apt-get install -y python-dev python3-dev python3-pip + +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-7-x86/python3.ps1 b/coin/provisioning/qtci-windows-7-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..6070c80b --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 -- cgit v1.2.3 From 30660bf987a22275339ae522c411809cdf077406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 19 May 2017 14:27:35 +0300 Subject: Make CI use a new provisioned Win 10 template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 10 template. Task-number: QTQAINFRA-1263 Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann Reviewed-by: Joni Jäntti Reviewed-by: Qt CI Bot --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 6 +++--- coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 | 1 + .../qtci-windows-10-x86_64/004-disable-windows-updates.ps1 | 1 + .../qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 | 1 + .../qtci-windows-10-x86_64/09-install-dependencywalker.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 | 1 + .../qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 | 1 + .../qtci-windows-10-x86_64/09-set-network-test-server.ps1 | 1 + 13 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 57820fcc..23b6e331 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,7 +7,7 @@ qtci-windows-8.1-x86_64 MSVC2013 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-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic 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 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index b7a49bd0..a24ffd9a 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- 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-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -10,6 +10,6 @@ qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packagin qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 new file mode 100644 index 00000000..ae3f327d --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..e8e24995 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-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-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 new file mode 100644 index 00000000..ee3f36a9 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 new file mode 100644 index 00000000..f9129cff --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 new file mode 100644 index 00000000..07c4f487 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..8d549455 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..18109622 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\set-network-test-server.ps1" -- cgit v1.2.3 From 05dd83c73ae072d1e0be3709ed87bbd485ae896c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 22 Aug 2017 15:39:09 +0300 Subject: provisioning: windows: ICU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed ICU script to actually install ICU instead of just setting the environment variables. It is required to build qtwebkit. Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/icu.ps1 | 120 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 index 4be185e5..16dd8a6f 100644 --- a/coin/provisioning/common/icu.ps1 +++ b/coin/provisioning/common/icu.ps1 @@ -1,5 +1,78 @@ -# ICU is already pre-installed on Windows machines, it would be nice to have -# the installation script, but for now let's just export the right variables +############################################################################ +## +## 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 ICU. + +$version = "53_1" + +if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { + + $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z" + $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z" + $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC" + + $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z" + $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z" + $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F" + + $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z" + $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z" + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64 + Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012 + Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""} + + echo "Cleaning $icuPackage_msvc2012_64..." + Remove-Item -Recurse -Force $icuPackage_msvc2012_64 + + echo "ICU MSVC2012 = $version" >> ~\versions.txt + } + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64 + Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013 + Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""} + + echo "Cleaning $icuPackage_msvc2013_64..." + Remove-Item -Recurse -Force $icuPackage_msvc2013_64 + + echo "ICU MSVC2013 = $version" >> ~\versions.txt + } # FIXME: do we really want to have it per MSVC version? What about MSVC2015? [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine") @@ -7,3 +80,46 @@ # FIXME: do we really want to use the 4.8.2 ICU build? [Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") + +} else { + + $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z" + $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z" + $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0" + + $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z" + $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z" + $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800" + + $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z" + $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z" + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32 + Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32 + Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""} + + echo "Cleaning $icuPackage_msvc2012_32..." + Remove-Item -Recurse -Force $icuPackage_msvc2012_32 + + echo "ICU MSVC2012 = $version" >> ~\versions.txt + } + + if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) { + echo "Fetching from URL ..." + Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32 + Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32 + Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""} + + echo "Cleaning $icuPackage_msvc2013_32..." + Remove-Item -Recurse -Force $icuPackage_msvc2013_32 + + echo "ICU MSVC2013 = $version" >> ~\versions.txt + } + +# FIXME: do we really want to have it per MSVC version? What about MSVC2015? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine") +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") + +} -- cgit v1.2.3 From 3ca76587815797b1b101941537c090b9026bd418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 21 Aug 2017 15:14:00 +0300 Subject: Provision vanilla Windows 8.1 x86 and use it Replaces existing Windows 8 x86 builds with a vanilla tier 1 image that gets all needed software provisioned except for VS2013 that is pre-installed. Also modifies existing provisioning scripts under common to support this 32bit OS. Task-number: QTQAINFRA-1383 Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9 Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- coin/provisioning/common/helpers.ps1 | 10 +++++ .../common/install-dependencywalker.ps1 | 13 ++++-- coin/provisioning/common/install-git.ps1 | 15 +++++-- coin/provisioning/common/install-java.ps1 | 16 +++++-- coin/provisioning/common/install-notepad++.ps1 | 21 +++++++-- coin/provisioning/common/install-ruby.ps1 | 13 ++++-- coin/provisioning/common/install-sevenzip.ps1 | 15 +++++-- .../common/install-strawberry-perl.ps1 | 13 ++++-- coin/provisioning/common/mysql.ps1 | 25 +++++++---- coin/provisioning/common/openssl.ps1 | 45 +++++++++++-------- coin/provisioning/common/postgresql.ps1 | 50 ++++++++++++--------- coin/provisioning/common/python.ps1 | 16 +++---- .../01-windows_removethemall.ps1 | 1 - .../qtci-windows-8-x86/04-disable-windefender.ps1 | 5 --- .../qtci-windows-8-x86/05-wsearch-off.ps1 | 3 -- coin/provisioning/qtci-windows-8-x86/06-python.ps1 | 1 - .../qtci-windows-8-x86/07-mesa_llvmpipe.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/cmake.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/icu.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/jom.ps1 | 1 - .../qtci-windows-8.1-x86/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/02-disable-sleep.ps1 | 1 + .../qtci-windows-8.1-x86/02-install-notepad++.ps1 | 1 + .../qtci-windows-8.1-x86/03-install-sevenzip.ps1 | 1 + .../04-disable-windefender.ps1 | 1 + .../qtci-windows-8.1-x86/05-wsearch-off.ps1 | 1 + .../qtci-windows-8.1-x86/06-python.ps1 | 1 + .../qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8.1-x86/08-install-git.ps1 | 1 + .../qtci-windows-8.1-x86/08-install-java.ps1 | 1 + .../09-install-dependencywalker.ps1 | 1 + .../qtci-windows-8.1-x86/09-install-ruby.ps1 | 1 + .../09-install-strawberry-perl.ps1 | 1 + .../provisioning/qtci-windows-8.1-x86/09-mysql.ps1 | 1 + .../qtci-windows-8.1-x86/09-postgresql.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/icu.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/jom.ps1 | 1 + .../qtci-windows-8.1-x86/msvc-2013-update5.ps1 | 51 ++++++++++++++++++++++ coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 | 1 + 44 files changed, 245 insertions(+), 96 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/06-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/cmake.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/icu.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 23b6e331..ea6e259b 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,7 +2,7 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- 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.1-x86 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 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 132fcdd3..3f7f0a68 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -88,3 +88,13 @@ function Add-Path echo "Adding $Path to Path" [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) } + +function is64bitWinHost +{ + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { + return 1 + } + else { + return 0 + } +} diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/install-dependencywalker.ps1 index a9a56f7a..ad89fc7b 100644 --- a/coin/provisioning/common/install-dependencywalker.ps1 +++ b/coin/provisioning/common/install-dependencywalker.ps1 @@ -36,10 +36,17 @@ # 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" +if( (is64bitWinHost) -eq 1 ) { + $arch = "_x64" + $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" +} +else { + $arch = "_x86" + $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22" + $arch + ".zip" +$url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip" $dependsPackage = "C:\Windows\Temp\depends-$version.zip" -$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" $TARGETDIR = "C:\Utils\dependencywalker" if(!(Test-Path -Path $TARGETDIR )){ diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/install-git.ps1 index d3543138..6b4a34b0 100644 --- a/coin/provisioning/common/install-git.ps1 +++ b/coin/provisioning/common/install-git.ps1 @@ -35,10 +35,17 @@ # 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" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-64-bit" + $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7" +} +else { + $arch = "-32-bit" + $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec" +} +$gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe" +$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe" echo "Fetching Git $version..." Download $url_official $url_cache $gitPackage diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1 index 06bcf6a1..4b9dd097 100644 --- a/coin/provisioning/common/install-java.ps1 +++ b/coin/provisioning/common/install-java.ps1 @@ -33,14 +33,24 @@ . "$PSScriptRoot\..\common\helpers.ps1" -# This script will install Java +# This script will install Java RE +# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only. $version = "7u7" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe" +if( (is64bitWinHost) -eq 1 ) { + $arch = "x64" + $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3" +} +else { + $arch = "i586" + $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".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 +echo "Java = $version $arch" >> ~\versions.txt diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/install-notepad++.ps1 index 15a8c004..2e893852 100644 --- a/coin/provisioning/common/install-notepad++.ps1 +++ b/coin/provisioning/common/install-notepad++.ps1 @@ -36,9 +36,16 @@ # 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" +if( (is64bitWinHost) -eq 1 ) { + $arch = ".x64" + $sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA" +} +else { + $arch = "" + $sha1 = "d4c403675a21cc381f640b92e596bae3ef958dc6" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer" + $arch + ".exe" +$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer" + $arch + ".exe" $nppPackage = "C:\Windows\Temp\npp-$version.exe" Download $url_official $url_cache $nppPackage @@ -50,5 +57,11 @@ Remove-Item -Recurse -Force "$nppPackage" echo "Notepad++ = $version" >> ~\versions.txt -Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +if( (is64bitWinHost) -eq 1 ) { + Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +} +else { + Rename-Item -Path "C:\Program Files\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 index be0bc3eb..81b01342 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -36,10 +36,17 @@ # 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" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-x64" + $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" +} +else { + $arch = "" + $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe" +$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe" $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe" -$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A" Download $url_official $url_cache $rubyPackage Verify-Checksum $rubyPackage $sha1 diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1 index 91442500..1db41cc1 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/install-sevenzip.ps1 @@ -36,10 +36,19 @@ # 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" + +if( (is64bitWinHost) -eq 1 ) { + $arch = "-x64" + $sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" +} +else { + $arch = "" + $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe" +$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe" $7zPackage = "C:\Windows\Temp\7zip-$version.exe" -$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" Download $url_official $url_cache $7zPackage Verify-Checksum $7zPackage $sha1 diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/install-strawberry-perl.ps1 index 83b63897..bd5347b6 100644 --- a/coin/provisioning/common/install-strawberry-perl.ps1 +++ b/coin/provisioning/common/install-strawberry-perl.ps1 @@ -36,10 +36,17 @@ # 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" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-64bit" + $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" +} +else { + $arch = "-32bit" + $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + $arch + ".msi" +$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" + $version + $arch + ".msi" $strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi" -$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" Download $url_official $url_cache $strawberryPackage Verify-Checksum $strawberryPackage $sha1 diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1 index 9bd9929b..e300566e 100644 --- a/coin/provisioning/common/mysql.ps1 +++ b/coin/provisioning/common/mysql.ps1 @@ -62,21 +62,28 @@ 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" +if( (is64bitWinHost) -eq 1 ) { + # 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 + DownloadAndInstall $internalUrl $packagex64 $installFolder -echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") + 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" +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\Utils\my_sql\my_sql$architecture" +} +else { + $installFolder = "C:\Utils\my_sql\my_sql" +} DownloadAndInstall $internalUrl $packagex86 $installFolder diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/openssl.ps1 index 2d63106f..df320c72 100644 --- a/coin/provisioning/common/openssl.ps1 +++ b/coin/provisioning/common/openssl.ps1 @@ -40,30 +40,39 @@ $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" +if( (is64bitWinHost) -eq 1 ) { -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" + # 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 "Remove downloaded $packagex64 ..." -Remove-Item $packagex64 + 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 "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") + 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" + +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\openssl$architecture" +} else { + $installFolder = "C:\openssl" +} + $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe" $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 index 2ff97761..dd5858a3 100644 --- a/coin/provisioning/common/postgresql.ps1 +++ b/coin/provisioning/common/postgresql.ps1 @@ -40,37 +40,45 @@ $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" +if( (is64bitWinHost) -eq 1 ) { + # 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 {} + # 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 "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 "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") + 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" +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\Utils\postgresql$architecture\pgsql" +} +else { + $installFolder = "C:\Utils\postgresql\pgsql" +} + echo "Fetching from URL..." Download $externalUrl $internalUrl $packagex86 diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 29114456..0be96eef 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -30,27 +30,23 @@ ## $QT_END_LICENSE$ ## ############################################################################# -param([Int32]$archVer=32) . "$PSScriptRoot\helpers.ps1" # This script installs Python $version. # Python is required for building Qt 5 from source. $version = "2.7.13" -$package = "C:\Windows\temp\python-$version.msi" - -# check bit version -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.intra.qt.io\provisioning\windows\python-$version.amd64.msi" +if( (is64bitWinHost) -eq 1 ) { + $arch = ".amd64" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { - $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi" + $arch = "" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } +$package = "C:\Windows\temp\python-$version.msi" +$externalUrl = "https://www.python.org/ftp/python/$version/python-$version" + $arch + ".msi" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version" + $arch + ".msi" echo "Fetching from URL..." Download $externalUrl $internalUrl $package diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 deleted file mode 100644 index dfca166f..00000000 --- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 deleted file mode 100644 index 2d1f0783..00000000 --- a/coin/provisioning/qtci-windows-8-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-8-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 deleted file mode 100644 index 09c45bbd..00000000 --- a/coin/provisioning/qtci-windows-8-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/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86/06-python.ps1 deleted file mode 100644 index 27c618e1..00000000 --- a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 deleted file mode 100644 index b405191e..00000000 --- a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 deleted file mode 100644 index 8dbe0372..00000000 --- a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 deleted file mode 100644 index 325be36a..00000000 --- a/coin/provisioning/qtci-windows-8-x86/icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 deleted file mode 100644 index 842c65dd..00000000 --- a/coin/provisioning/qtci-windows-8-x86/jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 new file mode 100644 index 00000000..2303699c --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 new file mode 100644 index 00000000..c19bf6cd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 new file mode 100644 index 00000000..16d2e180 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/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/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..e8e24995 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/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/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 new file mode 100644 index 00000000..ae3f327d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 new file mode 100644 index 00000000..1f26c731 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 new file mode 100644 index 00000000..ee3f36a9 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 new file mode 100644 index 00000000..f92acd91 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 new file mode 100644 index 00000000..167cfd35 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 new file mode 100644 index 00000000..44c1c5ff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 new file mode 100644 index 00000000..f9129cff --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 new file mode 100644 index 00000000..07c4f487 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-java.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..8d549455 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 new file mode 100644 index 00000000..0d28ea1e --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..18109622 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 new file mode 100644 index 00000000..a41035da --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 new file mode 100644 index 00000000..92339a45 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 new file mode 100644 index 00000000..325be36a --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 new file mode 100644 index 00000000..842c65dd --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 new file mode 100644 index 00000000..8540c67d --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/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/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 new file mode 100644 index 00000000..f3906f78 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\openssl.ps1" -- cgit v1.2.3 From d1dfb5767f1f199937abe5c46aba5219d667b21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 14 Aug 2017 13:39:37 +0300 Subject: Swap B2Qt branch to Morty Task-number: QTQAINFRA-1364 Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6 Reviewed-by: Jake Petroules --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qtdeclarative.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b3d564c5..b444d157 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 1cc88584..2a9d9ac7 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC DeveloperBuild -- cgit v1.2.3 From 84703103881f5cda1ec10720d551db9246519b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 28 Aug 2017 09:55:25 +0300 Subject: Provisioning: Add variables properly in .bashrc If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index acd0bd74..a6563ae5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -73,8 +73,8 @@ try sudo mkdir -p "$path" sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN - echo "export PATH=\"$opensslTargetLocation/bin:$PATH\"" >> ~/.bashrc - echo "export MANPATH=\"$opensslTargetLocation/share/man:$MANPATH\"" >> ~/.bashrc + echo "export PATH=\"$opensslTargetLocation/bin:\$PATH\"" >> ~/.bashrc + echo "export MANPATH=\"$opensslTargetLocation/share/man:\$MANPATH\"" >> ~/.bashrc security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate -- cgit v1.2.3 From 8c8be4816763db5a93aa14abc27d0f8047509aa1 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 7 Jul 2017 14:34:24 +0200 Subject: Prefer apt-get over apt in scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit apt explicitly warns that it doesn't have a stable UI, so it shouldn't be used in scripts. This should have no implications in practice. Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 8b28c981..593b7c5b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -46,42 +46,42 @@ try echo "Disabling auto update" sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED echo "Running update for apt" - sudo apt update + sudo apt-get update echo "Installing packages" # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install git || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install p7zip || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libssl-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT # Enable linking to system dbus - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libdbus-1-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT # Needed libraries for WebEngine - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT # Common event loop handling - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libglib2.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libmysqlclient-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libpq-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libsqlite3-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install unixodbc-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libfreetype6-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT # Enable the usage of system jpeg libraries - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libjpeg-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libcups2-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT # Install libraries needed for QtMultimedia to be able to support all plugins - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt -q -y install g++-multilib || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT ) catch || { case $ex_code in -- cgit v1.2.3 From 42b502f7bcf39da693739b313495980a1440a08a Mon Sep 17 00:00:00 2001 From: Aapo Keskimolo Date: Tue, 29 Aug 2017 13:11:59 +0300 Subject: Add UploadConfigureExe feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We used to solve the requirement for uploading configure.exe from product version, but we can add this as a feature and remove the dependency to product version. Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 14 +++++++------- coin/platform_configs/qt5.txt | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index ea6e259b..191e59d4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,16 +2,16 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe 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-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe 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-windows-8.1-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-8.1-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe 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 a24ffd9a..b9565ebe 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,15 +1,15 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-8.1-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-10-x86_64-8 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe +qtci-windows-10-x86_64-8 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 UploadConfigureExe +qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 UploadConfigureExe qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -- cgit v1.2.3 From 4e1f4665c5ed631e18d2fa4910fd1a612b40539a Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Tue, 15 Aug 2017 12:12:22 +0300 Subject: Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries requires Windows 64bit machine. Linking requires more RAM than Windows 32bit can address. Change MSVC2013 & MSVC2015 integration host machines accordingly. Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 191e59d4..c41f3d7f 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -2,11 +2,11 @@ Template Target OS Target arch Compiler ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe -qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe +qtci-windows-10-x86_64-8 x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe 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 -- cgit v1.2.3 From dbf737a5c098ffe5c38413c2f289790d87ec6131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Mon, 4 Sep 2017 13:25:44 +0300 Subject: Fix Add-Path helper function and start using it in scripts This function was broken and only added the latest addition to the actual PATH. Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake.ps1 | 2 ++ coin/provisioning/common/helpers.ps1 | 4 +++- coin/provisioning/common/install-ruby.ps1 | 3 +-- coin/provisioning/common/python.ps1 | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 50e2e82c..8a94dc5d 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -53,5 +53,7 @@ if((Test-Path -Path "C:\CMake" )){ $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake +Add-Path "C:\CMake\bin" + echo "CMake = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 3f7f0a68..846f58a5 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -86,7 +86,9 @@ function Add-Path [string]$Path ) echo "Adding $Path to Path" - [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine) + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) } function is64bitWinHost diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1 index 81b01342..57cf227f 100644 --- a/coin/provisioning/common/install-ruby.ps1 +++ b/coin/provisioning/common/install-ruby.ps1 @@ -55,7 +55,6 @@ cmd /c "$rubyPackage /silent" echo "Cleaning $rubyPackage.." Remove-Item -Recurse -Force "$rubyPackage" -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Ruby22-x64\bin" echo "Ruby = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 0be96eef..c3eba2d8 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -59,8 +59,7 @@ echo "Chancing allowZip64 value to 'True'..." echo "Remove $package..." del $package -$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') -[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) +Add-Path "C:\Python27;C:\Python27\Scripts" C:\Python27\python.exe -m ensurepip # Install python virtual env -- cgit v1.2.3 From a7b1b0035075b3a44e9e8e3801edf896501f6511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 4 Sep 2017 12:17:45 +0300 Subject: Provisioning: Hide powershell progress bar for performance Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613 Reviewed-by: Heikki Halmet --- coin/provisioning/common/helpers.ps1 | 1 + 1 file changed, 1 insertion(+) (limited to 'coin') diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 846f58a5..b957603a 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -69,6 +69,7 @@ function Download [string] $CachedUrl = $(BadParam("the locally cached URL")), [string] $Destination = $(BadParam("a download target location")) ) + $ProgressPreference = 'SilentlyContinue' try { if ($CachedUrl.StartsWith("http")) { Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination -- cgit v1.2.3 From a3f4bf703b9d76b6aa8224240a017d006237f85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 25 Aug 2017 09:52:12 +0300 Subject: Provisioning: Fix helper function's mktemp in macOS 10.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that macOS 10.10 has a non standard mktemp command. It doesn't work as expected but prints usage and exit instead. Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh index b6072062..bee16dd2 100644 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -74,7 +74,12 @@ function InstallAppFromCompressedFileFromURL { echo "Extension for file: $extension" echo "Creating temporary file and directory" targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile - targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + # macOS 10.10 mktemp does require prefix + if [[ $OSTYPE == "darwin14" ]]; then + targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory + else + targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + fi DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" echo "Uncompress $targetFile" case $extension in -- cgit v1.2.3 From c48355ebb58cb058df5b2ca519b6b89fbd09f380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 5 Sep 2017 07:37:04 +0300 Subject: Provisioning: Fix DownloadURL utility's shasum check MacOS 10.10 has older shasum tool, which does not support oneliner verification. Change-Id: If00b846d5772aa1991960675d022249d63e7bd77 Reviewed-by: Simon Hausmann --- coin/provisioning/common/DownloadURL.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index 305f2675..a663b602 100644 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -70,7 +70,8 @@ function DownloadURL { esac } echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + echo "$expectedSha1 *$targetFile" > $targetFile.sha1 + /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { -- cgit v1.2.3 From 6dfd0c7b38e9df65647b42c71b57c176980dd088 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 9 Aug 2017 11:22:39 +0300 Subject: Use 64-bit host for VS2017 builds of QtWebKit Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589 Reviewed-by: Simon Hausmann Reviewed-by: Iikka Eklund Reviewed-by: Konstantin Tokarev --- coin/platform_configs/qtwebkit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index abc434de..7c8e8ac5 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -- cgit v1.2.3 From cc8a7501f329fbfefd1584f18ac7ff413e2d0854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 25 Aug 2017 10:11:58 +0300 Subject: Swap B2Qt branch to Pyro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1364 Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki Reviewed-by: Sami Nurmenniemi --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qtdeclarative.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b3d564c5..e0467131 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c8ac9c47..b9d5ecb0 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro x86_64 GCC DeveloperBuild -- cgit v1.2.3 From 88525879919a3aa36d1753e8d4348201f2a44046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 12 Jun 2017 23:08:26 +0300 Subject: Provision openSUSE 42.3 and add to CI Replaces 42.1 that isn't supported anymore by openSUSE.org. Task-number: QTQAINFRA-1257 Task-number: QTQAINFRA-1259 Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01 Reviewed-by: Simon Hausmann Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 2 +- .../qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh | 9 ----- .../qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh | 1 - .../001-systemsetup.sh | 13 ++++++ .../002-zypperpackages.sh | 46 ++++++++++++++++++++++ .../008-pythondev.sh | 8 ++++ .../qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 + .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 9 +++++ 8 files changed, 78 insertions(+), 11 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index b444d157..63c54671 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -9,7 +9,7 @@ qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation -qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch +qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh deleted file mode 100755 index abbda212..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -. $BASEDIR/../common/sw_versions.txt -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="bbdbbc0296f42310077539b7247d285386119ef4" - -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh deleted file mode 100644 index d7abd285..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh +++ /dev/null @@ -1 +0,0 @@ -$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh new file mode 100755 index 00000000..4b2f2546 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +BASEDIR=$(dirname "$0") +source $BASEDIR/../common/network_test_server_ip.txt + +sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh new file mode 100755 index 00000000..1f6b9070 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -0,0 +1,46 @@ +#!/bin/bash +set -e + +sudo zypper -nq install git +# default compiler, gcc 4.8.5 +sudo zypper -nq install gcc +sudo zypper -nq install gcc-c++ + +sudo zypper -nq install bison +sudo zypper -nq install flex +sudo zypper -nq install gperf + +sudo zypper -nq install zlib-devel +sudo zypper -nq install libudev-devel +sudo zypper -nq install glib2-devel +sudo zypper -nq install libopenssl-devel +sudo zypper -nq install freetype2-devel +sudo zypper -nq install fontconfig-devel + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel +sudo zypper -nq install Mesa-libGL-devel + +sudo zypper -nq install libxkbcommon-devel + +# Xinput2 +sudo zypper -nq install libXi-devel + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel +sudo zypper -nq install xcb-util-image-devel +sudo zypper -nq install xcb-util-keysyms-devel +sudo zypper -nq install xcb-util-wm-devel +sudo zypper -nq install xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel +sudo zypper -nq install libicu52_1 + +# qtwebengine +sudo zypper -nq install alsa-devel +sudo zypper -nq install dbus-1-devel +sudo zypper -nq install libXcomposite-devel +sudo zypper -nq install libXcursor-devel +sudo zypper -nq install libXrandr-devel +sudo zypper -nq install libXtst-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh new file mode 100755 index 00000000..d8874561 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo zypper -nq install python-devel python-virtualenv + +# install python3 +sudo zypper -nq install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh new file mode 100755 index 00000000..d7abd285 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -0,0 +1 @@ +$(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh new file mode 100755 index 00000000..abbda212 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/sw_versions.txt +VERSION=$libclang_version +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +SHA1="bbdbbc0296f42310077539b7247d285386119ef4" + +$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" -- cgit v1.2.3 From 92d1bdcb43e988919bfdcb91c0e6f366bed07145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 7 Sep 2017 12:07:25 +0300 Subject: Provisioning: Fix shasum path Commit c48355ebb58cb058df5b2ca519b6b89fbd09f380 changed the path of shasum, which was not intended. While the DownloadURL.sh utility is used by rhel in addition to macOS we can't rely on /usr/bin/shasum but we have to use the one found from PATH. Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9 Reviewed-by: Simon Hausmann --- coin/provisioning/common/DownloadURL.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index a663b602..c60fae21 100644 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -71,7 +71,7 @@ function DownloadURL { } echo "Checking SHA1 on PKG '$targetFile'" echo "$expectedSha1 *$targetFile" > $targetFile.sha1 - /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1 + shasum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { -- cgit v1.2.3 From a1f173fc67587062a3e777c05131611b228f38e3 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 30 Aug 2017 10:22:34 +0200 Subject: Provisioning: Install paho mqtt broker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The paho broker is used for testing the Qt Mqtt module, specifically the client classes. Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/mqtt_broker.ps1 | 50 +++++++++++++++++++++ coin/provisioning/common/mqtt_broker.sh | 51 ++++++++++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh | 36 +++++++++++++++ .../qtci-windows-10-x86/mqtt_broker.ps1 | 1 + .../qtci-windows-10-x86_64/mqtt_broker.ps1 | 1 + .../qtci-windows-7-x86/mqtt_broker.ps1 | 1 + .../qtci-windows-8-x86/mqtt_broker.ps1 | 1 + .../qtci-windows-8-x86_64/mqtt_broker.ps1 | 1 + .../qtci-windows-8.1-x86_64/mqtt_broker.ps1 | 1 + 14 files changed, 323 insertions(+) create mode 100644 coin/provisioning/common/mqtt_broker.ps1 create mode 100644 coin/provisioning/common/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/mqtt_broker.ps1 b/coin/provisioning/common/mqtt_broker.ps1 new file mode 100644 index 00000000..610f22d8 --- /dev/null +++ b/coin/provisioning/common/mqtt_broker.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +echo "MQTT: Downloading Paho test broker..." +$zip = "c:\users\qt\downloads\pahotest.zip" +$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$sha1 = "532fe145096cdd8d679f425cbfd883289150c968" + +Download $externalUrl $internalUrl $zip +Verify-Checksum $zip $sha1 + +echo "MQTT: Installing $zip..." +Extract-Zip $zip C:\Utils +Remove-Item $zip + +echo "MQTT: Updating environment..." +[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine") diff --git a/coin/provisioning/common/mqtt_broker.sh b/coin/provisioning/common/mqtt_broker.sh new file mode 100644 index 00000000..7c316de2 --- /dev/null +++ b/coin/provisioning/common/mqtt_broker.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the 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 paho testing broker + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" +PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" +AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +SHA1="532fe145096cdd8d679f425cbfd883289150c968" +targetFolder="/opt/paho_broker" +appPrefix="paho.mqtt.testing-$CommitSHA" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding MQTT broker path to environment" +echo "export MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" -- cgit v1.2.3 From 528580bbcd2a2cd432a22efd6a7209c56c4fbb3e Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 2 May 2017 11:34:30 +0200 Subject: Install python3 on all platforms This forward-ports commit a99d3432f71c4be5045ae2cdcc3b7070de5abe23 to 5.9, which should have been done in 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb but accidentally left out. It reuses parts of commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74 that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann --- .../qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh | 15 ++++++++++++++- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 8 ++++++++ coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh (limited to 'coin') 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 index ad1bf18f..ff25f463 100644 --- 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 @@ -1,5 +1,18 @@ # 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 + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +sudo rpm -Uvh epel-release-latest-7.noarch.rpm +sudo rm -f epel-release-latest-7.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 593b7c5b..f07be55a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -82,6 +82,8 @@ try sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT + # python3 development package + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh new file mode 100644 index 00000000..254b738d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" -- cgit v1.2.3 From b1c268a8eb91eea35bf7592d24de0745c309f693 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 12 Sep 2017 10:32:14 +0200 Subject: Build examples also on Linux with namespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this change we get coverage for namespace related build breakages in examples of Linux-only modules, such as wayland. Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c Reviewed-by: Tony Sarajärvi Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 63c54671..acfeba93 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7 MSVC2015 qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker -- cgit v1.2.3 From a9cf936a6304550b923bd325d05bdb209ca82371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 12 Sep 2017 10:20:38 +0300 Subject: Provision: Move Python3 scripts from win8 to win8.1 folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c Reviewed-by: Dominik Holland Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 | 1 - coin/provisioning/qtci-windows-8-x86/python3.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/python3.ps1 | 1 - coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86/python3.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/python3.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/python3.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 (limited to 'coin') diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 deleted file mode 100644 index ad3d5950..00000000 --- a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8-x86/python3.ps1 deleted file mode 100644 index 164fbe43..00000000 --- a/coin/provisioning/qtci-windows-8-x86/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 deleted file mode 100644 index 6070c80b..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 deleted file mode 100644 index b0c21996..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..6070c80b --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 -- cgit v1.2.3 From 892833cda910143a8cfd73062c90c8ac080dd8fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 4 Sep 2017 12:49:20 +0300 Subject: Provisioning: Invoke installer with Start-Process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By launching an installer with Start-Process and -Wait, we make sure no handles are left holding on to the installer when we try to delete it at cleanup. Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/vc_redist.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 index 95567669..4213dde9 100644 --- a/coin/provisioning/common/vc_redist.ps1 +++ b/coin/provisioning/common/vc_redist.ps1 @@ -59,6 +59,6 @@ echo "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 echo "Installing $package..." -cmd /c "$package /q" +Start-Process -FilePath $package -ArgumentList "/q" -Wait echo "Remove $package..." del $package -- cgit v1.2.3 From 2a5f54d07e9e935a0c86a0d3fdcf223dd0863f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 29 Aug 2017 09:31:43 +0300 Subject: provisioning: install MinGW 530 and 630 for Win10 x64 MinGW is an alternative option for Visual Studio. It's used to create desktop builds and for cross compiling Android and QNX. At this point it is still unclear which version is going to be used for what, but as both are supported, let's think ahead and provide them both. This also allows us to debug with the other, if the other is causing problems. Task-number: QTQAINFRA-1289 Change-Id: I2a922669c07d49370e608c093be80481c8613dc7 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/install-mingw.ps1 | 26 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/09-install-mingw530.ps1 | 10 +++++++++ .../qtci-windows-10-x86_64/09-install-mingw630.ps1 | 8 +++++++ 3 files changed, 44 insertions(+) create mode 100644 coin/provisioning/common/install-mingw.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 new file mode 100644 index 00000000..fc02631d --- /dev/null +++ b/coin/provisioning/common/install-mingw.ps1 @@ -0,0 +1,26 @@ +function InstallMinGW +{ + Param ( + [string] $version = $(BadParam("the version being printed to versions.txt")), + [string] $release = $(BadParam("release part of the file name")) + ) + + $envvar = "MINGW$version" + $envvar = $envvar -replace '["."]' + $targetdir = "C:\$envvar" + $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z" + + $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" + Copy-Item $url_cache $mingwPackage + + Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} + + echo "Adding MinGW environment variable." + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + + echo "Cleaning $mingwPackage.." + Remove-Item -Recurse -Force "$mingwPackage" + + echo "MinGW = $version $release" >> ~\versions.txt + +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 new file mode 100644 index 00000000..ded894a5 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 5.3.0 + +$version = "5.3.0" +$release = "release-posix-dwarf-rt_v4-rev0" + +InstallMinGW $version $release + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 new file mode 100644 index 00000000..a2710760 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -0,0 +1,8 @@ +. "$PSScriptRoot\..\common\install-mingw.ps1" + +# This script will install MinGW 6.3.0 + +$version = "6.3.0" +$release = "release-posix-dwarf-rt_v5-rev2" + +InstallMinGW $version $release -- cgit v1.2.3 From b0a9259c6ee24673fc5579ba33063e9a7619a3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 25 Aug 2017 11:32:34 +0300 Subject: Provision and build QNX660 on Win 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes the mingw from 4.9 to 5.3. Task-number: QTQAINFRA-1208 Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905 Reviewed-by: Sami Nurmenniemi Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 2 + coin/provisioning/common/install-qnx660.ps1 | 46 ++++++++++++++++++++++ .../qtci-windows-10-x86_64/030-qnx660.ps1 | 1 + 3 files changed, 49 insertions(+) create mode 100644 coin/provisioning/common/install-qnx660.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 (limited to 'coin') diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index b9565ebe..92d55b1f 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,6 +9,8 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packagin qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-7 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-7 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored qtci-windows-10-x86_64-8 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests UploadConfigureExe diff --git a/coin/provisioning/common/install-qnx660.ps1 b/coin/provisioning/common/install-qnx660.ps1 new file mode 100644 index 00000000..bf9c9d09 --- /dev/null +++ b/coin/provisioning/common/install-qnx660.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\helpers.ps1" + +# This script will install QNX 6.6.0 + +$version = "6.6.0" +$nondottedversion = $version -replace '[.]','' +$targetFolder = "c:" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" + +Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} + +[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") +echo "QNX = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 new file mode 100644 index 00000000..39627626 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\install-qnx660.ps1" -- cgit v1.2.3 From fd76acc661003f7ad48c5c87ffe4e51b6f8f72e9 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 14 Sep 2017 16:38:41 +0200 Subject: Add mqtt to qtci-linux-openSUSE-42.3-x86_64 MQTT provisioning happened concurrently with an OpenSUSE update. Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998 Reviewed-by: Simon Hausmann --- .../qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh | 36 ---------------------- .../qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh | 36 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh deleted file mode 100644 index e367c20b..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/mqtt_broker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh" -- cgit v1.2.3 From 12fd0d5b9b486eaf80712d390265402a3bb06f0e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Sep 2017 10:26:29 +0300 Subject: Ensure 'clean' android Installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'coin') 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 7c3220ee..c278a2ce 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 @@ -87,7 +87,13 @@ function InstallAndroidPackage { sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir "$targetFolder" +if [ -d "$targetFolder" ]; then + echo "Removing old Android installation" + sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; ) +fi + +sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; ) + # Install Android SDK echo "Installing Android SDK version $sdkPackage..." InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName -- cgit v1.2.3 From b7d943171669a0dfc7c891716ee264f731e9f899 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 15 Sep 2017 10:22:24 +0200 Subject: Fix python installation on OpenSuSE 42.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The move was forgotten in commit dd3d32d13cf03a9e6ca661408b7995e8493c6af4 that merged the 42.1 to 42.3 switch from the 5.9 branch. Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab Reviewed-by: Dominik Holland Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh | 8 -------- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh deleted file mode 100644 index 0b42d5a1..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh +++ /dev/null @@ -1,8 +0,0 @@ -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -sudo pkcon -y refresh -sudo pkcon -y install python-devel python-virtualenv - -# install python3 -sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh new file mode 100644 index 00000000..0b42d5a1 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-virtualenv -- cgit v1.2.3 From 57043fb07bfc30e2f045c2c4ce2cd18fb2a64e48 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 15 Sep 2017 13:38:26 +0200 Subject: Clean up QNX patching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches from ci-files01 instead. Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f Reviewed-by: Simo Fält --- coin/provisioning/common/patch_qnx.ps1 | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 index 2fca7b67..632859a0 100644 --- a/coin/provisioning/common/patch_qnx.ps1 +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" $tempDir = "C:\temp\qnx_path" -Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip Verify-Checksum $zip $sha1 Extract-Zip $zip $tempDir Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh index 19993ecc..ad5c90d3 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -60,5 +60,5 @@ function InstallZipPackageFromURL { echo "Patching QNX" -baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" -- cgit v1.2.3 From 0c66e761befc8356393ba353fa077f82def502b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 20 Jun 2017 13:09:20 +0300 Subject: provisioning: Windows 10 x64/x86 Vulkan SDK Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64. Task-number: QTQAINFRA-1186 Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f Reviewed-by: Laszlo Agocs --- coin/provisioning/common/vulkansdk.ps1 | 48 ++++++++++++++++++++++ .../qtci-windows-10-x86/09-vulkansdk.ps1 | 1 + .../qtci-windows-10-x86_64/09-vulkansdk.ps1 | 1 + 3 files changed, 50 insertions(+) create mode 100644 coin/provisioning/common/vulkansdk.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/vulkansdk.ps1 b/coin/provisioning/common/vulkansdk.ps1 new file mode 100644 index 00000000..c572fa47 --- /dev/null +++ b/coin/provisioning/common/vulkansdk.ps1 @@ -0,0 +1,48 @@ +############################################################################ +## +## 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 Vulkan SDK + +$version = "1.0.51.0" +$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe" +$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe" + +Copy-Item $url_cache $vulkanPackage +cmd /c "$vulkanPackage /S" + +echo "Cleaning $vulkanPackage.." +Remove-Item -Recurse -Force "$vulkanPackage" + +echo "Vulkan SDK = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 new file mode 100644 index 00000000..38185051 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 new file mode 100644 index 00000000..38185051 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vulkansdk.ps1" -- cgit v1.2.3 From b77ab20bf046515f9d058f553410e0314a6442a0 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 22 Sep 2017 12:58:30 +0200 Subject: Provisioning: Update MQTT provisioning MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not being evaluated. Furthermore, a previous installation might need to be removed. Change-Id: I9edaeb13378aa262b453f816260ade01ba414961 Reviewed-by: Simon Hausmann --- coin/provisioning/common/mqtt_broker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/common/mqtt_broker.sh b/coin/provisioning/common/mqtt_broker.sh index 7c316de2..b52b78b1 100644 --- a/coin/provisioning/common/mqtt_broker.sh +++ b/coin/provisioning/common/mqtt_broker.sh @@ -45,7 +45,8 @@ SHA1="532fe145096cdd8d679f425cbfd883289150c968" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" +sudo rm -fr "$targetFolder" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding MQTT broker path to environment" -echo "export MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" >> ~/.bashrc +sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc -- cgit v1.2.3 From 512f8ff0a26dcc50260811d0108b32679b8c1054 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 4 Sep 2017 13:26:33 +0300 Subject: Change Packaging and iOS builds to macOS 10.12 This changes swap packaging and iOS builds from 10.10 to 10.12 Task-number: QTQAINFRA-1095 Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013 Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 5 ++--- coin/platform_configs/qt5.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index acfeba93..a94a6371 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,11 +12,10 @@ qtci-linux-Ubuntu-16.04-x86_64-1 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker -qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release +qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch -qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d486061d..727dd7e9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -19,5 +19,5 @@ qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 0b251bbdc058808c4264cbcc473c08f6c8a90f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 25 Sep 2017 10:04:39 +0300 Subject: Provisioning: Install Python3 development libs to OpenSUSE Those are required to build Pyside#5.9 branch. Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a Reviewed-by: Dominik Holland Reviewed-by: Friedemann Kleint --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin') diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 254b738d..ce0badc0 100644 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -5,4 +5,4 @@ sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv # install python3 -sudo pkcon -y install python3 python3-pip python3-virtualenv +sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv -- cgit v1.2.3 From 0e4d668e358eb6a025b3173e8a822ddbef7f5aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 26 Sep 2017 09:32:06 +0300 Subject: Add official URL to MinGW Windows 10 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MinGW currently uses only internal URL without backup. Added the official URL to these scripts with SHA1 checksum verification. Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/install-mingw.ps1 | 50 ++++++++++++++++++++-- .../qtci-windows-10-x86_64/09-install-mingw530.ps1 | 6 +-- .../qtci-windows-10-x86_64/09-install-mingw630.ps1 | 6 +-- 3 files changed, 52 insertions(+), 10 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 index fc02631d..f835059a 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/install-mingw.ps1 @@ -1,17 +1,59 @@ +############################################################################ +## +## 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" + function InstallMinGW { Param ( - [string] $version = $(BadParam("the version being printed to versions.txt")), - [string] $release = $(BadParam("release part of the file name")) + [string] $release = $(BadParam("release file name")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")) ) + $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') + + if ($arch -eq "i686") { $win_arch = "Win32" } + elseif ($arch -eq "x86_64") { $win_arch = "Win64" } + $envvar = "MINGW$version" $envvar = $envvar -replace '["."]' $targetdir = "C:\$envvar" - $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z" + $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" + $url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" - Copy-Item $url_cache $mingwPackage + Download $url_official $url_cache $mingwPackage + Verify-Checksum $mingwPackage $sha1 Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index ded894a5..7c4cd8ac 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -2,9 +2,9 @@ # This script will install MinGW 5.3.0 -$version = "5.3.0" -$release = "release-posix-dwarf-rt_v4-rev0" +$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" +$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" -InstallMinGW $version $release +InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index a2710760..e11f2310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -2,7 +2,7 @@ # This script will install MinGW 6.3.0 -$version = "6.3.0" -$release = "release-posix-dwarf-rt_v5-rev2" +$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" +$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" -InstallMinGW $version $release +InstallMinGW $release $sha1 -- cgit v1.2.3