summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-09-12 21:50:27 +0200
committerLiang Qi <liang.qi@qt.io>2018-09-12 21:50:27 +0200
commitdada6497fb6948e421fdd6fb736c3c4897d5ec2f (patch)
tree4670b156ab49ca06e8f95cb3bccaac1f8794f6ad
parent974884c0d158732f1dd1870ff027159ace6099ea (diff)
parente866953948d9029e29b9ca7e7b0771ed33c8d2c3 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
-rw-r--r--.commit-template6
-rw-r--r--_clang-format4
-rw-r--r--coin/platform_configs/qt3d-runtime.txt19
-rwxr-xr-xcoin/provisioning/common/linux/disable-cracklib.sh4
-rwxr-xr-xcoin/provisioning/common/linux/disable-mlocate.sh3
-rwxr-xr-xcoin/provisioning/common/linux/remove_update-manager.sh3
-rw-r--r--coin/provisioning/common/windows/jom.ps18
-rw-r--r--coin/provisioning/common/windows/libclang.ps14
-rw-r--r--coin/provisioning/common/windows/mesa_llvmpipe.ps119
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager4
17 files changed, 85 insertions, 17 deletions
diff --git a/.commit-template b/.commit-template
index aced2afa..3a288707 100644
--- a/.commit-template
+++ b/.commit-template
@@ -9,7 +9,11 @@
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
-# One task per entry. Remember space after colon.
+# One task per entry. Add a space after the colon.
+# Use Fixes to automatically close an issue, and Task-number to
+# reference it without further action.
+# You do not need both for the same issue.
+#Fixes:
#Task-number:
#Coverity-Id:
#
diff --git a/_clang-format b/_clang-format
index c2e09757..ee000a1e 100644
--- a/_clang-format
+++ b/_clang-format
@@ -49,8 +49,8 @@ BraceWrapping:
# When constructor initializers do not fit on one line, put them each on a new line.
ConstructorInitializerAllOnOneLineOrOnePerLine: true
-# Indent initializers by 8 spaces
-ConstructorInitializerIndentWidth: 8
+# Indent initializers by 4 spaces
+ConstructorInitializerIndentWidth: 4
# Indent width for line continuations.
ContinuationIndentWidth: 8
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt
new file mode 100644
index 00000000..396b51dc
--- /dev/null
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -0,0 +1,19 @@
+Template Target OS Target arch Compiler Features
+--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
+qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
+qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
+qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/provisioning/common/linux/disable-cracklib.sh b/coin/provisioning/common/linux/disable-cracklib.sh
new file mode 100755
index 00000000..e6cfc7a5
--- /dev/null
+++ b/coin/provisioning/common/linux/disable-cracklib.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sudo chmod -x /etc/cron.daily/cracklib-runtime
+
diff --git a/coin/provisioning/common/linux/disable-mlocate.sh b/coin/provisioning/common/linux/disable-mlocate.sh
new file mode 100755
index 00000000..c86df437
--- /dev/null
+++ b/coin/provisioning/common/linux/disable-mlocate.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo chmod -x /etc/cron.daily/mlocate*
diff --git a/coin/provisioning/common/linux/remove_update-manager.sh b/coin/provisioning/common/linux/remove_update-manager.sh
new file mode 100755
index 00000000..d5dc1ca4
--- /dev/null
+++ b/coin/provisioning/common/linux/remove_update-manager.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+sudo apt-get remove update-manager
diff --git a/coin/provisioning/common/windows/jom.ps1 b/coin/provisioning/common/windows/jom.ps1
index 7c59c61c..21993184 100644
--- a/coin/provisioning/common/windows/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
@@ -1,11 +1,13 @@
. "$PSScriptRoot\helpers.ps1"
-$zip = Get-DownloadLocation "jom_1_1_2.zip"
+$version = "1_1_2"
+$zip = Get-DownloadLocation "jom_$version.zip"
-Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
+Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip
Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
Extract-7Zip $zip C:\Utils\Jom
Set-EnvironmentVariable "CI_JOM_PATH" "C:\Utils\Jom"
-Write-Output "Jom = 1.1.2" >> ~/versions.txt
+$version = $version.replace('_','.')
+Write-Output "Jom = $version" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index dd21f424..7caecc96 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -6,6 +6,7 @@ param(
. "$PSScriptRoot\helpers.ps1"
$libclang_version="6.0"
+Write-Output "libClang = $libclang_version" >> ~/versions.txt
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 3.9 or higher is required for building.
@@ -13,6 +14,7 @@ $libclang_version="6.0"
# Starting from Qt 5.11 QDoc requires Clang to parse C++
$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain
+$libclang_version = $libclang_version -replace '["."]'
function install() {
@@ -23,7 +25,6 @@ function install() {
$zip = "c:\users\qt\downloads\libclang.7z"
- $libclang_version = $libclang_version -replace '["."]'
$script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
$script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
@@ -72,7 +73,6 @@ if ( $setDefault ) {
Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
}
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
-Write-Output "libClang = $libclang_version" >> ~/versions.txt
if ( $libclang_version -eq "60" ) {
# This is a hacked static build of libclang which requires special
diff --git a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1
index 2f613076..ee792896 100644
--- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1
+++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1
@@ -35,20 +35,21 @@
$version = "11_2_2"
$package = "C:\Windows\temp\opengl32sw.7z"
$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1"
-$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
+$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z"
+$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
-$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
+$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z"
+$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
function Extract-Mesa
{
Param (
- [string]$downloadUrl,
+ [string]$downloadUrlCache,
+ [string]$downloadUrlAlt,
[string]$sha1,
[string]$targetFolder
)
- Write-Host "Installing Mesa from $downloadUrl to $targetFolder"
- Write-Host "Downloading $downloadUrl to $package"
- Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $package
+ Download $downloadUrlAlt $downloadUrlCache $package
Verify-Checksum $package $sha1
Extract-7Zip $package $targetFolder
Write-Host "Removing $package"
@@ -56,10 +57,10 @@ function Extract-Mesa
}
if (Is64BitWinHost) {
- Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32"
- Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
+ Extract-Mesa $mesaOpenglUrl_64_cache $mesaOpenglUrl_64_alt $mesaOpenglSha1_64 "C:\Windows\System32"
+ Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
} else {
- Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
+ Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\system32"
}
Write-Output "Mesa llvmpipe = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh
new file mode 100755
index 00000000..f12cff1e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh
new file mode 100755
index 00000000..f12cff1e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh
new file mode 100755
index 00000000..8590d4e4
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/disable-cracklib.sh
+source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh
new file mode 100755
index 00000000..f12cff1e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager
new file mode 100755
index 00000000..12302976
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/remove_update-manager.sh
+source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh
new file mode 100755
index 00000000..8590d4e4
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/disable-cracklib.sh
+source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh
new file mode 100755
index 00000000..f12cff1e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager
new file mode 100755
index 00000000..12302976
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../common/linux/remove_update-manager.sh
+source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh"