diff options
150 files changed, 642 insertions, 342 deletions
diff --git a/.gitmodules b/.gitmodules index b4988927..ce89d72b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.11 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.11 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.11 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.11 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.11 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.11 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.11 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.11 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.11 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects + recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.11 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 - status = preview + branch = 5.11 + status = addon [submodule "qtnetworkauth"] depends = qtbase - recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 - status = preview + branch = 5.11 + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.11 + status = preview +[submodule "qtwebglplugin"] + depends = qtbase qtwebsockets + recommends = qtdeclarative + path = qtwebglplugin + url = ../qtwebglplugin.git + branch = 5.11 status = preview diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c3af6b5d..9ec6a406 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,25 +1,27 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker 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 Release NoFramework DisableTests -qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests +qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck -qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 558a756b..36d8f5eb 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,10 +1,7 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests @@ -14,11 +11,12 @@ qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packagin qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 75fa9c20..efae9754 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt new file mode 100644 index 00000000..5453a022 --- /dev/null +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -0,0 +1,5 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic + diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh new file mode 100755 index 00000000..fc215e8a --- /dev/null +++ b/coin/provisioning/common/linux/open62541.sh @@ -0,0 +1,63 @@ +#!/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$ +## +############################################################################# + +set +e + +# We need to source to be able to use cmake in the shell +if uname -a |grep -q "Ubuntu"; then + source ~/.profile +else + source ~/.bashrc +fi + +set -ex + +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR + +sudo pip install --upgrade pip +sudo pip install six + +git clone https://github.com/open62541/open62541.git open62541 +cd open62541 +git checkout 302003d2448946fa4d8a02cc209b8931d31e975b +mkdir build +cd build +cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. +make + +sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 5901b634..584c91a8 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -59,6 +59,7 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then fi rm -rf $targetFile + # Set env variables SetEnvVar "QNX_700" "$targetFolder$folderName" diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh new file mode 100644 index 00000000..c64c0fec --- /dev/null +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -0,0 +1,55 @@ +#!/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=./InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" +PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" +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" +SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py" + +echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 4248d0ed..b24de870 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -116,6 +116,7 @@ function Add-Path $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine) + $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') } function is64bitWinHost diff --git a/coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/windows/icu.ps1 index c08748d8..be0f7277 100644 --- a/coin/provisioning/common/windows/icu.ps1 +++ b/coin/provisioning/common/windows/icu.ps1 @@ -39,51 +39,7 @@ $version = "53_1" if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) { - $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_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z" - - 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_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") - # 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_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_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z" - - 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_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine") - } diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index 9609336e..f3e96318 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -58,7 +58,7 @@ function InstallMinGW Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} echo "Adding MinGW environment variable." - [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2), [EnvironmentVariableTarget]::Machine) echo "Cleaning $mingwPackage.." Remove-Item -Recurse -Force "$mingwPackage" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 208d1ed4..5a25d2eb 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -4,29 +4,39 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' } +$zip = "c:\users\qt\downloads\libclang.7z" +$baseDestination = "C:\Utils\libclang-" + $libclang_version if ( $archVer -eq 64 ) { $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z" -} else { - $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" + $destination = $baseDestination + "-64" + + Download $url $url $zip + Verify-Checksum $zip $sha1 + + C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ + Rename-Item C:\Utils\libclang $destination + del $zip } -$zip = "c:\users\qt\downloads\libclang.7z" -$destination = "C:\Utils\libclang-" + $libclang_version +$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" +$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" +$destination = $baseDestination + "-32" Download $url $url $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ Rename-Item C:\Utils\libclang $destination - -[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine) del $zip + +[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $baseDestination + "-_ARCH_", [EnvironmentVariableTarget]::Machine) echo "libClang = $libclang_version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 new file mode 100644 index 00000000..35bb9823 --- /dev/null +++ b/coin/provisioning/common/windows/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 = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/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/windows/install-qnx660.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1 index bf9c9d09..bade33ef 100644 --- a/coin/provisioning/common/windows/install-qnx660.ps1 +++ b/coin/provisioning/common/windows/vulkansdk.ps1 @@ -33,14 +33,16 @@ . "$PSScriptRoot\helpers.ps1" -# This script will install QNX 6.6.0 +# This script will install Vulkan SDK -$version = "6.6.0" -$nondottedversion = $version -replace '[.]','' -$targetFolder = "c:" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip" +$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" -Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"} +Copy-Item $url_cache $vulkanPackage +cmd /c "$vulkanPackage /S" -[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine") -echo "QNX = $version" >> ~\versions.txt +echo "Cleaning $vulkanPackage.." +Remove-Item -Recurse -Force "$vulkanPackage" + +echo "Vulkan SDK = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/win10-enable-devmode.ps1 b/coin/provisioning/common/windows/win10-enable-devmode.ps1 new file mode 100644 index 00000000..2d7733c0 --- /dev/null +++ b/coin/provisioning/common/windows/win10-enable-devmode.ps1 @@ -0,0 +1,16 @@ +# Turning on developer mode. +# +# In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines. +# https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development + +if ([environment]::Is64BitOperatingSystem) { + $bitness = "/reg:64" +} else { + $bitness = "/reg:32" +} + +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F $bitness +if ($LastExitCode -ne 0) { + Write-Host "Could not enable Developer Mode." + exit 1 +} diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 new file mode 100644 index 00000000..f433ac7a --- /dev/null +++ b/coin/provisioning/common/windows/winrtrunner.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\winrtrunner.zip" + +Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip +Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" +Extract-Zip $zip C:\Utils\winrtrunner +Remove-Item $zip + +[Environment]::SetEnvironmentVariable("CI_WINRTRUNNER_PATH", "C:\Utils\winrtrunner", "Machine") diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh index 447e7b1f..04c09770 100644..100755 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh @@ -1,9 +1,11 @@ +#!/usr/bin/env bash + ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the provisioning scripts of the Qt Toolkit. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -30,21 +32,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\windows\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 - -echo "Installing Update 5 for Visual Studio $version..." -Start-Process -FilePath $package -ArgumentList "/norestart /passive" -Wait - -echo "Removing $package ..." -remove-item $package -echo "Visual Studio = $version" >> ~\versions.txt +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 60f5ad29..23b80d89 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -83,6 +83,9 @@ installPackages+=(perl-Digest-SHA) installPackages+=(glibc.i686) # Enable Qt Bluetooth installPackages+=(bluez-libs-devel) +# QtWebKit +installPackages+=(libxml2-devel) +installPackages+=(libxslt-devel) sudo yum -y update sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh new file mode 100755 index 00000000..6cc2b44f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.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/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index a2132209..e0e1d1f1 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -99,10 +99,16 @@ try installPackages+=(libgstreamer-plugins-bad1.0-dev) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) installPackages+=(g++-multilib) + # python2 development package + installPackages+=(python-pip) # python3 development package installPackages+=(python3-dev) installPackages+=(python3-pip) installPackages+=(python3-virtualenv) + # Needed to be able to build Yocto + installPackages+=(chrpath) + installPackages+=(gawk) + installPackages+=(texinfo) # Automates interactive applications (Needed by RTA to automate configure testing) installPackages+=(expect) installPackages+=(mesa-common-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 9ff1ec6c..b2057b21 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -94,4 +94,10 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" +qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE" +qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH" + +# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) +qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1" + +SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh new file mode 100755 index 00000000..dde7d702 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/shared/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/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index c792d8b5..cc799702 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." -versionARM="2.2.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package" -SHA1="2583ae29951954cb27f12400fcb4ee94738d1430" +versionARM="2.3.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" +SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" @@ -60,11 +60,11 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt..." -versionARM64="2.2.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package" -SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6" +versionARM64="2.3.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" +SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/common/windows/patch_qnx.ps1 b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh index 632859a0..6570e107 100644..100755 --- a/coin/provisioning/common/windows/patch_qnx.ps1 +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + ############################################################################# ## ## Copyright (C) 2016 The Qt Company Ltd. @@ -31,21 +33,19 @@ ## ############################################################################# -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip - - -. "$PSScriptRoot\helpers.ps1" - -$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" -$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" -$tempDir = "C:\temp\qnx_path" +sudo apt-get update +sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev -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 -Remove-Item $tempDir -recurse +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR +git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua +cd freeopcua +git checkout 955cc5b924cf310fc15b376a11f4b7b9db28980b +mkdir build +cd build +source ~/.profile +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. +make +sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh new file mode 100755 index 00000000..6cc2b44f --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.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/linux/open62541.sh" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index 202d072d..7f24d224 100644..100755 --- a/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -1,9 +1,11 @@ +#!/bin/env bash + ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the provisioning scripts of the Qt Toolkit. +## This file is part of the test suite of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -30,22 +32,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\windows\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 +set -ex -echo "Visual Studio = $version" >> ~\versions.txt +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index 0661fdb0..cbdcbf64 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -3,9 +3,12 @@ set -ex 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 gcc7 +sudo zypper -nq install gcc7-c++ +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ + --slave /usr/bin/cc cc /usr/bin/gcc-7 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-7 sudo zypper -nq install bison sudo zypper -nq install flex @@ -17,6 +20,7 @@ sudo zypper -nq install glib2-devel sudo zypper -nq install libopenssl-devel sudo zypper -nq install freetype2-devel sudo zypper -nq install fontconfig-devel +sudo zypper -nq install sqlite3-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel @@ -48,5 +52,13 @@ sudo zypper -nq install libXtst-devel sudo zypper -nq install mozilla-nspr-devel sudo zypper -nq install mozilla-nss-devel +# qtwebkit +sudo zypper -nq install libxml2-devel +sudo zypper -nq install libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia) +sudo zypper -nq install gstreamer-devel +sudo zypper -nq install gstreamer-plugins-base-devel + # cups sudo zypper -nq install cups-devel 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 92a8dd0b..e7cdd4a7 100755 --- 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 @@ -9,4 +9,4 @@ sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv # install python3 -sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv +sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh new file mode 100755 index 00000000..6cc2b44f --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.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/linux/open62541.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh index 6f998a60..d85e3c8e 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env bash +#!/bin/bash ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## 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. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage @@ -33,32 +33,47 @@ ## ############################################################################# -# Patch QNX SDK due to issues in the standard library. -# The patches are available here: -# http://www.qnx.com/download/feature.html?programid=27555 -# A copy of the patch must be in the root of the Coin path in -# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip +# This script installs QNX 7. -set -ex -sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" +# shellcheck source=../common/unix/try_catch.sh +source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" -function InstallZipPackageFromURL { - url=$1 - expectedSha1=$2 - targetDirectory=$3 +targetFolder="/opt/" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +folderName="qnx700" - targetFile=`mktemp` - wget --tries=5 --waitretry=5 --output-document=$targetFile $url - echo "$expectedSha1 $targetFile" | sha1sum --check +ExceptionExtract=100 +ExceptionExtract2=101 - tempDir=`mktemp -d` - /usr/bin/unzip -o -d $tempDir $targetFile - trap "sudo rm -fr $targetFile $tempDir" EXIT - sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ -} +try +( + sudo mkdir -p "$targetFolder" + + echo "Extracting QNX 7" + sudo unzip -q "$sourceFile" -d "$targetFolder" || throw $ExceptionExtract + + sudo chown -R qt:wheel "$targetFolder"/"$folderName" -echo "Patching QNX" + # Verify that we have last file in zip + if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + throw $ExceptionExtract2 + fi + + # Set env variables + echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc + echo "QNX SDP = 7.0.0" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionExtract) + echo "Failed to unzip QNX 7." + exit 1; + ;; + $ExceptionExtract2) + echo "The last file in the zip did not get extracted." + exit 1; + ;; + esac +} -baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" -InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh deleted file mode 100755 index 8461c656..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh deleted file mode 100755 index 94b53309..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh deleted file mode 100755 index 356891e1..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh deleted file mode 100755 index e799344a..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -mkdir -p $HOME/Library/LaunchAgents -cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> - <dict> - <key>Label</key> - <string>org.qt.io.screensaver_disable</string> - <key>ProgramArguments</key> - <array> - <string>defaults</string> - <string>-currentHost</string> - <string>write</string> - <string>com.apple.screensaver</string> - <string>idleTime</string> - <string>0</string> - </array> - <key>RunAtLoad</key> - <true/> - <key>KeepAlive</key> - <false/> - </dict> -</plist> -EOT diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh deleted file mode 100755 index 2c3e45f3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env sh - -set -ex - -# Read .bashrc if exist -printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile - diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh deleted file mode 100755 index e5dd1910..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/macos/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh deleted file mode 100755 index fea11e01..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh deleted file mode 100755 index 92b05bf3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh b/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh deleted file mode 100755 index 27ff15c3..00000000 --- a/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -$BASEDIR/../common/unix/squishInstall.sh - diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh index 8461c656..8461c656 100644..100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 new file mode 100644 index 00000000..01e6f8b0 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" 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..54a3d563 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 new file mode 100644 index 00000000..078f862e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 new file mode 100644 index 00000000..01e6f8b0 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" 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 684816f0..00392e4c 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 @@ -1,9 +1,9 @@ . "$PSScriptRoot\..\common\windows\install-mingw.ps1" -# This script will install MinGW 5.3.0 +# This script will install 64-bit MinGW 5.3.0 -$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" -$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" +$release = "x86_64-5.3.0-release-posix-seh-rt_v4-rev0" +$sha1 = "7EB12DD3EDDCF609722C9552F8592BD9948DA1FC" 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 27612c49..2986db90 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 @@ -1,8 +1,8 @@ . "$PSScriptRoot\..\common\windows\install-mingw.ps1" -# This script will install MinGW 6.3.0 +# This script will install 64-bit MinGW 6.3.0 -$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" -$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" +$release = "x86_64-6.3.0-release-posix-seh-rt_v5-rev2" +$sha1 = "49E7F8997E3D15C75B1A4DE1C380ABE1FB9B7533" InstallMinGW $release $sha1 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..54a3d563 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 new file mode 100644 index 00000000..078f862e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 deleted file mode 100644 index 2a71fd55..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-qnx660.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 deleted file mode 100644 index de486c97..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 deleted file mode 100644 index de486c97..00000000 --- a/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\patch_qnx.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 deleted file mode 100644 index af05e838..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 deleted file mode 100644 index 51eb0b2b..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.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 deleted file mode 100644 index 5bf811ef..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 deleted file mode 100644 index e2e9be9c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python.ps1" 64 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 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\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 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.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 deleted file mode 100644 index eed6b734..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" 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 deleted file mode 100644 index 1b1a07e9..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" 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 deleted file mode 100644 index b9d8153e..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 32 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 deleted file mode 100644 index 38106de7..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 deleted file mode 100644 index 15065b55..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-install-jdk.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 deleted file mode 100644 index 3ad5b9fd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 deleted file mode 100644 index 28299307..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 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 deleted file mode 100644 index 331de489..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\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 deleted file mode 100644 index 875b426f..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\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 deleted file mode 100644 index 2b5756be..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\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 deleted file mode 100644 index eca19011..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 deleted file mode 100644 index d57ad1cd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\openssl.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 deleted file mode 100644 index 451d2452..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 deleted file mode 100644 index 7918fabf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 deleted file mode 100644 index 074a7a6d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 deleted file mode 100644 index 73dc7bc2..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 deleted file mode 100644 index b246ce25..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 deleted file mode 100644 index 455d92bf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 deleted file mode 100644 index af05e838..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 deleted file mode 100644 index 51eb0b2b..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 deleted file mode 100644 index 5bf811ef..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 deleted file mode 100644 index e2e9be9c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 deleted file mode 100644 index a9044256..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 deleted file mode 100644 index 8f94b3d5..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 deleted file mode 100644 index 57428310..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 deleted file mode 100644 index eed6b734..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 deleted file mode 100644 index 1b1a07e9..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" 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 deleted file mode 100644 index b8c1ce9f..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 deleted file mode 100644 index 38106de7..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 deleted file mode 100644 index 15065b55..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-jdk.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 deleted file mode 100644 index b6e3582c..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 deleted file mode 100644 index 3201032d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 deleted file mode 100644 index 331de489..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 deleted file mode 100644 index 875b426f..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 deleted file mode 100644 index 2b5756be..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 deleted file mode 100644 index eca19011..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 deleted file mode 100644 index d57ad1cd..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 deleted file mode 100644 index 451d2452..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 deleted file mode 100644 index 7918fabf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 deleted file mode 100644 index 074a7a6d..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 deleted file mode 100644 index 73dc7bc2..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 deleted file mode 100644 index b246ce25..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 deleted file mode 100644 index 455d92bf..00000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/init-repository b/init-repository index 11a75ffd..875aec2b 100755 --- a/init-repository +++ b/init-repository @@ -243,6 +243,7 @@ sub parse_arguments $self->{'mirror-url'} = $OSLO_MIRROR_URL_BASE; }, ) || printUsage(2); + @ARGV && printUsage(2); # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/}; diff --git a/qt3d b/qt3d -Subproject c40c7ac6b57603ecb992f666ce7435110bb3e58 +Subproject 51dca6514593978beb28afa1c9f99ccd9a5c212 diff --git a/qtactiveqt b/qtactiveqt -Subproject d895e5d8f11afb1b4fef7d4962490146c7c251c +Subproject c2fed2369b31a6775aa52473b86ca9e3e07ab70 diff --git a/qtandroidextras b/qtandroidextras -Subproject aa7acf474f58c0c33666386493f867aead8a853 +Subproject a2157a9dd2ee4ed3e998654595544dadaf129fe diff --git a/qtbase b/qtbase -Subproject 58541d1c68fcf121318fe153e1469b9d0ebfec6 +Subproject 8a66924ca000fe4e05b680ca82c6587da8d28e0 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 08b2b0033d734710ced9050e71a79e094257462 +Subproject 80d7f92b9628076b681e509ddf8eae43cac550d diff --git a/qtcharts b/qtcharts -Subproject 31127e1f2926c3f2d3c25060b1c3e3a8cf9e695 +Subproject 1f78a69f4f6c33393a0b43a9151c698aa3d05bb diff --git a/qtconnectivity b/qtconnectivity -Subproject a7be018dfae73e4e2a68fd82e775d05d52aea98 +Subproject 7bcc5dc2c323b2ed120fb7bf695286f6a01c44d diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 8bfa8a8ef3500744e1c26e1a82391186c44812e +Subproject be7e45ca259d70d5f2ef0d11460261146fc1df9 diff --git a/qtdeclarative b/qtdeclarative -Subproject 8fdf466741f31bc9f33db7b5d09c2e282f0b6bb +Subproject ba05397ad723fa19125eb5ca2f91c7f437b2148 diff --git a/qtdoc b/qtdoc -Subproject de869e95fa9dce9b0f12e7c383c65a72e01a061 +Subproject 83a5f5be0e4464ec9b7698c03fffe9b6d379199 diff --git a/qtgamepad b/qtgamepad -Subproject da6d567a54292f2c6c2f43af647b576be8c9a8f +Subproject 313f221381507eee36c8e3bd0069b3e7962da14 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 8e86608f28b168b6a0e7ee5dbd56ec7d2e55b09 +Subproject 3e28d47cea038ca64c2e14ff449cc183c51643c diff --git a/qtimageformats b/qtimageformats -Subproject 25d7e0440f091b39c2865187eb0630045fa20e4 +Subproject f878323a82fa69fcaeb37b42e10ba28759157f4 diff --git a/qtlocation b/qtlocation -Subproject cc3a5a926db8d07c8282407a7b010b4ab228959 +Subproject 3d2993d0c31540f48244918541741c5d521a4dc diff --git a/qtmacextras b/qtmacextras -Subproject 970a10176cc6f43e1fa78883bbd7e27ea1100b2 +Subproject 5f9b1bca4af0bc7801d513a9424c70b47812cf1 diff --git a/qtmultimedia b/qtmultimedia -Subproject 2cc31ddded7b83dc47ddd6dde0c234e51caa9d8 +Subproject 0354fdda8b430f7749082ca55ad6c1dc781f391 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject e62fdc9887d4bdc2d1cfd07c918dd15cd1992ba +Subproject e8552ddaf17dad91df3a03ccfc0d708ab13d6d0 diff --git a/qtpurchasing b/qtpurchasing -Subproject a58433b78f0b06a1f0594e9fcee9601e0170fdc +Subproject 51b83b74bb3d0ed406e28f89cbde1441782b82b diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 93c5dc8b5abdbdfca505dd4d3d9892856d1f51d +Subproject 6c9f0bfcc4bc6511686559dd87c29cfaa3e88b3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 83da5b251d06c60a724d10688bd8fcdb15ec4e6 +Subproject c924a94fb5077028965e2c6343e1bafabc0e69f diff --git a/qtremoteobjects b/qtremoteobjects -Subproject dc2a27771daefefe746310fd25aa06f716df097 +Subproject db6d07b4a51813e72eee474a6ee2e91438841fa diff --git a/qtscript b/qtscript -Subproject 36e82de4386aed1fcc9b24b944e01d807a0f709 +Subproject 781c745277f9b4faa87d341b10ec0ca46eb45a7 diff --git a/qtscxml b/qtscxml -Subproject 0d6105563d5e53356dfdae64bcb19a1e8e4db6b +Subproject f71a6d1a746d5ceb19ce017902c83e1819b5c0e diff --git a/qtsensors b/qtsensors -Subproject dcc4d0b58a4fe0432d3ac86f1f2bd132e40be42 +Subproject e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2 diff --git a/qtserialbus b/qtserialbus -Subproject 38c64b11c9538ec9e5c880bfa84a56630c7f2ae +Subproject bfb218c46324f89dd435ddfa0dbfe3643fcc2d2 diff --git a/qtserialport b/qtserialport -Subproject 6f62e9de520a50a7bc90241d4a5d2c385a25373 +Subproject aee027f581839caf44de1b176099ef2b22d2fc8 diff --git a/qtspeech b/qtspeech -Subproject fd6648b0b77dc628e89655f5dc271dbc42ca829 +Subproject d8bd5329cd4000151051ed25cda005b3b51aec8 diff --git a/qtsvg b/qtsvg -Subproject a2156af9ed6bc3e57f715dfe6784a2249ee5fa3 +Subproject f4554e29a44af2cdd9e518f5931e28cf349883c diff --git a/qttools b/qttools -Subproject 99235a6262fd773ec845b8aea8f770dc62b50db +Subproject c0bfa2a930f6414d41684e578b59872defdffdf diff --git a/qttranslations b/qttranslations -Subproject 6ccd65767806d0b03763e0a0ae5efc341fd3248 +Subproject 25eb2bbb4bf5e7b556d60b2328a19fcedbc3f4f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 1838b75f6c21d71e7bd88b03e44c07287879a4e +Subproject 9055bd56653d2e488b52c66d884109fcccd23c2 diff --git a/qtwayland b/qtwayland -Subproject 79cde9fba8452afba049f4fd611dfe9cf8f1be1 +Subproject abfdf34f510b64439c85cc54f47b41c4ce3f9c6 diff --git a/qtwebchannel b/qtwebchannel -Subproject 5821cad4caac94d94994998602a9c0594c91f69 +Subproject 01241eb3704af785e8d98fb2f6e223ca62a6417 diff --git a/qtwebengine b/qtwebengine -Subproject 2e06a051404c250b847421364c098bf541c4377 +Subproject 51658fac63299f818afd8ddde6dccee66a36efd diff --git a/qtwebglplugin b/qtwebglplugin new file mode 160000 +Subproject 961198b42104ea644580b14e763ec87bda0e966 diff --git a/qtwebsockets b/qtwebsockets -Subproject 0b418f5512943eca6059855a584902f70a5dbad +Subproject 8a549aca7b371722cbf012d85216e4560ef1cf3 diff --git a/qtwebview b/qtwebview -Subproject c47248d9a297d0b121c723377b6d44dc9f87660 +Subproject cf23a402b97b459309ec32fe49c82a845a3636a diff --git a/qtwinextras b/qtwinextras -Subproject f688deb091537884517a0fb4bda7bd6cb8dcdad +Subproject e484402ad1d9b6d3b89333585b1ead97e4d2163 diff --git a/qtx11extras b/qtx11extras -Subproject def0ad5122a4549b903736fa7a8cc68d936ad3f +Subproject 78a10dad08d1c354f7afb539bd89f0d75a9fe3b diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 4d95d64382eefcb50bea5d900989cb24d56bf65 +Subproject c892ceec1c301f12d5c276e12be0bee8fd7d4cb |