diff options
author | Juha Karjalainen <juha.karjalainen@qt.io> | 2019-04-11 12:24:45 +0300 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2019-06-10 10:19:00 +0300 |
commit | c8deeb3d052bafd4ba50e44de56958b62b98fd82 (patch) | |
tree | 18fc779e52b44c618b83b9d8792570c8b9ccce66 | |
parent | b9e92adf5950d35ade47101641cf8f318bb77aef (diff) |
Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.
Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 230a73409a2fe58e7de0674107a2d870be0bf03d)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | coin/provisioning/common/windows/helpers.ps1 | 12 | ||||
-rw-r--r-- | coin/provisioning/common/windows/install-sed.ps1 | 60 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 | 1 |
3 files changed, 73 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index f5318bcb..6e8e0365 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -136,6 +136,18 @@ function Add-Path $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') } +function Prepend-Path +{ + Param ( + [string]$Path + ) + Write-Host "Adding $Path to Path" + + $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + [Environment]::SetEnvironmentVariable("Path", "$Path;" + $oldPath, [EnvironmentVariableTarget]::Machine) + $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') +} + function Set-EnvironmentVariable { Param ( diff --git a/coin/provisioning/common/windows/install-sed.ps1 b/coin/provisioning/common/windows/install-sed.ps1 new file mode 100644 index 00000000..2e1cbcd4 --- /dev/null +++ b/coin/provisioning/common/windows/install-sed.ps1 @@ -0,0 +1,60 @@ +############################################################################ +## +## 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 sed and it's dependencies + +$prog = "sed" +$version = "4.2.1" +$sha1 = "dfd3d1dae27a24784d7ab40eb074196509fa48fe" +$dep_sha1 = "f7edbd7152d8720c95d46dd128b87b8ba48a5d6f" +$pkg = "$prog-$version-bin.zip" +$dep_pkg = "$prog-$version-dep.zip" +$cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$pkg" +$dep_cached_url = "http://ci-files01-hki.intra.qt.io/input/windows/gnuwin32/$dep_pkg" +$install_location = "c:\Utils\$prog" + +$tmp_location = "c:\users\qt\downloads" +Download $cached_url $cached_url "$tmp_location\$pkg" +Verify-Checksum "$tmp_location\$pkg" $sha1 sha1 +Download $dep_cached_url $dep_cached_url "$tmp_location\$dep_pkg" +Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1 sha1 + +Extract-7Zip "$tmp_location\$pkg" $install_location +Extract-7Zip "$tmp_location\$dep_pkg" $install_location +Remove "$tmp_location\$pkg" +Remove "$tmp_location\$dep_pkg" + +Prepend-Path "$install_location\bin" +Write-Output "sed = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" |