From 7cbb032dc5cf1eef545d3a568b598c82522386db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 31 Aug 2018 15:36:03 +0300 Subject: Provisioning: Fix vclib path on x86 machines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The path was incorrect for x86 Windows machines since they use "Program Files" without the "(x86)" suffix. Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8 Reviewed-by: Oliver Wolff Reviewed-by: Johanna Äijälä --- coin/provisioning/common/windows/vclibs_debug.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/vclibs_debug.ps1 b/coin/provisioning/common/windows/vclibs_debug.ps1 index e9020694..ef387ab4 100644 --- a/coin/provisioning/common/windows/vclibs_debug.ps1 +++ b/coin/provisioning/common/windows/vclibs_debug.ps1 @@ -1,3 +1,5 @@ +. "$PSScriptRoot\helpers.ps1" + function Install-VCLibsDebug { Param ( @@ -10,7 +12,12 @@ function Install-VCLibsDebug return } - Add-AppxPackage "C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx" + if (Is64BitWinHost) { + $ProgramFiles = "Program Files (x86)" + } else { + $ProgramFiles = "Program Files" + } + Add-AppxPackage "C:\$ProgramFiles\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx" Write-Host "Debug VCLibs successfully installed for $Arch." } -- cgit v1.2.3 From 413fcafc149328bdfa15913a1746162891dda5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 11 Jun 2018 09:47:19 +0300 Subject: Change 'test suite' in license headers of prov scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9687bcb15b26287ea6eeb2098079137d6e3fc288 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/cmake_linux.sh | 2 +- coin/provisioning/common/linux/open62541.sh | 2 +- coin/provisioning/common/linux/version.sh | 2 +- coin/provisioning/common/macos/install-commandlinetools.sh | 2 +- coin/provisioning/common/unix/DownloadURL.sh | 2 +- coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh | 2 +- coin/provisioning/common/unix/SetEnvVar.sh | 2 +- coin/provisioning/common/unix/check_and_set_proxy.sh | 2 +- coin/provisioning/common/unix/mqtt_broker.sh | 2 +- coin/provisioning/common/unix/squishInstall.sh | 2 +- coin/provisioning/common/windows/mqtt_broker.ps1 | 2 +- coin/provisioning/common/windows/opcua_unifiedautomation.ps1 | 2 +- coin/provisioning/common/windows/python.ps1 | 2 +- coin/provisioning/common/windows/python3.ps1 | 2 +- coin/provisioning/common/windows/vc_redist.ps1 | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh | 2 +- .../provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 9b4f6851..2b8d71d0 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2016 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the test suite of the Qt Toolkit. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh index 56c22018..962e8963 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/linux/open62541.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/common/linux/version.sh b/coin/provisioning/common/linux/version.sh index ed24d805..3e2a7f19 100755 --- a/coin/provisioning/common/linux/version.sh +++ b/coin/provisioning/common/linux/version.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2016 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the test suite of the Qt Toolkit. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh index 2be234e7..7b0ead98 100755 --- a/coin/provisioning/common/macos/install-commandlinetools.sh +++ b/coin/provisioning/common/macos/install-commandlinetools.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 14d1322d..2d82af58 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index b616efb9..1185afeb 100755 --- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/common/unix/SetEnvVar.sh b/coin/provisioning/common/unix/SetEnvVar.sh index e1b69169..d5aa4dcd 100755 --- a/coin/provisioning/common/unix/SetEnvVar.sh +++ b/coin/provisioning/common/unix/SetEnvVar.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh index 3e55b09f..8ada72ab 100755 --- a/coin/provisioning/common/unix/check_and_set_proxy.sh +++ b/coin/provisioning/common/unix/check_and_set_proxy.sh @@ -4,7 +4,7 @@ ## 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 diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index 22a9a66a..c6a65305 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index c946dfdc..b46a9d8d 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -160,7 +160,7 @@ MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" echo "Installing squish $version.." MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" -echo "Installing test suite for squish" +echo "Installing provisioning scripts for squish" MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz" echo "Verifying Squish Installation" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index e37994c9..301667b4 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -3,7 +3,7 @@ ## 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 diff --git a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 index b0ed74ec..18f562c9 100644 --- a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 +++ b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1 @@ -3,7 +3,7 @@ ## Copyright (C) 2018 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 diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 86b82eb6..aee4c199 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -3,7 +3,7 @@ ## Copyright (C) 2016 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the test suite of the Qt Toolkit. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index b2ad0ba8..c05c022c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -4,7 +4,7 @@ ## Copyright (C) 2017 Pelagicore AG ## 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 diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index c356ca2c..f68846f0 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -4,7 +4,7 @@ ## Copyright (C) 2017 Pelagicore AG ## 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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index 9eb7e086..76165a6c 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2018 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 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 index 505374c5..e677427f 100755 --- 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 @@ -5,7 +5,7 @@ ## 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 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 index 049cdd2d..21c926b8 100755 --- 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 @@ -5,7 +5,7 @@ ## 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 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 index 04c09770..c2331d16 100755 --- 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 @@ -5,7 +5,7 @@ ## 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 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 index 6cc2b44f..a4b63493 100755 --- 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 @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh index 6b5cf23c..37aec494 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2018 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 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh index 7f24d224..c4740556 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh index 7f32e073..e4d988fc 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2018 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 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 index 505374c5..e677427f 100755 --- 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 @@ -5,7 +5,7 @@ ## 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 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 index 049cdd2d..21c926b8 100755 --- 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 @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index d534e74d..462ac422 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -5,7 +5,7 @@ ## 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 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 index daaab36f..2ad25685 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 @@ -4,7 +4,7 @@ ## Copyright (C) 2017 Pelagicore AG ## 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 -- cgit v1.2.3 From 7d0c343fc67d00c32ceb2fa84ec6546c0ddd3165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 11 Jun 2018 10:08:07 +0300 Subject: Cleanup of RHEL 6 codes from provisioning scripts RHEL 6 has been removed in 5.12+ verifications, so no need to maintain those changes. Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb Reviewed-by: Simon Hausmann --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/common/unix/libclang.sh | 14 ++------ coin/provisioning/common/unix/squishInstall.sh | 2 +- .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 39 ---------------------- 4 files changed, 5 insertions(+), 52 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 7bcdbdce..d0fc607e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -74,7 +74,7 @@ rm "$ndkTargetFile" rm "$toolsTargetFile" echo "Changing ownership of Android files." -if uname -a |grep -q "el6\|el7"; then +if uname -a |grep -q "el7"; then sudo chown -R qt:wheel "$targetFolder" else sudo chown -R qt:users "$targetFolder" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 645cf6ec..a9d1cc49 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -48,18 +48,12 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" source "${BASH_SOURCE%/*}/DownloadURL.sh" libclang_version=6.0 -libclang_version_Rhel6=4.0 if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z" sha1="0af8ab8c1174faf4b721d079587190fc32ea8364" -elif uname -a |grep -q "el6"; then - version=$libclang_version_Rhel6 - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" - sha1="c7466109628418a6aa3db8b3f5825f847f1c4952" else version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" @@ -79,8 +73,6 @@ sudo mv /tmp/libclang "$destination" echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt -if [ "$version" == "6.0" ]; then - # This is a hacked static build of libclang which requires special - # handling on the qdoc side. - SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" -fi +# This is a hacked static build of libclang which requires special +# handling on the qdoc side. +SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b46a9d8d..cf1468c6 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -76,7 +76,7 @@ function MountAndInstall { usersGroup="staff" mountFolder="/Volumes" squishLicenseDir="/Users/qt" - elif uname -a |grep -q "el6\|el7"; then + elif uname -a |grep -q "el7"; then usersGroup="qt" mountFolder="/tmp" squishLicenseDir="/root" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh deleted file mode 100755 index 76165a6c..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" -- cgit v1.2.3 From 61ce2045bee5df55c49584a94c7c451482b26c67 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 3 Sep 2018 15:34:52 +0200 Subject: Provisioning: Add mqtt broker to Ubuntu 18.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The broker is required to run tests of the mqtt module. This is a followup of e89420945f368ec7b6d03b8aeb6e6b478ee960fe which was missing this part. Task-number: QTQAINFRA-1983 Change-Id: Ibcc79aecbf1212ecc64150c911ecf296c7f58e19 Reviewed-by: Jani Heikkinen Reviewed-by: Joni Jäntti Reviewed-by: Simon Hausmann --- .../22-mqtt_broker.sh | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh new file mode 100644 index 00000000..97b546f2 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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" -- cgit v1.2.3 From b5a989133a7fe5272e109b5a1a5da4441a279f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 31 Aug 2018 13:16:18 +0200 Subject: Version Xcode application bundle when provisioning macOS images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By versioning the Xcode installation we open up for having multiple Xcode versions installed on the same image in the future, which allows for e.g. choosing the Xcode version in the build config. By running xcode-select to choose the bundle, we ensure that build steps that do not know that Xcode has been versioned will still pick up the right compiler and SDK paths when e.g. running xcrun -find clang. Done-with: Jędrzej Nowacki Change-Id: I0bd877bd344cebdd1fbf3a3035b00069f75c4c96 Reviewed-by: Jędrzej Nowacki Reviewed-by: Simon Hausmann --- coin/provisioning/common/macos/install_xcode.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/provisioning/common/macos/install_xcode.sh b/coin/provisioning/common/macos/install_xcode.sh index 5fcf26a0..5eddb72f 100755 --- a/coin/provisioning/common/macos/install_xcode.sh +++ b/coin/provisioning/common/macos/install_xcode.sh @@ -55,6 +55,14 @@ function InstallXCode() { xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) fi + echo "Versioning application bundle" + majorVersion=$(echo $version | cut -d '.' -f 1) + versionedAppBundle="/Applications/Xcode${majorVersion}.app" + sudo mv /Applications/Xcode.app ${versionedAppBundle} + + echo "Selecting Xcode" + sudo xcode-select --switch ${versionedAppBundle} + echo "Accept license" sudo xcodebuild -license accept -- cgit v1.2.3 From 75e33d94bd5e0838ebcefca1b8b47a2511186d2b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 3 Sep 2018 17:11:31 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I48c73c56b339a8e28b7c1641f3160aa8febf188d Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtrepotools | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 29c0377f..2664e843 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 29c0377f07f4942f9957ea87d59c252148dc9e5b +Subproject commit 2664e843223e558a781d00191b7dffd962aa5618 diff --git a/qtconnectivity b/qtconnectivity index 9004e89b..2a52a400 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9004e89bb902a709c3d61c7f168d2d39fe2cd936 +Subproject commit 2a52a400d6692b4f42d955302dee651646664385 diff --git a/qtdeclarative b/qtdeclarative index 6e2fc846..c98a3ac5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6e2fc84646987135c96755fbe1c2af20fc722e3d +Subproject commit c98a3ac57625e14bfcfa7592e2a2549d3a4a5a3d diff --git a/qtdoc b/qtdoc index 1c9da743..b6f7476b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1c9da7439d1d4664a91c0dd43162b47a2203b02c +Subproject commit b6f7476b5cb353748d89060a5c08a0d288a5397e diff --git a/qtrepotools b/qtrepotools index ded95025..f18687e4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ded9502576543d83ba157eca42515ccd656b25fb +Subproject commit f18687e44b0ea151ab65ac2dacbd752295fc1b03 diff --git a/qtwayland b/qtwayland index bc7e69b1..54285dd5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bc7e69b176816536bbd0a0ca3c4fd83b1ba160cd +Subproject commit 54285dd5f6a660ce0ddd45b222d6c4dcd8ea6f74 -- cgit v1.2.3 From ccc960b6be4794596c0778277a8247cfa0f03e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Mon, 3 Sep 2018 15:25:58 +0300 Subject: Provisioning: Ubuntu 18.04: QNX700 and QNX660 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA testing needs QNX platforms installed on Ubuntu 18.04 as well. Change-Id: I8cf95dc5eb12761f82081bfda0973cc19a2864bc Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 38 ++++++++++++++++++++++ .../qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 38 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh new file mode 100755 index 00000000..6b5cf23c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -0,0 +1,38 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 -ex + +source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh new file mode 100755 index 00000000..7f24d224 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh @@ -0,0 +1,38 @@ +#!/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 -ex + +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" -- cgit v1.2.3 From 83f6543be8e858e58062f43596f93f5f65537f45 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 17 Aug 2018 09:29:22 +0300 Subject: Provisioning: Move Android NDK to macos 10.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2158 Change-Id: Iddf3bd2609e6b06b33cbe2258075157e91e52e8e Reviewed-by: Liang Qi Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qt5.txt | 4 +- .../qtci-macos-10.12-x86_64/30-android.sh | 84 ---------------------- .../qtci-macos-10.13-x86_64/30-android.sh | 4 +- 3 files changed, 4 insertions(+), 88 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index f9979818..1b09c7d6 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -10,8 +10,8 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packagin qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY x86 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh deleted file mode 100755 index e7bb9ca0..00000000 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script install Android sdk and ndk. - -# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version - -set -ex - -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -targetFolder="/opt/android" -sdkTargetFolder="$targetFolder/sdk" - -basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" - -toolsVersion="r25.2.5" -toolsFile="tools_$toolsVersion-macosx.zip" -ndkVersion="r16b" -ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" -sdkBuildToolsVersion="25.0.2" -sdkApiLevel="android-21" - -toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659" -ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de" - -toolsTargetFile="/tmp/$toolsFile" -toolsSourceFile="$basePath/$toolsFile" -ndkTargetFile="/tmp/$ndkFile" -ndkSourceFile="$basePath/$ndkFile" - -echo "Unzipping Android NDK to '$targetFolder'" -sudo unzip -q "$ndkSourceFile" -d "$targetFolder" -echo "Unzipping Android Tools to '$sdkTargetFolder'" -sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" - -echo "Changing ownership of Android files." -sudo chown -R qt:wheel "$targetFolder" - -echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" - -SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" -SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" -SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" -SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" - -echo "Android SDK tools = $toolsVersion" >> ~/versions.txt -echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt -echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt -echo "Android NDK = $ndkVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 0d125c57..a86387bb 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -49,13 +49,13 @@ basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-macosx.zip" -ndkVersion="r10e" +ndkVersion="r16b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="25.0.2" sdkApiLevel="android-21" toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659" -ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" +ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -- cgit v1.2.3 From db7391647f85c23297527c0efc8d83bea29004ca Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Sep 2018 10:53:06 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I16bee67a353e15b2d30207eb3c0979d25a449b5c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtrepotools | 2 +- qttools | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 61ba7f75..27457f50 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 61ba7f75931bddcfdc411eeb518478397e0f309a +Subproject commit 27457f50b35b3941db4e7e5def742fcdefe218ff diff --git a/qtbase b/qtbase index 2664e843..42a68ee9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2664e843223e558a781d00191b7dffd962aa5618 +Subproject commit 42a68ee9dd53eac2d8aaabf02dcf4ffa4525facf diff --git a/qtconnectivity b/qtconnectivity index 2a52a400..68475e56 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2a52a400d6692b4f42d955302dee651646664385 +Subproject commit 68475e563d8a19f521278703a3e98c7664d6bbbc diff --git a/qtdeclarative b/qtdeclarative index c98a3ac5..2dac7983 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c98a3ac57625e14bfcfa7592e2a2549d3a4a5a3d +Subproject commit 2dac7983b0cceb23682ae2f14cc0a612888461e2 diff --git a/qtdoc b/qtdoc index b6f7476b..d9e2f412 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b6f7476b5cb353748d89060a5c08a0d288a5397e +Subproject commit d9e2f412cc6a9149491b7499039ccfe2038a26ab diff --git a/qtimageformats b/qtimageformats index 2842212e..dd38f75d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2842212e88afb200a0fcfda7d306c4e8eee26407 +Subproject commit dd38f75d8614e5d4e1906594e1d83f284af42457 diff --git a/qtrepotools b/qtrepotools index f18687e4..ddd8ad86 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f18687e44b0ea151ab65ac2dacbd752295fc1b03 +Subproject commit ddd8ad86da7790ce83640814ee5f1528c4df1fbe diff --git a/qttools b/qttools index 72c8cc1b..53094d90 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 72c8cc1b4dd0cc77d074a4cee1d698b8fb69e503 +Subproject commit 53094d904447abf2c720dbec1bf8d6e63d53af14 -- cgit v1.2.3 From 7fe274f6f6944838c42231d3ec77b22527594a07 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 29 Aug 2018 14:49:39 +0200 Subject: Correctly use pip3 to setup a wheel cache for python3 packages on linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously pip was used (instead of pip3) which caused that python2 packages were installed into the python3 wheel cache folder. Some of the packages also worked for python3, but not all of them. Task-number: AUTOSUITE-195 Change-Id: I393d036667b14e11dee65975ba6933e7174d0e9d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 3 ++- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 444765bf..4e2799ff 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 @@ -108,8 +108,9 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 sudo pip install --upgrade pip sudo pip install virtualenv wheel +sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory -pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" 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 32bd288c..2855d70d 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 @@ -167,7 +167,7 @@ echo "Installing packages" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" # Install all needed packages in a special wheel cache directory -pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" 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 a5494041..208762d3 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 @@ -12,7 +12,7 @@ sudo pkcon -y install python-devel python-virtualenv sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel # Install all needed packages in a special wheel cache directory -pip wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt +pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" -- cgit v1.2.3 From fd922eb4b1563c70046730d726ebc0ebb3d40d2e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 6 Sep 2018 07:42:39 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ifda91b5137093a660d23591f1252c4c8f1c2f2c7 Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qtlocation | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 2dac7983..a7472867 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2dac7983b0cceb23682ae2f14cc0a612888461e2 +Subproject commit a7472867f407f1226d82aa7bce4cd4d6f9bd652f diff --git a/qtlocation b/qtlocation index ffd680a1..3bd2541f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ffd680a132db99f1fa1e9ebb75c844c491afa83b +Subproject commit 3bd2541f84be5200a54c7565074ea22992397c79 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c11c0886..a046dd2d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c11c0886266cffa34210ca287a6a99ec1633d56b +Subproject commit a046dd2d5486e4805481fd360e486f869d0fa36d diff --git a/qtwayland b/qtwayland index 54285dd5..192b2e8f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 54285dd5f6a660ce0ddd45b222d6c4dcd8ea6f74 +Subproject commit 192b2e8f59e7f0cb3c2d482524bf171a81a213c5 diff --git a/qtwebengine b/qtwebengine index 874ca966..1fde9178 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 874ca9668bae643445b282a1681f15dc67008d29 +Subproject commit 1fde91789de573683eaf1d6b1294eba7757ce11b -- cgit v1.2.3