lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Update postgresql

Browse Source 
Apparently libpq version 9.1.9 is no longer supported.
Let's use version 9.6 to keep maximum compatibility and align
the version with MacOS.

Task-number: QTBUG-79555
Change-Id: Iea98a1eb821f103e3a610ed602746407bfe5ea97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2019-12-09 09:43:50 +02:00
parent 5bdb2a0300
commit 5d027444b5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/provisioning/common/windows/postgresql.ps1
View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,7 +36,7 @@
# This script installs postgresql $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "9.1.9-1"
$version = "9.6.16-1"
$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip"
$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
@@ -46,7 +46,7 @@ if (Is64BitWinHost) {
$installFolder = "C:\Utils\postgresql"
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
$sha1 = "5dd604f91973112209362b5abbbd1220c026f645"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
@@ -56,6 +56,8 @@ if (Is64BitWinHost) {
Write-Host "Remove downloaded $packagex64 ..."
Remove-Item -Path $packagex64
# Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
Remove-item -Path "$installFolder\pgsql\include\pthread.h"
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"
@@ -65,7 +67,7 @@ if (Is64BitWinHost) {
$architecture = "x86"
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip"
$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
$sha1 = "46309190e60eead99c2d39c1dd18a91f2104d000"
if (Is64BitWinHost) {
$installFolder = "C:\Utils\postgresql$architecture"
} else {
@@ -81,6 +83,8 @@ Extract-7Zip $packagex86 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\i
Write-Host "Remove downloaded $packagex86 ..."
Remove-Item -Path $packagex86
# Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
Remove-item -Path "$installFolder\pgsql\include\pthread.h"
Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"