lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.13' into dev

Browse Source 
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
This commit is contained in:
Liang Qi
2019-04-14 23:11:30 +02:00
parent 74eab55ea8 f2af07b8ed
commit e10a2d4ffe
86 changed files with 304 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -49,7 +49,7 @@
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = dev
status = addon
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations

14
coin/platform_configs/default.txt
View File

@@ -1,17 +1,17 @@
Template Target OS Target arch Compiler Target Compiler Features
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
qtci-windows-10-x86_64-14 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-14 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests
qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch

1
coin/platform_configs/qt3d-runtime.txt
View File

@@ -1 +0,0 @@
qt5.txt

21
coin/platform_configs/qt3d-runtime.txt Normal file
View File

@@ -0,0 +1,21 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 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

23
coin/platform_configs/qt5.txt
View File

@@ -1,22 +1,21 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 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-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
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-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-14 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

3
coin/platform_configs/qtbase.txt
View File

@@ -2,6 +2,5 @@ Template Target OS Target arch Compiler Fe
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo
qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo
qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests

2
coin/platform_configs/qtconnectivity.txt
View File

@@ -1,3 +1,3 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo
qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo

2
coin/platform_configs/qtwebkit.txt
View File

@@ -1,4 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests

2
coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.

2
coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.

2
coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.

0
coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 → coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
View File

48
coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
View File

@@ -1,48 +0,0 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017 Build Tools
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
$version = "2017_version_15.0"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
$msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --passive --wait"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio Build Tools = $version" >> ~\versions.txt

39
coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
View File

@@ -1,6 +1,6 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -30,29 +30,22 @@
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
$version = "2015"
$update_version = "3"
# Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
$version_number ="14.0.25431.01"
$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978"
# Only way to install specific Visual studio release is to use feed.xml.
# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
# default plus following components were selected:
# * Visual C++
# * Universal Windows App Development Tools
# - Tools (1.4.1) and Windows SDK (10.0.14393)
# - Windows 10 SDK (10.0.10586)
# - Windows 10 SDK (10.0.10240)
# * Common Tools
# -Visual Studio Extensibility Tools Update 3
$msvc_web_installer = "vs" + $version + "_" + $update_version
$package = "C:\Windows\temp\$msvc_web_installer.exe"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
echo "Fetching Visual Studio $version update $update_version..."
Download $url_official $url_cache $package
Verify-Checksum $package $sha1
echo "Installing Visual studio $version update $update_version..."
cmd /c "$package $parameters /norestart /Quiet"
remove-item $package
echo "Visual Studio = $version update $update_version" >> ~\versions.txt
echo "Visual Studio = $version version $version_number" >> ~\versions.txt

64
coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
View File

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -31,19 +31,57 @@
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017
# Visual Studio $version version $version_number was installed manually using $installer.
$version = "2017"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
$msvcPackage = "C:\Windows\Temp\$version.exe"
$version_number = "15.8.5"
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe"
# Following components were selected from installer:
# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)
# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK)
# Microsoft.Component.NetFX.Native (.NET Native)
# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack)
# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server)
# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references)
# Microsoft.Component.ClickOnce (ClickOnce Publishing)
# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools)
# Microsoft.VisualStudio.Component.NuGet (NuGet package manager)
# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools)
# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation)
# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers)
# Microsoft.Component.MSBuild (MSBuild)
# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools)
# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update)
# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM)
# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64)
# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake)
# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools)
# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools)
# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics)
# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger)
# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic)
# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support)
# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services)
# Component.Linux.CMake (Visual C++ tools for CMake and Linux)
# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features)
# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX)
# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors)
# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK)
# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK)
# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK)
# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64)
# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0))
# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0))
# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0))
# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64])
# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS)
# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++)
# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64])
# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS)
# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++)
# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64])
# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0))
# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0))
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio = $version" >> ~\versions.txt
echo "Visual Studio = $version version version_number" >> ~\versions.txt

0
coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 → coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
View File

4
coin/provisioning/common/linux/android_linux.sh
View File

@@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="r26.1.1"
toolsFile="sdk-tools-linux-4333796.zip"
ndkVersion="r18b"
ndkVersion="r19c"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-28"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"

5
coin/provisioning/common/linux/emsdk.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -76,3 +76,6 @@ EOM
SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
echo "Emsdk = $version" >> ~/versions.txt
echo "Emsdk node = $version_node" >> ~/versions.txt

4
coin/provisioning/common/macos/install_openssl.sh
View File

@@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
sudo rm -rf /tmp/openssl-$opensslVersion

8
coin/provisioning/common/macos/python2.sh
View File

@@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg"
SHA1="895a8327a58e7c0e58852638ab3d84843643535b"
DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
@@ -55,5 +55,5 @@ InstallPip python2.7
SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
echo "python2 = 2.7.14" >> ~/versions.txt
echo "python2 = 2.7.16" >> ~/versions.txt

2
coin/provisioning/common/unix/install-breakpad.sh
View File

@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
)
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt

10
coin/provisioning/common/windows/android.ps1
View File

@@ -40,10 +40,10 @@
# That's why we need to use Andoid-21 API version in Qt 5.9.
# NDK
$ndkVersion = "r18b"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
$ndkVersion = "r19c"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3"
$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
@@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
cd $toolsFolder\bin\
$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
iex $command
Invoke-Expression $command
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
iex $command
cmd /c "dir C:\Utils\android"

2
coin/provisioning/common/windows/install-breakpad.ps1
View File

@@ -87,7 +87,7 @@ catch {
git checkout $linux_syscall_support_commit_sha1
}
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
# Write HEAD commit sha to versions txt, so build can be repeated at later date
Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt

20
coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 → coin/provisioning/common/windows/install-gnuwin32.ps1
View File

@@ -1,6 +1,6 @@
#############################################################################
############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -29,6 +29,18 @@
##
## $QT_END_LICENSE$
##
#############################################################################
. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install gnuwin32
$prog = "gnuwin32"
$zipPackage = "$prog.zip"
$temp = "$env:tmp"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
Download $externalUrl $internalUrl "$temp\$zipPackage"
Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
Extract-7Zip "$temp\$zipPackage" C:\Utils
Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

5
coin/provisioning/common/windows/install-mingw.ps1
View File

@@ -37,7 +37,8 @@ function InstallMinGW
{
Param (
[string] $release = $(BadParam("release file name")),
[string] $sha1 = $(BadParam("SHA1 checksum of the file"))
[string] $sha1 = $(BadParam("SHA1 checksum of the file")),
[string] $suffix = ""
)
$arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
@@ -45,7 +46,7 @@ function InstallMinGW
if ($arch -eq "i686") { $win_arch = "Win32" }
elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
$envvar = "MINGW$version"
$envvar = "MINGW$version$suffix"
$envvar = $envvar -replace '["."]'
$targetdir = "C:\$envvar"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"

3
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
View File

@@ -124,7 +124,8 @@ sudo pip install virtualenv wheel
sudo /usr/local/bin/pip3 install wheel
# Install all needed packages in a special wheel cache directory
/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
View File

@@ -175,7 +175,7 @@ waitLoop
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory
pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
View File

@@ -34,6 +34,7 @@
set -ex
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
# build latest qemu to usermode

4
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
View File

@@ -37,7 +37,9 @@
set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."
@@ -96,7 +98,7 @@ rm -rf "$yoctoInstaller"
if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" -a -e "$yoctoLocationMIPS64/$sysrootMIPS64" -a -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then
if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ] && [ -e "$yoctoLocationMIPS64/$sysrootMIPS64" ] && [ -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then
SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7"
SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7"
SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
View File

@@ -35,6 +35,7 @@
set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/openssl_for_android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

3
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
View File

@@ -33,4 +33,7 @@
##
#############################################################################
set -ex
# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/qnx_660.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/qnx_700.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/docker.sh
"$BASEDIR/../common/linux/docker.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
View File

@@ -1,3 +1,4 @@
#!/bin/bash
# shellcheck source=../common/linux/squish-coco.sh
source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/ubuntu-version.sh
"$BASEDIR/../common/linux/ubuntu-version.sh"

3
coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
View File

@@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv
sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
# Install all needed packages in a special wheel cache directory
pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/emsdk.sh
source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
View File

@@ -1 +0,0 @@
../common/macos/sha1sum-compatibility.sh

41
coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh Executable file
View File

@@ -0,0 +1,41 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/macos/sha1sum-compatibility.sh
source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh"

4
coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh Normal file → Executable file
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash
set -ex
$(dirname $0)/../common/unix/disable-ntp_macos.sh
# shellcheck source=../common/unix/disable-ntp_macos.sh
source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"

5
coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
View File

@@ -1,2 +1,5 @@
#!/usr/bin/env bash
$(dirname "$0")/../common/macos/disable_spotlight.sh
set -ex
# shellcheck source=../common/macos/disable_spotlight.sh
source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
View File

@@ -39,7 +39,7 @@
set -ex
# shellcheck source=../common/macos/InstallPKGFromURL
# shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"

4
coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/java.sh
"$BASEDIR/../common/macos/java.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
View File

@@ -35,6 +35,7 @@
set -ex
# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="9.2"

2
coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/cmake.sh
"$BASEDIR/../common/macos/cmake.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/homebrew.sh
"$BASEDIR/../common/macos/homebrew.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/macos/python2.sh
source "${BASH_SOURCE%/*}/../common/macos/python2.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/macos/python3.sh
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
View File

@@ -4,4 +4,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/libiodbc.sh
"$BASEDIR/../common/macos/libiodbc.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/virtualenv.sh
"$BASEDIR/../common/macos/virtualenv.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
View File

@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package
$BASEDIR/../common/unix/libclang.sh
"$BASEDIR/../common/unix/libclang.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
View File

@@ -3,5 +3,5 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/fbx_macos.sh
"$BASEDIR/../common/macos/fbx_macos.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
View File

@@ -2,4 +2,5 @@
set -ex
# shellcheck source=../common/macos/install_openssl.sh
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"

10
coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
View File

@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt")
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
echo "Unlocking $devIDKeychain with password.."
security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
iosPassword=$(<"$targetFolder/ios_password.txt")
iosPassword=$(cat "$targetFolder/ios_password.txt")
iPhoneDeveloper="iosdevelopment.p12"
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
iPhoneDistribution="iosdistribution.p12"
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."

6
coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
View File

@@ -1,4 +1,6 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/unix/squishInstall.sh
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/squishInstall.sh"

19
coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh
View File

@@ -33,18 +33,9 @@
##
#############################################################################
# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
# In order to make all unix provioning scripts run on macOS without special case handling
# a symbolic link is created.
# The shasum tool is a perl script which does some globbing to determine the perl version. The
# symbolic link has to point directly to the binary including the perl version.
# Additionally the CI seems to have multiple parallel perl versions installed which causes
# multiple shasum tools to be present (shasum5.16, shasum5.18).
#
# Currently this is
# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
#!/usr/bin/env bash
[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
# shellcheck disable=SC2012
SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum
set -ex
# shellcheck source=../common/macos/sha1sum-compatibility.sh
source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh"

3
coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env bash
$(dirname $0)/../common/unix/disable-ntp_macos.sh
# shellcheck source=../common/unix/disable-ntp_macos.sh
source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"

5
coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
View File

@@ -1,2 +1,5 @@
#!/usr/bin/env bash
$(dirname "$0")/../common/macos/disable_spotlight.sh
set -ex
# shellcheck source=../common/macos/disable_spotlight.sh
source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
View File

@@ -39,7 +39,7 @@
set -ex
# shellcheck source=../common/macos/InstallPKGFromURL
# shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"

4
coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/java.sh
"$BASEDIR/../common/macos/java.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
View File

@@ -35,6 +35,7 @@
set -ex
# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="10.1"

2
coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/cmake.sh
"$BASEDIR/../common/macos/cmake.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/homebrew.sh
"$BASEDIR/../common/macos/homebrew.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/pip.sh
"$BASEDIR/../common/macos/pip.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/macos/python2.sh
source "${BASH_SOURCE%/*}/../common/macos/python2.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
# shellcheck source=../common/macos/python3.sh
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
View File

@@ -4,4 +4,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/libiodbc.sh
"$BASEDIR/../common/macos/libiodbc.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/virtualenv.sh
"$BASEDIR/../common/macos/virtualenv.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
View File

@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default
$BASEDIR/../common/unix/libclang.sh
"$BASEDIR/../common/unix/libclang.sh"

7
coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
View File

@@ -51,18 +51,13 @@ toolsVersion="r26.1.1"
# toolsFile dertermines tools version
toolsFile="sdk-tools-darwin-4333796.zip"
ndkVersion="r18b"
ndkVersion="r19c"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
# this is compile sdk version
sdkApiLevel="android-28"
toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile"
echo "Unzipping Android NDK to '$targetFolder'"

2
coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
View File

@@ -3,5 +3,5 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/fbx_macos.sh
"$BASEDIR/../common/macos/fbx_macos.sh"

0
coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh Normal file → Executable file
View File

1
coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
View File

@@ -2,4 +2,5 @@
set -ex
# shellcheck source=../common/macos/install_openssl.sh
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"

10
coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
View File

@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null
{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iosdevelopment_2019.p12"
shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iosdistribution_2019.p12"
shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."

6
coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
View File

@@ -1,4 +1,6 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/unix/squishInstall.sh
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/squishInstall.sh"

1
coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 Normal file
View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"

2
coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 Normal file
View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

2
coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1
View File

@@ -1,2 +0,0 @@
Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe
Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe

4
coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
View File

@@ -34,10 +34,10 @@
# Visual Studios are pre-provisioned to tier1 images
# MSVC 2015 Update 3
Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt
Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt
# MSVC 2017
Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt
Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt
# MSVC 2017 Build Tools
Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt

11
coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 Normal file
View File

@@ -0,0 +1,11 @@
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
# This script will install MinGW 7.3.0
$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0"
$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532"
$suffix = "_i686"
InstallMinGW $release $sha1 $suffix

34
coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
View File

@@ -1,34 +0,0 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"

2
coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 Normal file
View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

2
coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 Normal file
View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

2
coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 Normal file
View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

2
coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 Normal file
View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

2
coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 Normal file
View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"