diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-04 22:21:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-04 22:21:23 +0100 |
commit | ad3c5195259321ab8420df0dee1a9b14cfc4811b (patch) | |
tree | f6dd1fc9f3b0578a261294f43fe7ed477c9108cc | |
parent | 111799abf170d4a65358aa84d1f1d9a92bee6350 (diff) | |
parent | 8de4f42cb62b083cee959ae196eec6c593b3f8ea (diff) | |
download | qt5-ad3c5195259321ab8420df0dee1a9b14cfc4811b.tar.gz |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
-rw-r--r-- | .gitmodules | 2 | ||||
-rw-r--r-- | coin/provisioning/common/03-conan.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/common/msvc2015_update.ps1 | 58 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 | 33 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 | 33 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 112 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 | 63 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 | 86 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 | 84 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8-x86/cmake.ps1 | 1 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 | 1 | ||||
-rwxr-xr-x | configure | 2 |
12 files changed, 474 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 6a1e8498..05660dba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -237,7 +237,7 @@ status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel - recommends = qtlocation + recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git branch = 5.9 diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 04be729d..6a4b4ebb 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -2,7 +2,7 @@ $scriptsPath = "C:\Python27\Scripts" -& "$scriptsPath\pip.exe" install --upgrade conan==0.16.0 +& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine") diff --git a/coin/provisioning/common/msvc2015_update.ps1 b/coin/provisioning/common/msvc2015_update.ps1 new file mode 100644 index 00000000..618c87c4 --- /dev/null +++ b/coin/provisioning/common/msvc2015_update.ps1 @@ -0,0 +1,58 @@ +############################################################################# +## +## 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\helpers.ps1" + +# Install Visual Studio $version with $update_version +# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs +$version = "2015" +$update_version = "3" + +# Only way to install specific Visual studio release is to use feed.xml. +# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' +# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) +$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" + +$msvc_web_installer = "vs" + $version + "_" + $update_version +$package = "C:\Windows\temp\$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" +$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" + +echo "Fetching Visual Studio $version update $update_version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing Visual studio $version update $update_version..." +cmd /c "$package $parameters /norestart /Quiet" +remove-item $package + +echo "Visual Studio = $version update $update_version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 new file mode 100644 index 00000000..83ff3f48 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 @@ -0,0 +1,33 @@ +############################################################################# +## +## 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\msvc2015_update.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 new file mode 100644 index 00000000..83ff3f48 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 @@ -0,0 +1,33 @@ +############################################################################# +## +## 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\msvc2015_update.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 new file mode 100644 index 00000000..5e75f662 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -0,0 +1,112 @@ +############################################################################# +## +## 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" + +# This script installs MySQL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "5.6.11" +$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip" +$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip" + +function CheckAndRemovePreviousInstallation +{ + Param ( + [string]$InstallFolder + ) + echo "Check for previous installation..." + $FolderExists = Test-Path $ExistingInstallation + If ($FolderExists -eq $True) { + echo "Removing previous installation ($ExistingInstallation)" + Remove-Item $ExistingInstallation -recurse + } +} + +function DownloadAndInstall +{ + Param ( + [string]$arch, + [string]$externalUrl, + [string]$internalUrl, + [string]$package, + [string]$sha1, + [string]$installPath + ) + + echo "Fetching from URL ..." + Download $externalUrl $internalUrl $package + Verify-Checksum $package $sha1 + Extract-Zip $package $installPath +} + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\Utils\my_sql" +$existingInstallation = "$installFolder\my_sql" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64" +$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38" + +echo "Check and remove previous installation ..." +CheckAndRemovePreviousInstallation $existingInstallation +DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder +Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql + +echo "Remove downloaded package ..." +Remove-Item $packagex64 + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\my_sql$architecture" +$existingInstallation = "$installFolder\my_sql" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32" +$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679" + +echo "Check and remove previous installation ..." +CheckAndRemovePreviousInstallation $existingInstallation +DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder +Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql + +echo "Remove downloaded package ..." +Remove-Item $packagex86 + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "MySQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 new file mode 100644 index 00000000..079f26c3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -0,0 +1,63 @@ +############################################################################# +## +## 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" + +$version = "11_2_2" +$package = "C:\Windows\temp\opengl32sw_$version.7z" +$destinationFolder = "C:\Windows\SysWOW64" +$openglPackage = "C:\Windows\SysWOW64\opengl32.dll" + +$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" +$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll" +$openglSha1 = "690730f973aa39bd80648e026248394fde07a753" + +Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package +Verify-Checksum $package $mesaOpenglSha1 +Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"} + +echo "Remove downloaded $package ..." +Remove-Item $package -recurse + +echo "Take ownership of existing opengl32.dll from SysWOW64" +takeown /f $openglPackage +icacls $openglPackage /grant Administrators:F +echo "Remove existing opengl32.dll from SysWOW64" +Remove-Item -Recurse -Force $openglPackage +echo "Add new opengl32.dll to SysWOW64" +Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage +Verify-Checksum $openglPackage $openglSha1 + +# Store version information to ~/versions.txt +echo "OpenGL x86 = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 new file mode 100644 index 00000000..35340ca7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -0,0 +1,86 @@ +############################################################################# +## +## 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" + +# This script installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2j" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\openssl" +$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" +$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe" +$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\openssl$architecture" +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe" +$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +cmd /c "$packagex86 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x86", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x86", "$installFolder\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "OpenSSL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 new file mode 100644 index 00000000..9b1d5d4e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -0,0 +1,84 @@ +############################################################################# +## +## 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" + +# This script installs postgresql $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$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" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip" +$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +Extract-Zip $packagex64 $installFolder + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\postgresql$architecture" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip" +$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +Extract-Zip $packagex86 $installFolder + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "PostgreSQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" @@ -33,7 +33,7 @@ ############################################################################# srcpath=`dirname $0` -srcpath=`(cd "$srcpath"; /bin/pwd)` +srcpath=`(cd "$srcpath"; pwd)` configure=$srcpath/qtbase/configure if [ ! -e "$configure" ]; then echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 |