mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-02 03:36:54 +08:00
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: If94f226052c35a2400eaeeef450bf75c07367a6e
This commit is contained in:
Liang Qi
@@ -14,8 +14,8 @@ qtci-linux-openSUSE-42.3-x86_64 ICC_18
|
||||
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
|
||||
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
|
||||
qtci-macos-10.13-x86_64 Clang DebugAndRelease Release DisableTests
|
||||
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
|
||||
qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests
|
||||
qtci-macos-10.12-x86_64-8 Clang DeveloperBuild Release QtNamespace NoPch
|
||||
qtci-macos-10.12-x86_64-8 Clang Release NoFramework DisableTests
|
||||
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
|
||||
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
|
||||
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite of the Qt Toolkit.
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
@@ -33,14 +33,6 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
|
||||
|
||||
version="8.2"
|
||||
packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
|
||||
sha1="4df615ca765ac1a1e681ddcbca79fc15990e3b25"
|
||||
|
||||
InstallCommandLineTools $url $url $sha1 $packageName $version
|
||||
|
||||
# Disable spotlight and and stop indexing
|
||||
sudo mdutil -a -i off
|
||||
sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"
|
||||
@@ -206,12 +206,12 @@ if ($targetCommand.StartsWith("mingw")) {
|
||||
BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
|
||||
} elseif ($targetCommand -eq "msvc2015_x86") {
|
||||
Write-Host "### Creating Open62541 for MSVC2015 x86"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" "vcvarsall.bat x86"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 msvc2015 x86 jom
|
||||
} elseif ($targetCommand -eq "msvc2015_x64") {
|
||||
Write-Host "### Creating Open62541 for MSVC2015 x64"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" "vcvarsall.bat amd64"
|
||||
MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
|
||||
PushDevEnvironment
|
||||
BuildAndInstallOpen62541 msvc2015 x64 jom
|
||||
} elseif ($targetCommand -eq "msvc2017_x86") {
|
||||
|
||||
16
coin/provisioning/common/windows/vclibs_debug.ps1
Normal file
16
coin/provisioning/common/windows/vclibs_debug.ps1
Normal file
@@ -0,0 +1,16 @@
|
||||
function Install-VCLibsDebug
|
||||
{
|
||||
Param (
|
||||
[string]$Arch
|
||||
)
|
||||
|
||||
$installedPackage = Get-AppxPackage Microsoft.VCLibs.140.00.Debug | Where-Object {$_.Architecture -eq $Arch}
|
||||
if ($installedPackage) {
|
||||
Write-Host "Debug VCLibs already installed for $Arch."
|
||||
return
|
||||
}
|
||||
|
||||
Add-AppxPackage "C:\Program Files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs\14.0\Appx\Debug\$Arch\Microsoft.VCLibs.$Arch.Debug.14.00.appx"
|
||||
|
||||
Write-Host "Debug VCLibs successfully installed for $Arch."
|
||||
}
|
||||
@@ -46,6 +46,78 @@ cd "$tempDir"
|
||||
#latest commit from the master proven to work
|
||||
git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f
|
||||
git submodule update --init pixman
|
||||
|
||||
patch -p1 <<EOT
|
||||
From aad6a8f17dc7ad3681d2d98a01e474a8904a129b Mon Sep 17 00:00:00 2001
|
||||
From: Simon Hausmann <simon.hausmann@qt.io>
|
||||
Date: Fri, 24 Aug 2018 10:38:29 +0200
|
||||
Subject: [PATCH] linux-user: add support for MADV_DONTNEED
|
||||
|
||||
Most flags to madvise() are just hints, so typically ignoring the
|
||||
syscall and returning okay is fine. However applications exist that do
|
||||
rely on MADV_DONTNEED behavior to guarantee that upon subsequent access
|
||||
the mapping is refreshed from the backing file or zero for anonymous
|
||||
mappings.
|
||||
---
|
||||
linux-user/mmap.c | 18 ++++++++++++++++++
|
||||
linux-user/qemu.h | 1 +
|
||||
linux-user/syscall.c | 6 +-----
|
||||
3 files changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
|
||||
index 61685bf79e..cb3069f27e 100644
|
||||
--- a/linux-user/mmap.c
|
||||
+++ b/linux-user/mmap.c
|
||||
@@ -764,3 +764,16 @@ int target_msync(abi_ulong start, abi_ulong len, int flags)
|
||||
start &= qemu_host_page_mask;
|
||||
return msync(g2h(start), end - start, flags);
|
||||
}
|
||||
+
|
||||
+int target_madvise(abi_ulong start, abi_ulong len, int flags)
|
||||
+{
|
||||
+ /* A straight passthrough may not be safe because qemu sometimes
|
||||
+ turns private file-backed mappings into anonymous mappings.
|
||||
+ Most flags are hints, except for MADV_DONTNEED that applications
|
||||
+ may rely on to zero out pages, so we pass that through.
|
||||
+ Otherwise returning success is ok. */
|
||||
+ if (flags & MADV_DONTNEED) {
|
||||
+ return madvise(g2h(start), len, MADV_DONTNEED);
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
|
||||
index 4edd7d0c08..3c975909a1 100644
|
||||
--- a/linux-user/qemu.h
|
||||
+++ b/linux-user/qemu.h
|
||||
@@ -429,6 +429,7 @@ int target_munmap(abi_ulong start, abi_ulong len);
|
||||
abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
|
||||
abi_ulong new_size, unsigned long flags,
|
||||
abi_ulong new_addr);
|
||||
+int target_madvise(abi_ulong start, abi_ulong len, int flags);
|
||||
int target_msync(abi_ulong start, abi_ulong len, int flags);
|
||||
extern unsigned long last_brk;
|
||||
extern abi_ulong mmap_next_start;
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 11a311f9db..94d8abc745 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -11148,11 +11148,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
||||
|
||||
#ifdef TARGET_NR_madvise
|
||||
case TARGET_NR_madvise:
|
||||
- /* A straight passthrough may not be safe because qemu sometimes
|
||||
- turns private file-backed mappings into anonymous mappings.
|
||||
- This will break MADV_DONTNEED.
|
||||
- This is a hint, so ignoring and returning success is ok. */
|
||||
- ret = get_errno(0);
|
||||
+ ret = get_errno(target_madvise(arg1, arg2, arg3));
|
||||
break;
|
||||
#endif
|
||||
#if TARGET_ABI_BITS == 32
|
||||
--
|
||||
2.17.1
|
||||
EOT
|
||||
|
||||
./configure --target-list=arm-linux-user,aarch64-linux-user --static
|
||||
make
|
||||
sudo make install
|
||||
|
||||
2
coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
Executable file
2
coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/usr/bin/env bash
|
||||
$(dirname "$0")/../common/macos/disable_spotlight.sh
|
||||
2
coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
Executable file
2
coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
Executable file
@@ -0,0 +1,2 @@
|
||||
#!/usr/bin/env bash
|
||||
$(dirname "$0")/../common/macos/disable_spotlight.sh
|
||||
@@ -1 +0,0 @@
|
||||
../common/macos/sha1sum-compatibility.sh
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/macos/disable_update_downloads.sh
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
set -ex
|
||||
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
@@ -1 +0,0 @@
|
||||
../common/macos/sha1sum-compatibility.sh
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/system_updates.sh
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
$(dirname $0)/../common/unix/disable-ntp_macos.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
set -ex
|
||||
|
||||
# Read .bashrc if exist
|
||||
printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script modified system settings for automated use
|
||||
|
||||
set -ex
|
||||
|
||||
VNCPassword=qt
|
||||
NTS_IP=10.212.2.216
|
||||
|
||||
echo "Disable Screensaver"
|
||||
# For current session
|
||||
defaults -currentHost write com.apple.screensaver idleTime 0
|
||||
|
||||
echo "Disable sleep"
|
||||
sudo pmset sleep 0 displaysleep 0
|
||||
|
||||
# For session after a reboot
|
||||
mkdir -p "$HOME/Library/LaunchAgents"
|
||||
cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>org.qt.io.screensaver_disable</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>defaults</string>
|
||||
<string>-currentHost</string>
|
||||
<string>write</string>
|
||||
<string>com.apple.screensaver</string>
|
||||
<string>idleTime</string>
|
||||
<string>0</string>
|
||||
</array>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>KeepAlive</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
EOT
|
||||
|
||||
defaults write com.apple.screensaver askForPassword -int 0
|
||||
|
||||
echo "Set keyboard type rates and delays"
|
||||
# normal minimum is 15 (225 ms)
|
||||
defaults write -g InitialKeyRepeat -int 15
|
||||
# normal minimum is 2 (30 ms)
|
||||
defaults write -g KeyRepeat -int 2
|
||||
|
||||
echo "Enable remote desktop sharing"
|
||||
sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all
|
||||
|
||||
echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
|
||||
echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/macos/disable_update_downloads.sh
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
# Enables the usage of temporary keychains for SSL autotests
|
||||
SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1"
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs XZ-Utils
|
||||
|
||||
# XZ-Utils are needed for uncompressing xz-compressed files
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/InstallPKGFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
|
||||
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg"
|
||||
AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
|
||||
SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
|
||||
DestDir="/"
|
||||
|
||||
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
|
||||
|
||||
echo "XZ = 5.0.7" >> ~/versions.txt
|
||||
@@ -1,50 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs Xcode
|
||||
# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
|
||||
# This can be achieved by fetching Xcode_8.xip from Apple Store.
|
||||
# Uncompress it with 'xar -xf Xcode_8.xip'
|
||||
# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
|
||||
# with which you can run 'python parse_pbzx2.py Content'.
|
||||
# This will give you a file called "Content.part00.cpio.xz" that
|
||||
# can be renamed to Xcode_8.xz for this script.
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/cmake.sh
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/homebrew.sh
|
||||
@@ -1,60 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2016 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs MySQL
|
||||
|
||||
# MySQL is needed for Qt to be able to support MySQL
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
|
||||
AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
|
||||
SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
|
||||
appPrefix=""
|
||||
targetDir="/opt/mysql57/"
|
||||
|
||||
sudo mkdir -p "/opt"
|
||||
|
||||
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir"
|
||||
|
||||
SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin"
|
||||
|
||||
echo "MySQL = 5.7.15" >> ~/versions.txt
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script installs PostgreSQL
|
||||
|
||||
# PostgreSQL is needed for Qt to be able to support PostgreSQL
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
|
||||
AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"
|
||||
SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
|
||||
appPrefix=""
|
||||
|
||||
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
|
||||
|
||||
SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin"
|
||||
|
||||
echo "PostgreSQL = 9.6.0" >> ~/versions.txt
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install 7z to be used from command line
|
||||
|
||||
set -ex
|
||||
|
||||
brew update
|
||||
brew install p7zip
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
# There is only one mac package
|
||||
# shellcheck source=../common/unix/libclang.sh
|
||||
"$BASEDIR/../common/unix/libclang.sh"
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/macos/java.sh
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/unix/squishInstall.sh
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
. "$PSScriptRoot\..\common\windows\vclibs_debug.ps1"
|
||||
|
||||
Install-VCLibsDebug X86
|
||||
@@ -0,0 +1,3 @@
|
||||
. "$PSScriptRoot\..\common\windows\vclibs_debug.ps1"
|
||||
|
||||
Install-VCLibsDebug X64
|
||||
Reference in New Issue
Block a user