mirror of
git://code.qt.io/qt/qt5.git
synced 2026-05-09 12:37:50 +08:00
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .gitmodules coin/platform_configs/qt5.txt coin/provisioning/common/system_updates.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
This commit is contained in:
Liang Qi
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\disable-windefender.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\wsearch-off.ps1"
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\openssl.ps1"
|
||||
@@ -1,5 +0,0 @@
|
||||
# Turning off win defender.
|
||||
#
|
||||
# If disabled manually, windows will automatically enable it after
|
||||
# some period of time. Disabling it speeds up the builds.
|
||||
REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
|
||||
@@ -1,3 +0,0 @@
|
||||
|
||||
# Disable the windows search indexing service
|
||||
sc.exe config WSearch start= disabled
|
||||
@@ -1,88 +1,2 @@
|
||||
#############################################################################
|
||||
##
|
||||
## 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\mysql.ps1"
|
||||
|
||||
. "$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-winx64.zip"
|
||||
$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
|
||||
|
||||
function DownloadAndInstall
|
||||
{
|
||||
Param (
|
||||
[string]$internalUrl,
|
||||
[string]$package,
|
||||
[string]$installPath
|
||||
)
|
||||
|
||||
echo "Fetching from URL ..."
|
||||
Copy-Item $internalUrl $package
|
||||
|
||||
$zipDir = [io.path]::GetFileNameWithoutExtension($package)
|
||||
Extract-Dev-Folders-From-Zip $package $zipDir $installPath
|
||||
|
||||
Remove-Item $package
|
||||
}
|
||||
|
||||
# Remove any leftovers
|
||||
try {
|
||||
Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
|
||||
} catch {}
|
||||
|
||||
# Install x64 bit version
|
||||
$architecture = "x64"
|
||||
$installFolder = "C:\Utils\my_sql\my_sql"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip"
|
||||
|
||||
DownloadAndInstall $internalUrl $packagex64 $installFolder
|
||||
|
||||
echo "Set environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
|
||||
|
||||
# Install x86 bit version
|
||||
$architecture = "x86"
|
||||
$installFolder = "C:\Utils\my_sql\my_sql$architecture"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip"
|
||||
|
||||
DownloadAndInstall $internalUrl $packagex86 $installFolder
|
||||
|
||||
echo "Set environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
echo "MySQL = $version" >> ~/versions.txt
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
$version = "11_2_2"
|
||||
$openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
|
||||
|
||||
$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
|
||||
$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll"
|
||||
$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
|
||||
|
||||
echo "Take ownership of existing opengl32.dll from SysWOW64"
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
#############################################################################
|
||||
##
|
||||
## 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 = "\\ci-files01-hki.ci.local\provisioning\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 = "\\ci-files01-hki.ci.local\provisioning\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
|
||||
@@ -1,89 +1,2 @@
|
||||
#############################################################################
|
||||
##
|
||||
## 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\postgresql.ps1"
|
||||
|
||||
. "$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\pgsql"
|
||||
$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
|
||||
$internalUrl = "\\ci-files01-hki.ci.local\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 {}
|
||||
|
||||
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 "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.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip"
|
||||
$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
|
||||
|
||||
echo "Fetching from URL..."
|
||||
Download $externalUrl $internalUrl $packagex86
|
||||
Verify-Checksum $packagex86 $sha1
|
||||
echo "Installing $packagex86 ..."
|
||||
Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
|
||||
|
||||
echo "Remove downloaded $packagex86 ..."
|
||||
Remove-Item $packagex86
|
||||
|
||||
echo "Set $architecture environment variables ..."
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine")
|
||||
[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine")
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
echo "PostgreSQL = $version" >> ~/versions.txt
|
||||
|
||||
Reference in New Issue
Block a user