From eb4fcfaba107edffab3683bc436df5df8d81307d Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 29 Jan 2018 22:41:34 +0100 Subject: [PATCH 1/9] Instead of just warning that apt failed, tell why MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the lsof we should see which process was holding the lock. After that we can disable this source of problems. Change-Id: Ie6a014bdb101e6230139569c0e4ea51a57089c30 Reviewed-by: Oswald Buddenhagen Reviewed-by: Heikki Halmet Reviewed-by: Jędrzej Nowacki --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 1 + 1 file changed, 1 insertion(+) 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 d15e0059..a2132209 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 @@ -159,6 +159,7 @@ catch || { ;; $ExceptionAPT) echo "Failed to install package." + sudo lsof /var/lib/dpkg/lock exit 1; ;; $ExceptionSED) From e33f38acef89e72d1895ca45e3beda70f41c9b83 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 29 Jan 2018 16:03:57 +0100 Subject: [PATCH 2/9] Update MQTT provisioning Setting an environment variable has been centralized to a separate script. Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/mqtt_broker.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index c2fb2e30..59dd7009 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -37,6 +37,7 @@ # shellcheck source=./InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" @@ -49,4 +50,6 @@ sudo rm -fr "$targetFolder" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" echo "Adding MQTT broker path to environment" -sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc +SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py" + +echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt From f1422dc64bcea2abdb54e0391c3e6fcf89f3bf49 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 30 Jan 2018 09:33:12 +0100 Subject: [PATCH 3/9] Provisioning: Switch download sources for mqtt paho broker Internal resources are preferred and should be used first. Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/mqtt_broker.sh | 4 ++-- coin/provisioning/common/windows/mqtt_broker.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index 59dd7009..c64c0fec 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -40,8 +40,8 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" -PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +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" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index 610f22d8..35bb9823 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -35,8 +35,8 @@ echo "MQTT: Downloading Paho test broker..." $zip = "c:\users\qt\downloads\pahotest.zip" -$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" -$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$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 From 213b848cf5b90dd0bff1f02b1463749e10725ff5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 Feb 2018 13:51:16 +0100 Subject: [PATCH 4/9] Update submodules on '5.9' in qt5 Change-Id: I839f931dc0c3202543cfbc0137e7f54184efa037 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 7c8410c6..02ebfda6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7c8410c6dc325902160bb433044800ba02d44d12 +Subproject commit 02ebfda6c3aaedd2becdc4f0ce4a39025e95b726 diff --git a/qtbase b/qtbase index 342bb5b0..4cd90a35 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 342bb5b03a76d1428fafb8e1532d66e172bd1c0b +Subproject commit 4cd90a3579986ae7441c3e982a5f34cdfd92c152 diff --git a/qtconnectivity b/qtconnectivity index dd2e19ca..df376c4c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dd2e19ca327a3f7a49c40b61c483ec60dcaafa90 +Subproject commit df376c4c27d16f70ba69925553acfc69287b269a diff --git a/qtdeclarative b/qtdeclarative index 388f9b15..922ce0ef 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 388f9b151245ae194a0a9175da7cc70ce534e6e6 +Subproject commit 922ce0ef39302a8d6d306a09295cbae857becbc4 diff --git a/qtwayland b/qtwayland index 8ce0185c..9f1db9d0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8ce0185c92a8914b54eb12c8be1ce1c873befa55 +Subproject commit 9f1db9d0ae60ffe8be1453a57be3b8f2861e4882 diff --git a/qtwebengine b/qtwebengine index f2d93896..adb86777 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f2d938962fe9a029ec0baf37ca7f478051125780 +Subproject commit adb8677717472e020e35084839ab3726920ec386 diff --git a/qtxmlpatterns b/qtxmlpatterns index c3ef9c68..07fdc1b9 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c3ef9c68cefc4fd323e34f1dcf0314d385a70e23 +Subproject commit 07fdc1b94d816b1c785af69a36fd8f756b7964af From 1583fbd2bb5a7a1c624011a5d426b80086df252e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 15 Nov 2017 12:12:33 +0200 Subject: [PATCH 5/9] Add Win7_x64 provisioning for RTA purposes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 7 x64 (Windows 7 msvc2013-x86_64) template is needed since RTA is starting to deploy machines from coin. Task-number: QTQAINFRA-1521 Task-number: QTQAINFRA-1615 Change-Id: I7e9665bd37ee010a59ff3792f435d65eb9ad8c17 Reviewed-by: Heikki Halmet Reviewed-by: Johanna Äijälä --- .../common/windows/android-openssl.ps1 | 69 +++++++++++++ coin/provisioning/common/windows/android.ps1 | 98 ++++++++++++++++++ coin/provisioning/common/windows/dxsdk.ps1 | 19 ++++ .../qtci-windows-7-x86/10-dxsdk.ps1 | 20 +--- .../qtci-windows-7-x86/30-android.ps1 | 99 +------------------ .../qtci-windows-7-x86/31-android_openssl.ps1 | 70 +------------ .../01-allow-remote-desktop-access.ps1 | 1 + .../qtci-windows-7-x86_64/01-disable-uac.ps1 | 1 + .../qtci-windows-7-x86_64/02-disable-ntp.ps1 | 1 + .../02-disable-sleep.ps1 | 1 + .../02-install-notepad++.ps1 | 1 + .../qtci-windows-7-x86_64/02-python.ps1 | 1 + .../03-install-sevenzip.ps1 | 1 + .../04-disable-windefender.ps1 | 1 + .../04-disable-windows-updates.ps1 | 1 + .../qtci-windows-7-x86_64/05-wsearch-off.ps1 | 1 + .../qtci-windows-7-x86_64/07-vc_redist.ps1 | 1 + .../qtci-windows-7-x86_64/08-install-git.ps1 | 1 + .../qtci-windows-7-x86_64/08-install-jdk.ps1 | 1 + .../08-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-7-x86_64/08-ninja.ps1 | 1 + .../qtci-windows-7-x86_64/09-cmake.ps1 | 1 + .../09-install-dependencywalker.ps1 | 1 + .../qtci-windows-7-x86_64/09-install-ruby.ps1 | 1 + .../09-install-strawberry-perl.ps1 | 1 + .../qtci-windows-7-x86_64/09-jom.ps1 | 1 + .../qtci-windows-7-x86_64/09-mysql.ps1 | 1 + .../qtci-windows-7-x86_64/09-openssl.ps1 | 1 + .../qtci-windows-7-x86_64/09-postgresql.ps1 | 1 + .../09-set-network-test-server.ps1 | 1 + .../qtci-windows-7-x86_64/10-dxsdk.ps1 | 1 + .../qtci-windows-7-x86_64/12-icu.ps1 | 1 + .../qtci-windows-7-x86_64/25-python.ps1 | 1 + .../qtci-windows-7-x86_64/25-python3.ps1 | 1 + .../qtci-windows-7-x86_64/27-squish.ps1 | 1 + 35 files changed, 218 insertions(+), 186 deletions(-) create mode 100644 coin/provisioning/common/windows/android-openssl.ps1 create mode 100644 coin/provisioning/common/windows/android.ps1 create mode 100644 coin/provisioning/common/windows/dxsdk.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/01-disable-uac.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-disable-ntp.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/02-python.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/04-disable-windows-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/08-install-jdk.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/08-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/08-ninja.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-install-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-install-strawberry-perl.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-jom.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-mysql.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-openssl.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-postgresql.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/09-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/10-dxsdk.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/12-icu.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/27-squish.ps1 diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 new file mode 100644 index 00000000..798b3e45 --- /dev/null +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -0,0 +1,69 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +# Requires: 7z, perl and msys + +. "$PSScriptRoot\helpers.ps1" + +# OpenSSL need to be configured from sources for Android build in windows 7 +# Msys need to be installed to target machine +# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html + +$version = "1.0.2j" +$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" +$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" +$destination = "C:\Utils\openssl-android-master" + +Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip +Verify-Checksum $zip $sha1 + +C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils +C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils +Rename-Item C:\Utils\openssl-$version $destination +Remove-Item $zip +Remove-Item C:\Utils\openssl-$version.tar + +set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc +set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar +set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr + +# Make sure configure for openssl has a "make" and "perl" available +$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" + +echo "Configuring OpenSSL $version for Android..." +pushd $destination +C:\msys\1.0\bin\bash.exe -c "c:/strawberry/perl/bin/perl Configure shared android" +popd + +# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. +# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 new file mode 100644 index 00000000..f5e916e8 --- /dev/null +++ b/coin/provisioning/common/windows/android.ps1 @@ -0,0 +1,98 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs Android sdk and ndk +# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion +# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. +# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-21 API version in Qt 5.9. + +# NDK +$ndkVersion = "r10e" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" +$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" +$ndkFolder = "c:\utils\android-ndk-$ndkVersion" +$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" + +# SDK +$sdkVersion = "r24.4.1" +$sdkApi = "ANDROID_API_VERSION" +$sdkApiLevel = "android-21" +$sdkBuildToolsVersion = "23.0.3" +$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip" +$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" +$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" +$sdkFolder = "c:\utils\android-sdk-windows" +$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip" + +function Install($1, $2, $3, $4) { + $cacheUrl = $1 + $zip = $2 + $checksum = $3 + $offcialUrl = $4 + + Download $offcialUrl $cacheUrl $zip + Verify-Checksum $zip "$checksum" + Extract-Zip $zip C:\Utils +} + +function SdkUpdate ($1, $2) { + echo "Running Android SDK update for $1..." + cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2" +} + +echo "Installing Android ndk $nkdVersion" +Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl +echo "Set environment variable ANDROID_NDK_HOME=$ndkFolder" +[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME", $ndkFolder, "Machine") +echo "Set environment variable ANDROID_NDK_ROOT=$ndkFolder" +[Environment]::SetEnvironmentVariable("ANDROID_NDK_ROOT", $ndkFolder, "Machine") + +#echo "Installing Android sdk $sdkVersion" +Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl +echo "Set environment variable ANDROID_SDK_HOME=$sdkFolder" +[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME", $sdkFolder, "Machine") +echo "Set environment variable ANDROID_API_VERSION $sdkApiLevel" +[Environment]::SetEnvironmentVariable("ANDROID_API_VERSION", $sdkApiLevel, "Machine") + +# SDK update +SdkUpdate $sdkFolder $sdkApiLevel +SdkUpdate $sdkFolder tools +SdkUpdate $sdkFolder platform-tools +SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion + +# kill adb. This process prevent's provisioning to continue +taskkill /im adb.exe /f diff --git a/coin/provisioning/common/windows/dxsdk.ps1 b/coin/provisioning/common/windows/dxsdk.ps1 new file mode 100644 index 00000000..629c7ac5 --- /dev/null +++ b/coin/provisioning/common/windows/dxsdk.ps1 @@ -0,0 +1,19 @@ +. "$PSScriptRoot\helpers.ps1" + +# This script installs DirectX SDK + +$package = "DXSDK_Jun10.exe" + +$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" +$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" +$exe = "C:\Windows\Temp\$package" + +Download $officialUrl $cachedUrl $exe + +echo "Installing DirectX SDK" +cmd /c "$exe /u" + +Remove-Item $exe + +echo "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 index 6fea9693..155df6b8 100644 --- a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 @@ -1,19 +1 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# This script installs DirectX SDK - -$package = "DXSDK_Jun10.exe" - -$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" -$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" -$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" -$exe = "C:\Windows\Temp\$package" - -Download $officialUrl $cachedUrl $exe - -echo "Installing DirectX SDK" -cmd /c "$exe /u" - -Remove-Item $exe - -echo "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt +. "$PSScriptRoot\..\common\windows\dxsdk.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 index 3568c681..69799974 100644 --- a/coin/provisioning/qtci-windows-7-x86/30-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/30-android.ps1 @@ -1,98 +1 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# This script installs Android sdk and ndk -# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion -# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself. -# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device. -# That's why we need to use Andoid-21 API version in Qt 5.9. - -# NDK -$ndkVersion = "r10e" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" -$ndkFolder = "c:\utils\android-ndk-$ndkVersion" -$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" - -# SDK -$sdkVersion = "r24.4.1" -$sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-21" -$sdkBuildToolsVersion = "23.0.3" -$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip" -$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" -$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" -$sdkFolder = "c:\utils\android-sdk-windows" -$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip" - -function Install($1, $2, $3, $4) { - $cacheUrl = $1 - $zip = $2 - $checksum = $3 - $offcialUrl = $4 - - Download $offcialUrl $cacheUrl $zip - Verify-Checksum $zip "$checksum" - Extract-Zip $zip C:\Utils -} - -function SdkUpdate ($1, $2) { - echo "Running Android SDK update for $1..." - cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2" -} - -echo "Installing Android ndk $nkdVersion" -Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl -echo "Set environment variable ANDROID_NDK_HOME=$ndkFolder" -[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME", $ndkFolder, "Machine") -echo "Set environment variable ANDROID_NDK_ROOT=$ndkFolder" -[Environment]::SetEnvironmentVariable("ANDROID_NDK_ROOT", $ndkFolder, "Machine") - -#echo "Installing Android sdk $sdkVersion" -Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl -echo "Set environment variable ANDROID_SDK_HOME=$sdkFolder" -[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME", $sdkFolder, "Machine") -echo "Set environment variable ANDROID_API_VERSION $sdkApiLevel" -[Environment]::SetEnvironmentVariable("ANDROID_API_VERSION", $sdkApiLevel, "Machine") - -# SDK update -SdkUpdate $sdkFolder $sdkApiLevel -SdkUpdate $sdkFolder tools -SdkUpdate $sdkFolder platform-tools -SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion - -# kill adb. This process prevent's provisioning to continue -taskkill /im adb.exe /f +. "$PSScriptRoot\..\common\windows\android.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 index a38272a6..25c6f28a 100644 --- a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 @@ -1,69 +1 @@ -############################################################################ -## -## 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$ -## -############################################################################# - -# Requires: 7z, perl and msys - -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# OpenSSL need to be configured from sources for Android build in windows 7 -# Msys need to be installed to target machine -# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html - -$version = "1.0.2j" -$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" -$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" -$destination = "C:\Utils\openssl-android-master" - -Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip -Verify-Checksum $zip $sha1 - -C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils -C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils -Rename-Item C:\Utils\openssl-$version $destination -Remove-Item $zip -Remove-Item C:\Utils\openssl-$version.tar - -set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc -set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar -set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr - -# Make sure configure for openssl has a "make" and "perl" available -$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" - -echo "Configuring OpenSSL $version for Android..." -pushd $destination -C:\msys\1.0\bin\bash.exe -c "c:/strawberry/perl/bin/perl Configure shared android" -popd - -# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed. -# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h +. "$PSScriptRoot\..\common\windows\android-openssl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-7-x86_64/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000..af05e838 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-7-x86_64/01-disable-uac.ps1 new file mode 100644 index 00000000..51eb0b2b --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/01-disable-uac.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-uac.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-disable-ntp.ps1 new file mode 100644 index 00000000..ee3b3b7d --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-disable-ntp.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-disable-sleep.ps1 new file mode 100644 index 00000000..5bf811ef --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-install-notepad++.ps1 new file mode 100644 index 00000000..455d92bf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-7-x86_64/02-python.ps1 new file mode 100644 index 00000000..e2e9be9c --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/02-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 new file mode 100644 index 00000000..8f94b3d5 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windefender.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-7-x86_64/04-disable-windows-updates.ps1 new file mode 100644 index 00000000..57428310 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/04-disable-windows-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86_64/05-wsearch-off.ps1 new file mode 100644 index 00000000..eed6b734 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/05-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..b8c1ce9f --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-7-x86_64/08-install-git.ps1 new file mode 100644 index 00000000..38106de7 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-7-x86_64/08-install-jdk.ps1 new file mode 100644 index 00000000..15065b55 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/08-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-7-x86_64/08-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..1b1a07e9 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/08-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/08-ninja.ps1 b/coin/provisioning/qtci-windows-7-x86_64/08-ninja.ps1 new file mode 100644 index 00000000..ba571a1e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/08-ninja.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-cmake.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-cmake.ps1 new file mode 100644 index 00000000..73dc7bc2 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-install-dependencywalker.ps1 new file mode 100644 index 00000000..331de489 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-install-ruby.ps1 new file mode 100644 index 00000000..875b426f --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-install-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-install-strawberry-perl.ps1 new file mode 100644 index 00000000..2b5756be --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-install-strawberry-perl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-jom.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-jom.ps1 new file mode 100644 index 00000000..b246ce25 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-mysql.ps1 new file mode 100644 index 00000000..eca19011 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-mysql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mysql.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-openssl.ps1 new file mode 100644 index 00000000..d57ad1cd --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-openssl.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-postgresql.ps1 new file mode 100644 index 00000000..451d2452 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-postgresql.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\postgresql.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-7-x86_64/09-set-network-test-server.ps1 new file mode 100644 index 00000000..7918fabf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/09-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86_64/10-dxsdk.ps1 new file mode 100644 index 00000000..155df6b8 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/10-dxsdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\dxsdk.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86_64/12-icu.ps1 new file mode 100644 index 00000000..074a7a6d --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/12-icu.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\icu.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 new file mode 100644 index 00000000..3e825ab8 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 new file mode 100644 index 00000000..3201032d --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86_64/27-squish.ps1 b/coin/provisioning/qtci-windows-7-x86_64/27-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/27-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" From 7f7c87a15dba038bec33d342fe4deef8e5e0c7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 1 Feb 2018 08:31:56 +0200 Subject: [PATCH 6/9] Remove excess sourcing of try_catch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3bfa7e8755dbae904719212c22549f6965142330 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 5d36f57b..6c198b1d 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -39,8 +39,6 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -# shellcheck source=../common/unix/try_catch.sh -source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" NTS_IP=10.212.2.216 From 4eaa0170231457c90a5465f4820d29bb7f64ce3d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Sun, 14 Jan 2018 12:14:16 +0200 Subject: [PATCH 7/9] Provisioning: Disable Network Time Protocol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NTP need to be disabled from all tier2 templates Task-number: QTQAINFRA-1608 Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66 Reviewed-by: Tony Sarajärvi --- .../common/linux/disable-ntp_linux.sh | 44 +++++++++++++++++++ .../common/unix/disable-ntp_macos.sh | 40 +++++++++++++++++ .../02-disable-ntp.sh | 3 ++ .../02-disable-ntp.sh | 3 ++ .../02-disable-ntp.sh | 2 + .../qtci-macos-10.12-x86_64/02-disable-ntp.sh | 3 ++ .../qtci-osx-10.10-x86_64/02-disable-ntp.sh | 3 ++ .../qtci-osx-10.11-x86_64/02-disable-ntp.sh | 3 ++ 8 files changed, 101 insertions(+) create mode 100755 coin/provisioning/common/linux/disable-ntp_linux.sh create mode 100755 coin/provisioning/common/unix/disable-ntp_macos.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh create mode 100644 coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh new file mode 100755 index 00000000..56f98c52 --- /dev/null +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -0,0 +1,44 @@ +#!/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 + +echo "Disable Network Time Protocol (NTP)" + +if uname -a |grep -q "Ubuntu"; then + sudo timedatectl set-ntp false +else + systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off +fi diff --git a/coin/provisioning/common/unix/disable-ntp_macos.sh b/coin/provisioning/common/unix/disable-ntp_macos.sh new file mode 100755 index 00000000..581ea7cb --- /dev/null +++ b/coin/provisioning/common/unix/disable-ntp_macos.sh @@ -0,0 +1,40 @@ +#!/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 + +echo "Disable Network Time Protocol (NTP)" +echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile + diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..ca31a876 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..ca31a876 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..97bb177c --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh new file mode 100644 index 00000000..32528873 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$(dirname $0)/../common/unix/disable-ntp_macos.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 new file mode 100755 index 00000000..356891e1 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh new file mode 100644 index 00000000..32528873 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +$(dirname $0)/../common/unix/disable-ntp_macos.sh From d10baa6d3a405011b3de101d1e2142d662ba4f30 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 2 Feb 2018 13:03:39 +0200 Subject: [PATCH 8/9] Update submodules on '5.10' in qt5 Change-Id: Iefacfb5735b27e25a7e5eba595245f22a9ae07d1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index e2e162b9..46319648 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e2e162b9ca122e68c444b536888f30c6f1c10de4 +Subproject commit 46319648436814afb5a77755dde6681e304befaf diff --git a/qtbase b/qtbase index e39a9de3..15ae7949 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e39a9de3309f84be4101da839a0bacf69090706f +Subproject commit 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a diff --git a/qtconnectivity b/qtconnectivity index b274a83b..78782157 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83c +Subproject commit 787821571b4a7cce8eb9faccb0fed10ee944d8a5 diff --git a/qtdatavis3d b/qtdatavis3d index 63b90a1d..4ceabb63 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 63b90a1d334743b63f396331434e9b12e366f9d3 +Subproject commit 4ceabb63a6db137809a08cab11d10b0b0df5d411 diff --git a/qtdeclarative b/qtdeclarative index 2570b801..2e65f6c2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2570b801c74832a3c83a8b56ad0f76812969e190 +Subproject commit 2e65f6c2a5d84f4369245cabdc03eca4c19851f0 diff --git a/qtdoc b/qtdoc index ea25c59a..d10d9f5f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ea25c59aa9e6d7ef69ba6e06a1509042b4af0d51 +Subproject commit d10d9f5fae5ff76c1d600b70e6482cd23f83220b diff --git a/qtlocation b/qtlocation index 9283a290..518633da 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9283a290040fd55f7eb34580b99f771d4facdeb4 +Subproject commit 518633da419d6cfaf603773b9e8c5840e783bc4a diff --git a/qtmultimedia b/qtmultimedia index a3fb2426..4395fed2 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a3fb242676055355deb68788199ae59abe58ca41 +Subproject commit 4395fed2b35dd12bb9bde5e20d91908d28196a06 diff --git a/qtquickcontrols b/qtquickcontrols index 698a8268..48bfc02e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 698a8268f786d74726eb07255df2d26ac2269079 +Subproject commit 48bfc02e82cb4b666fb832ef0ace59af8a0c7ef2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ac6f4903..efc5564c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ac6f4903aeb2e8399b5aa538b35a760f0392568c +Subproject commit efc5564c19f3b15eb9a7b0022d201c866a9cf216 diff --git a/qtremoteobjects b/qtremoteobjects index c26dd694..61d2de26 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c26dd694e8374b478bf428bc9e8753cfc0c3a523 +Subproject commit 61d2de26db7b90ad0ed3923b5deecd1c5b3be46a diff --git a/qtsensors b/qtsensors index fb382442..5b5a7b4d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fb382442ccf1a8e926687b3cfa163ccbca479c46 +Subproject commit 5b5a7b4d1f49960d2b7b80735bd4eb6340b1acf0 diff --git a/qtsvg b/qtsvg index 275bd8a4..520ebdba 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 275bd8a4a76256e889cad1ea88c4b5d3acb9ad8f +Subproject commit 520ebdbacb3b0d823126d82306107808287425a3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1a9158bf..39567625 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1a9158bfbdd8dd01bac591c11bb0d0bf46514ddb +Subproject commit 39567625f6168fab057eb76ad048dc41e62b7bf4 diff --git a/qtwebengine b/qtwebengine index d502c6e9..7644564d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d502c6e9d09803dd268100f8c53cf7bc563e3d1d +Subproject commit 7644564d754bbee640a091950b77e23586c2d283 diff --git a/qtxmlpatterns b/qtxmlpatterns index 0a84ad44..6b198fef 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0a84ad44ff5b793316485fd992326627a70fda84 +Subproject commit 6b198fef037dc8bc10d209342123f1aa38e807b3 From 06875142216c7efd1d9bca6443a53a8bfac7aee7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Feb 2018 17:52:33 +0100 Subject: [PATCH 9/9] Update submodules on '5.11' in qt5 Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtopcua | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 598acd70..c8a48a9a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 598acd70a44f787a3e72c586576bfc028d5af02d +Subproject commit c8a48a9a28889598cb2a06fc8d5deb9b803509ca diff --git a/qtbase b/qtbase index efec288f..2cb1db64 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit efec288f58dc18f6a571bfedf9d19e3fbf12a18f +Subproject commit 2cb1db64370989fffeec313c196fe573c479e6aa diff --git a/qtconnectivity b/qtconnectivity index 1653ae6e..1d9d30a7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1653ae6e8782fb96999a53736a773e9a31d86b8a +Subproject commit 1d9d30a75a1c13851a9f050d7ce4f8057c4fa9fb diff --git a/qtdeclarative b/qtdeclarative index c4f1a676..f252b522 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c4f1a676fcaad76829c7cda1f5bea018150b7412 +Subproject commit f252b5229dc291cbf0773d2252068b0b2a6d7c9e diff --git a/qtdoc b/qtdoc index 00f15195..1aa64c49 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 00f151953dbb4d9e50eebcaedce9866977e22a12 +Subproject commit 1aa64c4997d92f053ca211dc0992213c14db563d diff --git a/qtlocation b/qtlocation index 38e72f68..8d1b370c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 38e72f68316b2a28c4949b2701a23f1e5ed3ccf6 +Subproject commit 8d1b370cf371e73540424191241a7432b41d0785 diff --git a/qtmultimedia b/qtmultimedia index 009a9d4b..923c2ab6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 009a9d4b5d32fa73aca6cabe7d45d6a9bbae0038 +Subproject commit 923c2ab674d903d5c71254bf127d2784d3cc6980 diff --git a/qtopcua b/qtopcua index 74a6a384..1b6bcd71 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 74a6a38411c37a670e70c3292eab2b9071d7719f +Subproject commit 1b6bcd71a308b3331bbf72815ff6f4f83b6352a5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3323ca8e..72abc4e9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3323ca8e627db560665edb667e52d52233c05601 +Subproject commit 72abc4e94764b4a5592a9d153ff9991fe66d7395 diff --git a/qtremoteobjects b/qtremoteobjects index cd58e66b..a0b0c1f6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cd58e66b974b6ed06d23dff565a3f29a76a55749 +Subproject commit a0b0c1f6a3927e2f31b40619c17bffaf7571dd24 diff --git a/qtscxml b/qtscxml index ac1bc572..c043ebeb 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ac1bc572a22ed3de61076e2b8f27dea52171ddc8 +Subproject commit c043ebebaba80b32ddb69ed29aa3408549567a6d diff --git a/qttools b/qttools index 135482d3..5b35868d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 135482d36409b5763292c1bf92a8bae7b8322bbe +Subproject commit 5b35868d810751698070f50d894ec1f0cc969a38 diff --git a/qttranslations b/qttranslations index e65c3e30..25eb2bbb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e65c3e30bc56242bee353d4d28f9cf97c9af8a3c +Subproject commit 25eb2bbb4bf5e7b556d60b2328a19fcedbc3f4fe diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d3f40bea..93af389b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d3f40bea1b424f60b178faf6bcb45927ce56e083 +Subproject commit 93af389b0cb786864af8e54d53c7da308cb557a8 diff --git a/qtwayland b/qtwayland index 7a9d0f9d..ebe5f609 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7a9d0f9d0a852c727aef5a54ceeb51b7b2dda85d +Subproject commit ebe5f6097af0fd01b3733ebd4d920f710e4b186a diff --git a/qtwebengine b/qtwebengine index 2daa4950..7a3e38d7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2daa4950118dd76d0d0bf15e347217740b0cb5c5 +Subproject commit 7a3e38d779352ca09e9118d735c9a2b0ea55b763 diff --git a/qtwebview b/qtwebview index 71be1de8..0f0d87a7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 71be1de8162f38fc544605743a0169e10a19dc39 +Subproject commit 0f0d87a757fe30976c183207968e1c07f87460d5 diff --git a/qtxmlpatterns b/qtxmlpatterns index a67c761d..5fac6d6f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a67c761d96dbfe78a63b12d48445091aa58edf35 +Subproject commit 5fac6d6fda04924b03f6a5651933f0c055d0df23