From 2c4b06a13d863827d62a537fa4f732c74600a1bd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 15 Jun 2017 16:27:53 +0200 Subject: Centralize Mesa LLVMPipe installation on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install the DLL for general availability on all Windows systems. Due to its distinct name it will not be picked up by anyone unless Qt explicitly selects it. This gives us the ability to choose the GLES backend to use in Qt. Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/mesa_llvmpipe.ps1 | 63 ++++++++++++++++++++++ .../qtci-windows-10-x86/06-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-10-x86_64/opengl32_x86.ps1 | 11 ---- .../qtci-windows-7-x86/08-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8-x86/07-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 | 1 + 7 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 coin/provisioning/common/mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 (limited to 'coin') diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1 new file mode 100644 index 00000000..7ea0629d --- /dev/null +++ b/coin/provisioning/common/mesa_llvmpipe.ps1 @@ -0,0 +1,63 @@ +############################################################################# +## +## 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" + +$version = "11_2_2" +$package = "C:\Windows\temp\opengl32sw.7z" +$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1" +$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" +$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" +$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" + +function Extract-Mesa +{ + Param ( + [string]$downloadUrl, + [string]$sha1, + [string]$targetFolder + ) + Write-Host "Installing Mesa from $downloadUrl to $targetFolder" + $localArchivePath = "C:\Windows\temp\opengl32sw.7z" + Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $localArchivePath + Verify-Checksum $localArchivePath $sha1 + Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$targetFolder"} + Remove-Item $localArchivePath +} + +if ( Test-Path C:\Windows\SysWOW64 ) { + Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative" + Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64" +} else { + Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32" +} + diff --git a/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/06-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index fa2c753a..bd9afd5a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -34,22 +34,11 @@ . "$PSScriptRoot\..\common\helpers.ps1" $version = "11_2_2" -$package = "C:\Windows\temp\opengl32sw_$version.7z" -$destinationFolder = "C:\Windows\SysWOW64" $openglPackage = "C:\Windows\SysWOW64\opengl32.dll" -$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" -$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" $openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" -Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package -Verify-Checksum $package $mesaOpenglSha1 -Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"} - -echo "Remove downloaded $package ..." -Remove-Item $package -recurse - echo "Take ownership of existing opengl32.dll from SysWOW64" takeown /f $openglPackage icacls $openglPackage /grant Administrators:F diff --git a/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" -- cgit v1.2.3 From 1bdbe06c82051abbe7028c5f2babe586c94eb302 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 3 Jul 2017 15:16:38 +0200 Subject: MSVC: Run tests with MSVC2017 instead of MSVC2013 It appears tests compiled with MSVC2013/64bit are prone to crashes. Keep only a developer build/compile test in default.txt and move the packacking builds to qt5.txt with tests disabled. Enable testing with MSVC2017 builds in qt5.txt. Task-number: QTBUG-58654 Task-number: QTBUG-50835 Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +--- coin/platform_configs/qt5.txt | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index d2328871..c82a0feb 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,9 +1,7 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release +qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples -qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index efcdd620..fec2a44c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,10 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -- cgit v1.2.3 From 8b9a8c489f8670a3be7cf30d2cfc224fb95c1144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 12 Jul 2017 16:04:19 +0200 Subject: Use updated Ubuntu 16.04 in CI The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 8 ++++---- coin/platform_configs/qtdeclarative.txt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c82a0feb..7ee4df05 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,8 +7,8 @@ qtci-windows-10-x86_64-7 x86 MSVC2015 qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic 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 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-openSUSE-42.1-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 @@ -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 Boot2Qt_Jethro armv7 GCC Release -qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index c7552671..c8ac9c47 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 Boot2Qt_Jethro x86_64 GCC DeveloperBuild +Template Target OS Target arch Compiler Features +--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Jethro x86_64 GCC DeveloperBuild -- cgit v1.2.3 From eca392d3f3831f07c96a24f08feb0f292b9dd62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 12 Jul 2017 16:00:50 +0200 Subject: Use updated Ubuntu 14.04 in CI The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 2e11cc02..3da4c983 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,8 +10,8 @@ qtci-windows-10-x86-6 MSVC2015 qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-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 @@ -20,7 +20,7 @@ qtci-osx-10.9-x86_64 Clang qtci-osx-10.8-x86_64 Clang Release NoFramework qtci-osx-10.11-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Fido armv7 GCC DisableTests +qtci-linux-Ubuntu-14.04-x86_64-1 Boot2Qt_Fido armv7 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-14.04-x86_64-1 GCC TestOnly LicenseCheck qtci-windows-7-x86-2 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 -- cgit v1.2.3 From c9d5341307e02cc71d4d99342e6915621f7d18f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 17 Jul 2017 11:10:53 +0300 Subject: Provisioning: Fix virtualenv in macOS 10.11 There are multiple Python installations in our macOS 10.11 Tier1 template. Most of them are pretty old and not even working properly. One of the affected Python tool is virtualenv, which atm is creating Python 2.6 env by default even if Python 2.7 is the default Python. Change-Id: I8bc0900976a9dc79637539802345175c85b7b433 Reviewed-by: Simon Hausmann --- .../qtci-osx-10.11-x86_64/004-fix-virtualenv.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh (limited to 'coin') diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh new file mode 100755 index 00000000..f3646572 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# macOS 10.11 template doesn't have working virtualenv installation. +# To fix that, we first have to install pip to install virtualenv +# Install pip +curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py +sudo python get-pip.py +rm get-pip.py + +# remove link pointing to broken virtualenv +sudo rm /opt/local/bin/virtualenv +sudo pip install virtualenv + +# fix the link. This is optional, while the new installation is +# already in PATH, but there will be virtualenv-2.6 in /opt/local/bin +# which might be confusing +sudo ln -s /usr/local/bin/virtualenv /opt/local/bin/virtualenv -- cgit v1.2.3