From db9682888c384b3e8333d7b01719adb96a23becb Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 23 Jan 2017 12:04:25 +0200 Subject: [PATCH 1/8] Add PS provisioning helper for 7-Zip files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/helpers.ps1 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 0e684452..191be290 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -15,6 +15,29 @@ function Verify-Checksum } } +function Extract-7Zip +{ + Param ( + [string]$Source, + [string]$Destination + ) + echo "Extracting '$Source' to '$Destination'..." + + if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) { + $zipExe = join-path ${env:ProgramFiles(x86)} '7-zip\7z.exe' + if (-not (test-path $zipExe)) { + $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe' + if (-not (test-path $zipExe)) { + throw "Could not find 7-zip." + } + } + } else { + $zipExe = "7z.exe" + } + + & $zipExe x $Source "-o$Destination" -y +} + function Extract-Zip { Param ( From 321d5f1488938ad80f207a03a02101ebbf8ce763 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 23 Jan 2017 12:12:51 +0200 Subject: [PATCH 2/8] Provision libusb-1.0 for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's needed by tqtc-boot2qt/qdb. Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/libusb.ps1 | 47 +++++++++++++++++++ .../qtci-windows-10-x86/libusb.ps1 | 1 + .../qtci-windows-7-x86/libusb.ps1 | 1 + .../qtci-windows-8-x86/libusb.ps1 | 1 + 4 files changed, 50 insertions(+) create mode 100644 coin/provisioning/common/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/libusb.ps1 diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1 new file mode 100644 index 00000000..ed575886 --- /dev/null +++ b/coin/provisioning/common/libusb.ps1 @@ -0,0 +1,47 @@ +############################################################################# +# +# 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$ +# +############################################################################ + +# lisbusb-1.0 is needed by tqtc-boot2qt/qdb + +. "$PSScriptRoot\helpers.ps1" + +$archive = "C:\users\qt\downloads\libusb-1.0.21.7z" +$libusb_location = "C:\Utils\libusb-1.0" + +Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z http://ci-files01-hki.ci.local/input/libusb-1.0/libusb-1.0.21.7z $archive +Verify-Checksum $archive "37c8884a0ddca97d492b8ef3e08970ae3ba20653" + +Extract-7Zip $archive $libusb_location + +# Tell tqtc-boot2qt/qdb build system where to find libusb +[Environment]::SetEnvironmentVariable("LIBUSB_PATH", $libusb_location, "Machine") diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/libusb.ps1 b/coin/provisioning/qtci-windows-7-x86/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" From 0c8536fc0a22bb071cecaa9165cce5586f4ff55b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 2 Feb 2017 09:07:50 +0200 Subject: [PATCH 3/8] Provision: Script for linux to remove preinstalled software Script to remove tier1's preinstalled software. Script itself includes all information about the software that needs to be removed from tier2 before provision starts to run installations. When this script is run for certain platform that platform needs to provision all removed software back to tier2 template. So user needs to make sure that all needed provision script are available when calling this removal-script. Goal is to have vanilla os when provision don't need to remove any software before installations. When this goal is reached this script and script calls can be removed from provision. Change-Id: I048909800807fabb1dc599e768a90e7457fbc2cf Reviewed-by: Simon Hausmann --- .../common/linux-removethemall.sh | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 coin/provisioning/common/linux-removethemall.sh diff --git a/coin/provisioning/common/linux-removethemall.sh b/coin/provisioning/common/linux-removethemall.sh new file mode 100755 index 00000000..4386ec74 --- /dev/null +++ b/coin/provisioning/common/linux-removethemall.sh @@ -0,0 +1,49 @@ +#!/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 removes preinstalled sw. +# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script + +function RemoveDir { + targetFolder=$1 + + if [ -d "$targetFolder" ]; then + echo "Removing existing $targetFolder..." + sudo rm -fr "$targetFolder" + fi +} + +# Android +RemoveDir /opt/android From 713188e4af7d99e4b04b5270b13fbb3b786d4edc Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 16 Jan 2017 14:21:47 +0100 Subject: [PATCH 4/8] Revert "Clean up usage of qtsvg as dependency" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtdeclarative has a runtime dependency, some tests rely on the svg module being available, so in order to not reduce the test coverage, revert this change. I'd like to see a better/cleaner separation, but for the time being, better coverage wins. This reverts commit fbd782636b6ee413d2b6e8bca408263297194254. Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6dc85870..9bcdf4ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative qtsvg + recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.6 @@ -159,7 +159,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtxmlpatterns + recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 From 32b5e271a8998d25130c1cca4de7df93de9911e4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 22 Nov 2016 10:45:09 +0100 Subject: [PATCH 5/8] Update jom to 1.1.2 The most important changes that affect the CI are: - Fixed bogus path in error message for failed targets. - Fixed error "JobClient destroyed while still acquiring." that could be yielded for failed builds. - Fixed /k option (QTCREATORBUG-17131). - Added the special .NOTPARALLEL target that disables parallel build for the containing makefile. (This one is needed to build QtWebEngine in debug-and-release properly.) - Introduced the JOMFLAGS environment variable. This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up separate flags for nmake and jom. Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409 Reviewed-by: Simon Hausmann --- coin/provisioning/common/jom.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 index ef012b64..c1e2cbf7 100644 --- a/coin/provisioning/common/jom.ps1 +++ b/coin/provisioning/common/jom.ps1 @@ -1,9 +1,9 @@ . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\jom_1_1_0.zip" +$zip = "c:\users\qt\downloads\jom_1_1_2.zip" -Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip -Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" +Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip +Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4" Extract-Zip $zip C:\Utils\Jom [Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine") From 6afffd698574703acf2d4c8a30d07343a8a8e14f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 10 Jan 2017 15:26:57 +0200 Subject: [PATCH 6/8] Provision: Script to print sw versions to provision log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script is the last script that is run by provisioning. It will print all storaged sw information to provision log Change-Id: I2c76d5f7cccf9c116cb660ffcb67d3bece473da8 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/version.sh | 43 ++++++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/version.sh | 44 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100755 coin/provisioning/common/version.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/version.sh new file mode 100755 index 00000000..e7662e1e --- /dev/null +++ b/coin/provisioning/common/version.sh @@ -0,0 +1,43 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script will print all installed software to provision log. +# Script needs to be named so that it will be ran at last during provisioning + +# Print all build machines versions to provision log +echo "*********************************************" +echo "***** SW VERSIONS *****" +cat ~/versions.txt +echo "*********************************************" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh new file mode 100644 index 00000000..5ef5f0e9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh @@ -0,0 +1,44 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +$(dirname $0)/../common/version.sh From a36977963a9b6fad940f6ae8395401ce567f4b49 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 10 Jan 2017 09:59:14 +0200 Subject: [PATCH 7/8] Provision: Storage android sdk and ndk version information MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sdk and ndk version information will be storaged to versions.txt. Versions.txt will be used for all provision scripts and later on it's data will be printed to provision log. Also script name changed to match both android sdk and ndk. Change-Id: I3366e596f539099c3b587466d90905d0889398fe Reviewed-by: Tony Sarajärvi --- ...{android_sdk_linux.sh => android_linux.sh} | 48 ++++++++++++------- 1 file changed, 30 insertions(+), 18 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{android_sdk_linux.sh => android_linux.sh} (64%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh similarity index 64% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 81132d9b..1d0630ce 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -48,23 +48,24 @@ targetFolder="/opt/android" baseUrl="http://ci-files01-hki.ci.local/input/android" # SDK -sdkVersion="android-sdk_r24.4.1-linux.tgz" +sdkPackage="android-sdk_r24.4.1-linux.tgz" sdkBuildToolsVersion="23.0.3" sdkApiLevel="android-18" -sdkUrl="$baseUrl/$sdkVersion" +sdkUrl="$baseUrl/$sdkPackage" sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" -sdkTargetFile="$targetFolder/$sdkVersion" +sdkTargetFile="$targetFolder/$sdkPackage" sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile" sdkFolderName="android-sdk-linux" sdkName="sdk" # NDK -ndkVersion="android-ndk-r10e-linux-x86_64.zip" -ndkUrl="$baseUrl/$ndkVersion" +ndkVersion="r10e" +ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip" +ndkUrl="$baseUrl/$ndkPackage" ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" -ndkTargetFile="$targetFolder/$ndkVersion" +ndkTargetFile="$targetFolder/$ndkPackage" ndkExtract="unzip $ndkTargetFile -d $targetFolder" -ndkFolderName="android-ndk-r10e" +ndkFolderName="android-ndk-$ndkVersion" ndkName="ndk" function InstallAndroidPackage { @@ -77,29 +78,40 @@ function InstallAndroidPackage { folderName=$7 name=$8 - sudo wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times" echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" - sudo chmod 755 $targetFile + sudo chmod 755 "$targetFile" sudo $extract || echo "Failed to extract $url" - sudo chown -R qt:users $targetFolder/$folderName - sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" - sudo rm -fr $targetFolder/$version + sudo chown -R qt:users "$targetFolder"/"$folderName" + sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name" + sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir $targetFolder +sudo mkdir "$targetFolder" # Install Android SDK -echo "Installing Android SDK version $sdkVersion..." -InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName +echo "Installing Android SDK version $sdkPackage..." +InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName # Install Android NDK -echo "Installing Android NDK version $ndkVersion..." -InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName +echo "Installing Android NDK version $ndkPackage..." +InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName # run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." -echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" +echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" # For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 # From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc +# Storage version information to ~/versions.txt, which is used to print version information to provision log. +echo "***** Android SDK *****" >> ~/versions.txt +echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt +echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt +platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)" +echo "Android Platform Tools = $platformTools" >> ~/versions.txt +sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)" +echo "Android SDK Tools = $sdkTools" >> ~/versions.txt +echo "***** Android NDK *****" >> ~/versions.txt +echo "Android NDK Version = $ndkVersion" >> ~/versions.txt + From 4b45cd68d4f365c0025ca19611f35660361e8d76 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 3 Feb 2017 15:36:26 +0100 Subject: [PATCH 8/8] Update submodules on '5.8' in qt5 Change-Id: Ic3a06dd310fd7b67b53b95c8f6b1ef8813449fe5 Reviewed-by: Liang Qi --- qt3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qt3d b/qt3d index 8ec785d2..5cdfef0b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8ec785d21c13ed0a8d375ff13bf06bea1deb11ae +Subproject commit 5cdfef0be44d12bf340b5640e458a73631a4a6f3 diff --git a/qtconnectivity b/qtconnectivity index 468e3c38..2eaf5b34 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 468e3c38a893b9293a9f0ede432ce54d72b46966 +Subproject commit 2eaf5b3428f8440de2535be26bb0dee59fd0740d diff --git a/qtdeclarative b/qtdeclarative index e0c119cc..bf19d329 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e0c119ccd4ca49b6fecb708133bb0d3008903560 +Subproject commit bf19d3294f83fc061eddc719bc608bb19e500a5a diff --git a/qtdoc b/qtdoc index ff545591..24435fb0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ff5455912a1a8e40ce9edc731c6c5dcf3a7d9a8e +Subproject commit 24435fb0818ddf414de6d753dc5460da34b905f4 diff --git a/qtlocation b/qtlocation index 8cbfb416..ee5bf405 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8cbfb416c6cb1f60a7035d810f3ed68d3aae7bac +Subproject commit ee5bf40562aeca6fd861121ab29506cf905189f3 diff --git a/qtmacextras b/qtmacextras index 56ca83ad..f1d8761b 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 56ca83adf83cecd3b81425973d3bb65715719b80 +Subproject commit f1d8761b93fc3f23cb537b6e06f4502a3f214df0 diff --git a/qtmultimedia b/qtmultimedia index e5ee1e03..7c787f11 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e5ee1e036eaecb91797cbe85ac7f8929145f3d65 +Subproject commit 7c787f11dd2348e0fd2cecc231f15a0acde7481a diff --git a/qtnetworkauth b/qtnetworkauth index 1f5d0bbc..212ae9ac 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1f5d0bbcf5a581a67aad97564fb696f180462967 +Subproject commit 212ae9ac4a8c6bd8a74bbe67ffdcc730906bcad6 diff --git a/qtqa b/qtqa index 583ae213..1561b922 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 +Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 diff --git a/qtrepotools b/qtrepotools index d4c099dd..7f2dc562 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c +Subproject commit 7f2dc562e3e13640f615c86d700da3b501091f59 diff --git a/qtscxml b/qtscxml index c575eb52..b0031247 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c575eb524bc26fc4af3711d634110c226c9e11c0 +Subproject commit b00312476eb182c5cd716559148016558a5889b4 diff --git a/qtsensors b/qtsensors index 1b880496..722194f5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1b88049661176d149fa75bfdc349cf5b7acb21b4 +Subproject commit 722194f5cdfc04a1be875249507067f913ab2776 diff --git a/qtserialbus b/qtserialbus index aef65fb8..a13f088f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit aef65fb80fc60909ac5141f2df1f9918f964528c +Subproject commit a13f088fab1d2b28778f41a6e8f4c0951061c03f diff --git a/qtserialport b/qtserialport index 86683c44..489d8ce0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 86683c445aa61d23af5c06f4e4b45c1d4c80a5bd +Subproject commit 489d8ce034c422549c1cb39da29de361695f4137 diff --git a/qtspeech b/qtspeech index 9bfe64fd..ecc425e3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9bfe64fddcc528e9aa27b33a17e1435f46ec620d +Subproject commit ecc425e33290abdda9a193b57f160d3195930586 diff --git a/qtsvg b/qtsvg index 9778bdd2..7738642c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9778bdd27ce04b92824abfc1bb54b21f1086a2f6 +Subproject commit 7738642c0d8af7066ea488b239fbefa4b55ecca8 diff --git a/qttools b/qttools index 7bb45dc5..05fd8652 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7bb45dc5318c4c84d94ff35400616eee8e7f741d +Subproject commit 05fd8652a7e43df2fc763222892f3c33bed7183f diff --git a/qtwayland b/qtwayland index df015bd2..712e7f6d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit df015bd2e40e7654b2515996d5bd82469542581a +Subproject commit 712e7f6d96b00f1002a5f833f09ad465332967f0 diff --git a/qtwebchannel b/qtwebchannel index 031d8d8b..6015604d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 031d8d8b1c150f464fc29f7c7a296d257b19797a +Subproject commit 6015604df92ceea6021268a2161da29fb89e0738 diff --git a/qtwebengine b/qtwebengine index 35c38346..685366c9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 35c38346e65fe26c75bbe08c7002f645ea53fec1 +Subproject commit 685366c9a3d8d967e072c721c64a365ce50bc531 diff --git a/qtwebkit b/qtwebkit index 7c082434..a4eec411 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7c0824348f93947c946a42999afd8b5dd329c519 +Subproject commit a4eec4118333b59d10fd6cc9f126b1af2e8f505c diff --git a/qtwebsockets b/qtwebsockets index 83a05bbd..abc12bf1 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 83a05bbdc5d87246ec089f855545b6836c0fdf38 +Subproject commit abc12bf1c2dde5864fcd321ca41bcf2f80874d85 diff --git a/qtxmlpatterns b/qtxmlpatterns index 2e582640..57a1b273 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 2e582640c06facd313d77b34fe40c9db4419eef5 +Subproject commit 57a1b273a42746755bbcd93a74245d17afd81625