aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-13 23:28:56 +0100
committerLiang Qi <liang.qi@qt.io>2017-12-13 23:28:56 +0100
commit475fc2c2ad53252dbc9fb1657dc2c7fe660fcd07 (patch)
tree3c2f7e755897fcffc1d2f5d8ac1f2e7261f38b1f /coin/provisioning
parenteccfaf1f506ceb46016e385c1a2707461811def2 (diff)
parentb16eac13e6f65f338ec9e78ce4a926edadde8efb (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .gitmodules Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
Diffstat (limited to 'coin/provisioning')
-rw-r--r--coin/provisioning/common/install-ruby.ps114
-rw-r--r--coin/provisioning/common/ruby.ps17
-rw-r--r--coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh120
-rw-r--r--coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/33-ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86/ruby.ps11
-rw-r--r--coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps11
9 files changed, 7 insertions, 140 deletions
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1
index 57cf227f..94e32b74 100644
--- a/coin/provisioning/common/install-ruby.ps1
+++ b/coin/provisioning/common/install-ruby.ps1
@@ -35,26 +35,24 @@
# This script will install Ruby
-$version = "2.2.6"
+$version = "2.4.2-2"
if( (is64bitWinHost) -eq 1 ) {
$arch = "-x64"
- $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
+ $sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5"
}
else {
- $arch = ""
- $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
+ $arch = "-x86"
+ $sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e"
}
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
-$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
+$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe"
$rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
Download $url_official $url_cache $rubyPackage
Verify-Checksum $rubyPackage $sha1
-cmd /c "$rubyPackage /silent"
+Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait
echo "Cleaning $rubyPackage.."
Remove-Item -Recurse -Force "$rubyPackage"
-Add-Path "C:\Ruby22-x64\bin"
-
echo "Ruby = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1
deleted file mode 100644
index f7813c20..00000000
--- a/coin/provisioning/common/ruby.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
-
-Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer
-Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
-& $installer /DIR=C:\ruby /VERYSILENT
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
deleted file mode 100644
index 69b3c10e..00000000
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/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 install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3
-
-# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6.
-
-# 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.
-
-set -ex
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.intra.qt.io/input/android"
-
-# SDK
-sdkPackage="android-sdk_r24.4.1-linux.tgz"
-sdkBuildToolsVersion="23.0.3"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkPackage"
-sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
-sdkTargetFile="$targetFolder/$sdkPackage"
-sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
-sdkFolderName="android-sdk-linux"
-sdkName="sdk"
-
-# NDK
-ndkVersion="r10e"
-ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip"
-ndkUrl="$baseUrl/$ndkPackage"
-ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
-ndkTargetFile="$targetFolder/$ndkPackage"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-$ndkVersion"
-ndkName="ndk"
-
-function InstallAndroidPackage {
- targetFolder=$1
- version=$2
- url=$3
- sha1=$4
- targetFile=$5
- extract=$6
- folderName=$7
- name=$8
-
- sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
- echo "$sha1 $targetFile" | sha1sum --check
- 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"
-}
-
-if [ -d "$targetFolder" ]; then
- echo "Removing old Android installation"
- sudo rm -fr "$targetFolder"
-fi
-
-sudo mkdir "$targetFolder"
-
-# Install Android SDK
-echo "Installing Android SDK version $sdkPackage..."
-InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-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 21, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 21, 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 'export ANDROID_API_VERSION=android-21' >> ~/.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
diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
new file mode 100644
index 00000000..0d28ea1e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-10-x86/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"