diff options
5 files changed, 136 insertions, 6 deletions
diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index b957603a..fd8af091 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -81,6 +81,17 @@ function Download } } +function Set-EnvironmentVariable +{ + Param ( + [string]$Key = $(BadParam("a key")), + [string]$Value = $(BadParam("a value.")) + ) + Write-Host "Setting environment variable `"$($Key)`" to `"$($Value)`"" + + [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Machine) +} + function Add-Path { Param ( diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh index 33f66ebf..68ae23d0 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh @@ -32,15 +32,10 @@ set -e ## $QT_END_LICENSE$ ## ############################################################################# -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # macOS 10.11 template doesn't have working virtualenv installation. # To fix that, we first have to install pip to install virtualenv # Install pip -urlCache="http://ci-files01-hki.intra.qt.io/input/utils/get-pip.py" -urlAlt="https://bootstrap.pypa.io/get-pip.py" -sha1="3d45cef22b043b2b333baa63abaa99544e9c031d" -DownloadURL $urlCache $urlAlt $sha1 get-pip.py - +curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py sudo python get-pip.py rm get-pip.py diff --git a/coin/provisioning/qtci-windows-7-x86/03-set_my_postgresql_env.ps1 b/coin/provisioning/qtci-windows-7-x86/03-set_my_postgresql_env.ps1 new file mode 100644 index 00000000..afc9b3f9 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/03-set_my_postgresql_env.ps1 @@ -0,0 +1,42 @@ +############################################################################# +## +## 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\windows\helpers.ps1" + +# This script just sets required env variables to make sure +# Coin finds required SLL libs and headers. + +Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "C:\utils\postgresql\pgsql\include" +Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "C:\utils\postgresql\pgsql\lib" + + diff --git a/coin/provisioning/qtci-windows-7-x86/03-set_my_sql_env.ps1 b/coin/provisioning/qtci-windows-7-x86/03-set_my_sql_env.ps1 new file mode 100644 index 00000000..9c1ff8da --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/03-set_my_sql_env.ps1 @@ -0,0 +1,41 @@ +############################################################################# +## +## 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\windows\helpers.ps1" + +# This script just sets required env variables to make sure +# Coin finds required SLL libs and headers. + +Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "C:\utils\my_sql\my_sql\include" +Set-EnvironmentVariable "MYSQL_LIB_x86" "C:\utils\my_sql\my_sql\lib" + diff --git a/coin/provisioning/qtci-windows-7-x86/03-set_openssl_env.ps1 b/coin/provisioning/qtci-windows-7-x86/03-set_openssl_env.ps1 new file mode 100644 index 00000000..a02db755 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/03-set_openssl_env.ps1 @@ -0,0 +1,41 @@ +############################################################################# +## +## 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\windows\helpers.ps1" + +# This script just sets required env variables to make sure +# Coin finds required SLL libs and headers. + +Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "C:\openssl\include" +Set-EnvironmentVariable "OPENSSL_LIB_x86" "C:\openssl\lib" + |