qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.6' into 5.7 

Conflicts:
	coin/provisioning/common/02-python.ps1

Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
This commit is contained in:
Simon Hausmann 2016-12-21 21:38:29 +01:00
parent 2f9d551948 8a60455e61
commit 591c6d0446
18 changed files with 179 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/02-python.ps1
View File

@ -64,3 +64,5 @@ del $package
Add-Path $path
& python -m ensurepip
# Install python virtual env
pip.exe install virtualenv

4
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh Normal file
View File

@ -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

5
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh Normal file
View File

@ -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

4
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh Normal file
View File

@ -0,0 +1,4 @@
#!/usr/bin/env sh
# Disable questions on shutdown.
gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true

6
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh Normal file
View File

@ -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

4
coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh Normal file
View File

@ -0,0 +1,4 @@
#!/usr/bin/env sh
# Disable questions on shutdown.
gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true

4
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-suppress-shutdown-indicator.sh Normal file
View File

@ -0,0 +1,4 @@
#!/usr/bin/env sh
# Disable questions on shutdown.
gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true

0
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh → coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-apt-update.sh
View File

0
coin/provisioning/qtci-osx-10.10/crashreporter.sh → coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh
View File

26
coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh Normal file
View File

@ -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

0
coin/provisioning/qtci-osx-10.11/crashreporter.sh → coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
View File

26
coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh Normal file
View File

@ -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

0
coin/provisioning/qtci-osx-10.8/crashreporter.sh → coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh
View File

26
coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh Normal file
View File

@ -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

0
coin/provisioning/qtci-osx-10.9/crashreporter.sh → coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh
View File

26
coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh Normal file
View File

@ -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

14
coin/provisioning/qtci-windows-7-x86/04-msys.ps1 Normal file
View File

@ -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:\

32
coin/provisioning/qtci-windows-7-x86/android_openssl.ps1 Normal file
View File

@ -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