aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2016-12-21 21:38:29 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2016-12-21 21:38:29 +0100
commit591c6d0446453b303638d86b31199d535b8f481e (patch)
tree4ec42e7220da5f9d730d6a4e0fa116094c297aa7
parent2f9d551948323c86e727d246c34c5f46a3661b8c (diff)
parent8a60455e61d6a7cd11eb7da02bdf1cae8ff97b8b (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: coin/provisioning/common/02-python.ps1 Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
-rw-r--r--coin/provisioning/common/02-python.ps12
-rw-r--r--coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh4
-rw-r--r--coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh5
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh4
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh6
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh4
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh4
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh (renamed from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.10/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.11/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.8/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh (renamed from coin/provisioning/qtci-osx-10.9/crashreporter.sh)0
-rw-r--r--coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh26
-rw-r--r--coin/provisioning/qtci-windows-7-x86/04-msys.ps114
-rw-r--r--coin/provisioning/qtci-windows-7-x86/android_openssl.ps132
18 files changed, 179 insertions, 0 deletions
diff --git a/coin/provisioning/common/02-python.ps1 b/coin/provisioning/common/02-python.ps1
index c3e5fcdb..32972830 100644
--- a/coin/provisioning/common/02-python.ps1
+++ b/coin/provisioning/common/02-python.ps1
@@ -64,3 +64,5 @@ del $package
Add-Path $path
& python -m ensurepip
+# Install python virtual env
+pip.exe install virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
new file mode 100644
index 00000000..b419f217
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
@@ -0,0 +1,4 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+sudo yum install -y python-devel python-virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
new file mode 100644
index 00000000..ad1bf18f
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
@@ -0,0 +1,5 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+sudo subscription-manager refresh
+sudo yum install -y python-devel python-virtualenv
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh
new file mode 100644
index 00000000..f11263b7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# Disable questions on shutdown.
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
new file mode 100644
index 00000000..205f598b
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
@@ -0,0 +1,6 @@
+# provides: python development libraries
+# version: provided by default Linux distribution repository
+# needed to build pyside
+
+sudo apt-get update
+sudo apt-get install -y python-dev
diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
new file mode 100644
index 00000000..f11263b7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# Disable questions on shutdown.
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh
new file mode 100644
index 00000000..f11263b7
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# Disable questions on shutdown.
+gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh
index 2f7e2e47..2f7e2e47 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh
diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.10/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+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
diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.11/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+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
diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.8/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+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
diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
index ba8dbdd3..ba8dbdd3 100644
--- a/coin/provisioning/qtci-osx-10.9/crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
new file mode 100644
index 00000000..44df94e7
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+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
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
new file mode 100644
index 00000000..b75fd2a6
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -0,0 +1,14 @@
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install msys which is needed for configuring openssl for Android
+
+$version = "1.0.11"
+$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
+
+$zip = "c:\users\qt\downloads\msys-$version.7z"
+$sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
+$destination = "C:\msys"
+
+Download $url $url $zip
+Verify-Checksum $zip $sha1
+C:\Utils\sevenzip\7z.exe x $zip -oC:\
diff --git a/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1
new file mode 100644
index 00000000..a1b656c6
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/android_openssl.ps1
@@ -0,0 +1,32 @@
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# OpenSSL need to be configured from sources for Android build in windows 7
+# Msys need to be installed to target machine
+# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
+
+$version = "1.0.2j"
+$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
+$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
+$destination = "C:\Utils\openssl-android-master"
+
+Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
+Verify-Checksum $zip $sha1
+
+C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
+C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils
+Remove-Item $destination -Force -Recurse
+Rename-Item C:\Utils\openssl-$version $destination
+Remove-Item $zip
+Remove-Item C:\Utils\openssl-$version.tar
+
+set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc
+set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar
+set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr
+$env:Path = $env:Path + ";C:\msys\1.0\bin"
+
+echo "Configuring OpenSSL $version for Android..."
+cd $destination
+C:\msys\1.0\bin\bash.exe -c "perl Configure shared android"
+
+# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
+# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h