From eeea4e5c3a8e5adb78ad08fcbf6b133d98fa072c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 7 Sep 2016 09:17:07 +0300 Subject: Add Android NDK/SDK to provision for macOS 10.10 and 10.11 Install latest Android sdk and ndk. It also runs update for SDK API level 18 Task-number: QTBUG-58370 Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3 Reviewed-by: Simon Hausmann --- coin/provisioning/common/01-macos-removethemall.sh | 49 ++++++++++ .../01-macos-removethemall.sh | 4 + coin/provisioning/qtci-osx-10.10-x86_64/android.sh | 102 +++++++++++++++++++++ .../qtci-osx-10.10-x86_64/crashreporter.sh | 2 + .../01-macos-removethemall.sh | 4 + coin/provisioning/qtci-osx-10.11-x86_64/android.sh | 102 +++++++++++++++++++++ .../qtci-osx-10.11-x86_64/crashreporter.sh | 2 + 7 files changed, 265 insertions(+) create mode 100644 coin/provisioning/common/01-macos-removethemall.sh create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/android.sh create mode 100644 coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/android.sh create mode 100644 coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh diff --git a/coin/provisioning/common/01-macos-removethemall.sh b/coin/provisioning/common/01-macos-removethemall.sh new file mode 100644 index 00000000..f0e26480 --- /dev/null +++ b/coin/provisioning/common/01-macos-removethemall.sh @@ -0,0 +1,49 @@ +#!/bin/sh +############################################################################# +## +## 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$ +## +############################################################################# + +function RemoveDir { + param=$1 + + if [ ! -d $param ] + then + echo "'$param' don't exists" + else + echo "Removing $param..." + sudo rm -fr $param + fi +} + +# Remove Android +param="/opt/android" +RemoveDir $param diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh new file mode 100644 index 00000000..6b56aac4 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +source "$BASEDIR/../common/01-macos-removethemall.sh" + diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/android.sh b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh new file mode 100644 index 00000000..559eabd6 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/android.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +############################################################################# +## +## 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 install Android sdk and ndk. + +# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and - build-tools + +# 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 18 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. + +set -e +targetFolder="/opt/android" +baseUrl="http://ci-files01-hki.ci.local/input/android" + +# SDK +sdkVersion="android-sdk_r24.4.1-macosx.zip" +sdkBuildToolsVersion="24.0.2" +sdkApiLevel="android-18" +sdkUrl="$baseUrl/$sdkVersion" +sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" +sdkTargetFile="$targetFolder/$sdkVersion" +sdkExtract="unzip $sdkTargetFile -d $targetFolder" +sdkFolderName="android-sdk-macosx" +sdkName="sdk" + +# NDK +ndkVersion="android-ndk-r10e-darwin-x86_64.zip" +ndkUrl="$baseUrl/$ndkVersion" +ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" +ndkTargetFile="$targetFolder/$ndkVersion" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-r10e" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" + shasum $targetFile |grep $sha1 || echo "shasum check failed !" + sudo chmod 755 $targetFile + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:wheel $targetFolder/$folderName + sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" + sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" +} + +sudo mkdir $targetFolder +# Install Android SDK +echo "Installing Android SDK version $sdkVersion..." +InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkVersion..." +InstallAndroidPackage $targetFolder $ndkVersion $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" + +# 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 diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh new file mode 100644 index 00000000..6b56aac4 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +source "$BASEDIR/../common/01-macos-removethemall.sh" + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/android.sh b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh new file mode 100644 index 00000000..559eabd6 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/android.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +############################################################################# +## +## 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 install Android sdk and ndk. + +# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and - build-tools + +# 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 18 will disable themselves dynamically when running on an Android 16 device. +# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6. + +set -e +targetFolder="/opt/android" +baseUrl="http://ci-files01-hki.ci.local/input/android" + +# SDK +sdkVersion="android-sdk_r24.4.1-macosx.zip" +sdkBuildToolsVersion="24.0.2" +sdkApiLevel="android-18" +sdkUrl="$baseUrl/$sdkVersion" +sdkSha1="85a9cccb0b1f9e6f1f616335c5f07107553840cd" +sdkTargetFile="$targetFolder/$sdkVersion" +sdkExtract="unzip $sdkTargetFile -d $targetFolder" +sdkFolderName="android-sdk-macosx" +sdkName="sdk" + +# NDK +ndkVersion="android-ndk-r10e-darwin-x86_64.zip" +ndkUrl="$baseUrl/$ndkVersion" +ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" +ndkTargetFile="$targetFolder/$ndkVersion" +ndkExtract="unzip $ndkTargetFile -d $targetFolder" +ndkFolderName="android-ndk-r10e" +ndkName="ndk" + +function InstallAndroidPackage { + targetFolder=$1 + version=$2 + url=$3 + sha1=$4 + targetFile=$5 + extract=$6 + folderName=$7 + name=$8 + + sudo curl --retry 5 --retry-delay 10 --retry-max-time 60 $url -o $targetFile || echo "Failed to download '$url' multiple times" + shasum $targetFile |grep $sha1 || echo "shasum check failed !" + sudo chmod 755 $targetFile + sudo $extract || echo "Failed to extract $url" + sudo chown -R qt:wheel $targetFolder/$folderName + sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name" + sudo rm -fr $targetFolder/$version || echo "Failed to remove $targetFolder/$version" +} + +sudo mkdir $targetFolder +# Install Android SDK +echo "Installing Android SDK version $sdkVersion..." +InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName + +# Install Android NDK +echo "Installing Android NDK version $ndkVersion..." +InstallAndroidPackage $targetFolder $ndkVersion $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" + +# 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 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server -- cgit v1.2.3