diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-09 10:33:56 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-14 07:24:32 +0000 |
commit | d615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch) | |
tree | 0d809a18ab4cc1295ec473d3819b56d5ff0900df /coin/provisioning/qtci-osx-10.11-x86_64 | |
parent | bded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff) | |
parent | bbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
Diffstat (limited to 'coin/provisioning/qtci-osx-10.11-x86_64')
6 files changed, 30 insertions, 64 deletions
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh index 47bf03f8..4a07bbbe 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh @@ -46,10 +46,15 @@ ExceptionSetInitialDelay=101 ExceptionSetDelay=102 ExceptionVNC=103 ExceptionNTS=104 +ExceptionDisableScreensaverPassword=105 try ( echo "Disable Screensaver" + # For current session + defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver + + # For session after a reboot mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver ( cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT @@ -78,6 +83,8 @@ try EOT ) || throw $ExceptionDisableScreensaver + defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword + echo "Set keyboard type rates and delays" # normal minimum is 15 (225 ms) defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay @@ -113,6 +120,10 @@ catch || { echo "Failed to set NTS." exit 1; ;; + $ExceptionDisableScreensaverPassword) + echo "Failed to disable requiring of password after screensaver is enabled." + exit 1; + ;; esac } diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh new file mode 100755 index 00000000..61406203 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh @@ -0,0 +1,3 @@ +#!/bin/sh +# Enables the usage of temporary keychains for SSL autotests +echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index 44453e55..7555c752 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -47,68 +47,7 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" -ExceptionDownloadUrl=100 -ExceptionSHA1=101 -ExceptionUnXZ=102 -ExceptionCPIO=103 -ExceptionDelete=104 -ExceptionAcceptLicense=105 - - -url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.2.xz -targetFile=/tmp/Xcode_8.2.xz -expectedSha1=46edc920955e315d946e36c45f629d5ee9dc9d59 - -try -( - echo "Downloading Xcode from primary URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl - - echo "Checking SHA1 on $targetFile" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 - - echo "Uncompressing '$targetFile'" - xz -d "$targetFile" || throw $ExceptionUnXZ - - echo "Unarchiving '${targetFile%.*}'" - (cd /Applications/ && sudo cpio -dmiI "${targetFile%.*}") || throw $ExceptionCPIO - - echo "Deleting '${targetFile%.*}'" - rm "${targetFile%.*}" || throw $ExceptionDelete - - echo "Accept license" - sudo xcodebuild -license accept || throw $ExceptionAcceptLicense - - echo "Xcode = 8.2" >> ~/versions.txt -) -catch || { - case $ex_code in - $ExceptionDownloadUrl) - echo "Failed to download Xcode." - exit 1; - ;; - $ExceptionSHA1) - echo "Failed to check SHA1." - exit 1; - ;; - $ExceptionUnXZ) - echo "Failed to uncompress .xz" - exit 1; - ;; - $ExceptionCPIO) - echo "Failed to unarchive .cpio." - exit 1; - ;; - $ExceptionDelete) - echo "Failed to delete temporary file." - exit 1; - ;; - $ExceptionAcceptLicense) - echo "Failed to accept license." - exit 1; - ;; - - esac -} - +# shellcheck source=../common/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/install_xcode.sh" +InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh new file mode 100755 index 00000000..63ec9b69 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh new file mode 100755 index 00000000..4fb9ddbc --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +# Install 7z to be used from command line +brew update +brew install p7zip diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh new file mode 100755 index 00000000..d257ffa1 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +# There is only one mac package and common script uses it as a default +$BASEDIR/../common/libclang.sh |