diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-09 15:27:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-09 15:27:08 +0200 |
commit | f557e0634f2fe4d6f3a34978b2b06a482a6fa0d7 (patch) | |
tree | 8a147f0fbad5b7d9fd48e88f1665f77bfec655c4 /coin/provisioning/common | |
parent | a66a54035c707138eb56744993639b5989074f70 (diff) | |
parent | 049eb21a1d6af9c95b1a2b7a33a134dc6abc5433 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 1 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-msys2.ps1 | 70 |
2 files changed, 71 insertions, 0 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a15bcf03..5840d4b4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 new file mode 100644 index 00000000..0c4a9680 --- /dev/null +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -0,0 +1,70 @@ +############################################################################ +## +## Copyright (C) 2019 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 7-Zip + +$version = "20181211" +$prog = "msys2" +if (Is64BitWinHost) { + $arch = "x86_64" + $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" + $folder = "msys64" +} else { + $arch = "i686" + $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" + $folder = "msys32" +} +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" + + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$url_official = "http://repo.msys2.org/distrib/$arch/$package" +$PackagePath = "C:\Windows\Temp\$package" +$TargetLocation = "C:\Utils" + + +Download $url_official $url_cache $PackagePath +Verify-Checksum $PackagePath $sha1 +Extract-tar_gz $PackagePath $TargetLocation +$msys = "$TargetLocation\$folder\msys2_shell.cmd" + +# install perl +Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + +Write-Host "Cleaning $PackagePath.." +Remove-Item -Recurse -Force -Path "$PackagePath" + +Write-Output "7-Zip = $version" >> ~\versions.txt |