diff options
| author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-08-21 15:14:00 +0300 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-01 13:02:12 +0000 |
| commit | 3ca76587815797b1b101941537c090b9026bd418 (patch) | |
| tree | 1b28bfceb426ebabcdedea7e0abed41ab78f6da3 /coin/provisioning/common/python.ps1 | |
| parent | 1726ba16117fedaffc4c3d387d411851479fb22c (diff) | |
Provision vanilla Windows 8.1 x86 and use it
Replaces existing Windows 8 x86 builds with
a vanilla tier 1 image that gets all needed
software provisioned except for VS2013 that is
pre-installed.
Also modifies existing provisioning scripts
under common to support this 32bit OS.
Task-number: QTQAINFRA-1383
Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/python.ps1')
| -rw-r--r-- | coin/provisioning/common/python.ps1 | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 29114456..0be96eef 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -30,27 +30,23 @@ ## $QT_END_LICENSE$ ## ############################################################################# -param([Int32]$archVer=32) . "$PSScriptRoot\helpers.ps1" # This script installs Python $version. # Python is required for building Qt 5 from source. $version = "2.7.13" -$package = "C:\Windows\temp\python-$version.msi" - -# check bit version -if ( $archVer -eq 64 ) { - echo "Running in 64 bit system" - $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi" +if( (is64bitWinHost) -eq 1 ) { + $arch = ".amd64" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { - $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi" + $arch = "" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } +$package = "C:\Windows\temp\python-$version.msi" +$externalUrl = "https://www.python.org/ftp/python/$version/python-$version" + $arch + ".msi" +$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version" + $arch + ".msi" echo "Fetching from URL..." Download $externalUrl $internalUrl $package |