diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
| commit | 1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch) | |
| tree | 0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /coin/provisioning/common/postgresql.ps1 | |
| parent | cdab32be2368ffd234c9ace4233916cfc3682563 (diff) | |
| parent | 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to 'coin/provisioning/common/postgresql.ps1')
| -rw-r--r-- | coin/provisioning/common/postgresql.ps1 | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1 index 2ff97761..dd5858a3 100644 --- a/coin/provisioning/common/postgresql.ps1 +++ b/coin/provisioning/common/postgresql.ps1 @@ -40,37 +40,45 @@ $version = "9.1.9-1" $packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip" $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" -# Install x64 bit versions -$architecture = "x64" -$installFolder = "C:\Utils\postgresql\pgsql" -$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" +if( (is64bitWinHost) -eq 1 ) { + # Install x64 bit versions + $architecture = "x64" + $installFolder = "C:\Utils\postgresql\pgsql" + $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" -# Delete any leftovers -try { - Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted -} catch {} + # Delete any leftovers + try { + Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted + } catch {} -echo "Fetching from URL ..." -Download $externalUrl $internalUrl $packagex64 -Verify-Checksum $packagex64 $sha1 -echo "Installing $packagex64 ..." -Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder + echo "Fetching from URL ..." + Download $externalUrl $internalUrl $packagex64 + Verify-Checksum $packagex64 $sha1 + echo "Installing $packagex64 ..." + Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder -echo "Remove downloaded $packagex64 ..." -Remove-Item $packagex64 + echo "Remove downloaded $packagex64 ..." + Remove-Item $packagex64 -echo "Set $architecture environment variables ..." -[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") -[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") + echo "Set $architecture environment variables ..." + [Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") + [Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") +} # Install x86 bit version $architecture = "x86" -$installFolder = "C:\Utils\postgresql$architecture\pgsql" $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" +if( (is64bitWinHost) -eq 1 ) { + $installFolder = "C:\Utils\postgresql$architecture\pgsql" +} +else { + $installFolder = "C:\Utils\postgresql\pgsql" +} + echo "Fetching from URL..." Download $externalUrl $internalUrl $packagex86 |