aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-09-26 09:32:06 +0300
committerJoni Jäntti <joni.jantti@qt.io>2017-09-27 06:04:11 +0000
commit0e4d668e358eb6a025b3173e8a822ddbef7f5aa7 (patch)
treeaf37231f3105df99f02df5a91ef04f81ef283751
parent0b251bbdc058808c4264cbcc473c08f6c8a90f02 (diff)
Add official URL to MinGW Windows 10 provisioning
MinGW currently uses only internal URL without backup. Added the official URL to these scripts with SHA1 checksum verification. Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/provisioning/common/install-mingw.ps150
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps16
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps16
3 files changed, 52 insertions, 10 deletions
diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1
index fc02631d..f835059a 100644
--- a/coin/provisioning/common/install-mingw.ps1
+++ b/coin/provisioning/common/install-mingw.ps1
@@ -1,17 +1,59 @@
+############################################################################
+##
+## 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\helpers.ps1"
+
function InstallMinGW
{
Param (
- [string] $version = $(BadParam("the version being printed to versions.txt")),
- [string] $release = $(BadParam("release part of the file name"))
+ [string] $release = $(BadParam("release file name")),
+ [string] $sha1 = $(BadParam("SHA1 checksum of the file"))
)
+ $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
+
+ if ($arch -eq "i686") { $win_arch = "Win32" }
+ elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
+
$envvar = "MINGW$version"
$envvar = $envvar -replace '["."]'
$targetdir = "C:\$envvar"
- $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z"
+ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
+ $url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z"
$mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
- Copy-Item $url_cache $mingwPackage
+ Download $url_official $url_cache $mingwPackage
+ Verify-Checksum $mingwPackage $sha1
Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
index ded894a5..7c4cd8ac 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
@@ -2,9 +2,9 @@
# This script will install MinGW 5.3.0
-$version = "5.3.0"
-$release = "release-posix-dwarf-rt_v4-rev0"
+$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0"
+$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A"
-InstallMinGW $version $release
+InstallMinGW $release $sha1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
index a2710760..e11f2310 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
@@ -2,7 +2,7 @@
# This script will install MinGW 6.3.0
-$version = "6.3.0"
-$release = "release-posix-dwarf-rt_v5-rev2"
+$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2"
+$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B"
-InstallMinGW $version $release
+InstallMinGW $release $sha1