mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 13:32:42 +08:00
Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017 to circumvent the issue that vcpkg is building libraries with the latest compiler it finds (MSVC 2019), but Qt is building with 2017. Conflicts: coin/platform_configs/default.yaml coin/platform_configs/qt5.yaml coin/platform_configs/qtsaferenderer.yaml Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
This commit is contained in:
Liang Qi
@@ -13,8 +13,8 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12'
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-14'
|
||||
Compiler: 'MSVC2017'
|
||||
Template: 'qtci-windows-10-x86_64-15'
|
||||
Compiler: 'MSVC2019'
|
||||
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-7.6-x86_64'
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
# List about manual pre-installations to Tier1 image:
|
||||
|
||||
Vmware tools: installed
|
||||
Resolution: 1280 X 800
|
||||
Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin)
|
||||
Remote Desktop Connection: enabled
|
||||
Timezone: set to UTC
|
||||
Administrator tools - services - Windows search: stop & disable
|
||||
Power settings screen & slee: never
|
||||
Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
#############################################################################
|
||||
##
|
||||
## 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.
|
||||
##
|
||||
## $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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
|
||||
# thus needing its own version.
|
||||
Write-Host "Disabling defragmentation"
|
||||
$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption
|
||||
if ($version -like '*Windows 7*'){
|
||||
$pi = New-Object System.Diagnostics.ProcessStartInfo
|
||||
$pi.FileName = "C:\Windows\System32\schtasks.exe"
|
||||
$pi.RedirectStandardError = $true
|
||||
$pi.UseShellExecute = $false
|
||||
$pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F"
|
||||
$prog = New-Object System.Diagnostics.Process
|
||||
$prog.StartInfo = $pi
|
||||
$prog.Start() | Out-Null
|
||||
$err = $prog.StandardError.ReadToEnd()
|
||||
$prog.WaitForExit()
|
||||
if ($prog.ExitCode -eq 0){
|
||||
Write-Host "Scheduled defragmentation removed"
|
||||
} else {
|
||||
if ($err -like '*cannot find the file*'){
|
||||
Write-Host "No scheduled defragmentation task found"
|
||||
exit 0
|
||||
} else {
|
||||
Write-Host "Error while deleting scheduled defragmentation task: $err"
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
try {
|
||||
$state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State
|
||||
Write-Host "Scheduled defragmentation task found in state: $state"
|
||||
}
|
||||
catch {
|
||||
Write-Host "No scheduled defragmentation task found"
|
||||
exit 0
|
||||
}
|
||||
Write-Host "Unregistering scheduled defragmentation task"
|
||||
Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag
|
||||
Write-Host "Scheduled Defragmentation task was cancelled"
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# Disable the NTP from syncing
|
||||
Run-Executable "w32tm.exe" "/config /syncfromflags:NO"
|
||||
@@ -0,0 +1,59 @@
|
||||
###########################################################################
|
||||
##
|
||||
## 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.
|
||||
##
|
||||
## $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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Turning off win defender.
|
||||
#
|
||||
# If disabled manually, windows will automatically enable it after
|
||||
# some period of time. Disabling it speeds up the builds.
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
|
||||
|
||||
# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
|
||||
DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
|
||||
|
||||
# 'Windows Defender Cleanup' - "Periodic cleanup task."
|
||||
DisableSchedulerTask "Windows Defender\Windows Defender Cleanup"
|
||||
|
||||
# 'Windows Defender Scheduled Scan' - "Periodic scan task."
|
||||
DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan"
|
||||
|
||||
# 'Windows Defender Verification' - "Periodic verification task."
|
||||
DisableSchedulerTask "Windows Defender\Windows Defender Verification"
|
||||
|
||||
# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports."
|
||||
DisableSchedulerTask "Windows Error Reporting\QueueReporting"
|
||||
|
||||
# Disable WindowsUpdate from Task Scheduler
|
||||
DisableSchedulerTask "WindowsUpdate\Scheduled Start"
|
||||
@@ -0,0 +1,54 @@
|
||||
############################################################################
|
||||
##
|
||||
## 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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script disables the automatic Windows updates
|
||||
|
||||
$service = get-service wuauserv
|
||||
if (-not $service) {
|
||||
Write-Host "Windows Update service not found."
|
||||
exit 0
|
||||
}
|
||||
|
||||
if ($service.Status -eq "Stopped") {
|
||||
Write-Host "Windows Update service already stopped."
|
||||
} else {
|
||||
Write-Host "Stopping Windows Update service."
|
||||
Stop-Service -Name "wuauserv" -Force
|
||||
}
|
||||
|
||||
$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
|
||||
if ($startup -ne "Disabled") {
|
||||
set-service wuauserv -startup disabled
|
||||
} else {
|
||||
Write-Host "Windows Update service startup already disabled."
|
||||
}
|
||||
@@ -34,7 +34,8 @@
|
||||
# Visual Studio $version version $version_number was installed manually using $installer.
|
||||
|
||||
$version = "2017"
|
||||
$version_number = "15.8.5"
|
||||
# Current version was manually upgraded from the installer
|
||||
$version_number = "15.9.16"
|
||||
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe"
|
||||
|
||||
# Following components were selected from installer:
|
||||
|
||||
91
coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1
Normal file
91
coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1
Normal file
@@ -0,0 +1,91 @@
|
||||
############################################################################
|
||||
##
|
||||
## 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.
|
||||
##
|
||||
## $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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# Visual Studio $version version $version_number was installed manually using $installer.
|
||||
|
||||
$version = "2019"
|
||||
# Current version was manually upgraded from the installer
|
||||
$version_number = "16.3.2"
|
||||
$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
|
||||
|
||||
.NET Framework 4.5 targeting pack
|
||||
.NET Framework 4.5.1 targeting pack
|
||||
.NET Framework 4.5.2 targeting pack
|
||||
.NET Framework 4.6.1 SDK
|
||||
.NET Framework 4.6.1 targeting pack
|
||||
.NET Framework 4.6.2 SDK
|
||||
.NET Framework 4.6.2 targeting pack
|
||||
.NET Framework 4.7.2 SDK
|
||||
.NET Framework 4.7.2 targeting pack
|
||||
.NET Native
|
||||
.NET Portable Library targeting pack
|
||||
CLR data typer for SQL Sever
|
||||
Connectivity and publishing tools
|
||||
Data sources for SQL Server support
|
||||
SQL ADAL runtime
|
||||
SQL Server Command Linne Utilities
|
||||
SQL Server Data Tools
|
||||
SQL Server Express 2016 LocalDB
|
||||
SQL Server ODBC Driver
|
||||
ClickOnce Publishing
|
||||
Developer Analytics tools
|
||||
NuGet package manager
|
||||
Text Template Transformation
|
||||
C# and Visual Basic Roslyn compilers
|
||||
C++ 2019 Redistributable Update
|
||||
C++ Cmake tools for Windows
|
||||
C++/CLI support for v142 build tools
|
||||
MSBuild
|
||||
MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
|
||||
MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
|
||||
MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
|
||||
.NET profiling tools
|
||||
C++ profiling tools
|
||||
JavaScript diagnostics
|
||||
Just-In-Time debugger
|
||||
C# and Visual Basic
|
||||
C++ core features
|
||||
JavaSript and TypeScript language support
|
||||
Razor Language Services
|
||||
Graphics debugger and GPU profiler for DirectX
|
||||
Image and 3D model editors
|
||||
C++ ATL for v142 build tools (x86 & x64)
|
||||
TypeScript 3.3 SDK
|
||||
Windows 10 SDK (10.0.16299.0)
|
||||
Windows 10 SDK (10.0.17134.0)
|
||||
Windows 10 SDK (10.0.17763.0)
|
||||
Windows 10 SDK (10.0.18362.0)
|
||||
|
||||
# NOTE! Work loads were added during installation!
|
||||
|
||||
echo "Visual Studio = $version version version_number" >> ~\versions.txt
|
||||
@@ -33,21 +33,40 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
set -e
|
||||
|
||||
|
||||
. $(dirname "$0")/../../common/unix/DownloadURL.sh
|
||||
|
||||
|
||||
localRepo=http://ci-files01-hki.intra.qt.io/input/docker
|
||||
upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64
|
||||
|
||||
echo '
|
||||
f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb
|
||||
ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb
|
||||
09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb
|
||||
' \
|
||||
| xargs -n2 | while read sha f
|
||||
do
|
||||
DownloadURL $localRepo/$f $upstreamRepo/$f $sha
|
||||
done
|
||||
|
||||
sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
|
||||
rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
|
||||
|
||||
# Download and install the docker engine.
|
||||
sudo apt-get install curl -y
|
||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
|
||||
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
|
||||
sudo apt-get update
|
||||
sudo apt-get install docker-ce -y
|
||||
sudo usermod -a -G docker $USER
|
||||
sudo docker --version
|
||||
|
||||
# Download and install the docker-compose extension.
|
||||
sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
|
||||
sudo chmod +x /usr/local/bin/docker-compose
|
||||
# Download and install the docker-compose extension from https://github.com/docker/compose/releases
|
||||
f=docker-compose-$(uname -s)-$(uname -m)
|
||||
DownloadURL \
|
||||
$localRepo/$f \
|
||||
https://github.com/docker/compose/releases/download/1.24.1/$f \
|
||||
cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
|
||||
sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
|
||||
sudo docker-compose --version
|
||||
rm ./docker-compose*
|
||||
|
||||
# Install Avahi to discover Docker containers in the test network
|
||||
sudo apt-get install avahi-daemon -y
|
||||
|
||||
@@ -89,7 +89,14 @@ DownloadURL () {
|
||||
url=$1
|
||||
url2=$2
|
||||
expectedHash=$3
|
||||
targetFile=$4
|
||||
# Optional argument $4: destination filename
|
||||
if [ x"$4" = x ]
|
||||
then
|
||||
# defaults to the last component of $url
|
||||
targetFile=$(echo $url | sed 's|^.*/||')
|
||||
else
|
||||
targetFile=$4
|
||||
fi
|
||||
|
||||
if VerifyHash "$targetFile" "$expectedHash"
|
||||
then
|
||||
|
||||
38
coin/provisioning/common/unix/python_modules.sh
Executable file
38
coin/provisioning/common/unix/python_modules.sh
Executable file
@@ -0,0 +1,38 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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.
|
||||
##
|
||||
## $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$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# needed by packaging scripts
|
||||
sudo pip3 install bs4
|
||||
sudo pip3 install sh
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-openssl.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
|
||||
@@ -68,8 +68,7 @@ try {
|
||||
Verify-Checksum $javaPackage $sha1
|
||||
|
||||
Run-Executable "$javaPackage" "/s SPONSORS=0"
|
||||
Write-Host "Cleaning $javaPackage.."
|
||||
Remove-Item -Recurse -Force -Path "$javaPackage"
|
||||
Remove "$javaPackage"
|
||||
|
||||
Write-Host "Remove Java update from startup"
|
||||
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f
|
||||
|
||||
@@ -49,7 +49,7 @@ if (Is64BitWinHost) {
|
||||
|
||||
$filename = "telegraf-" + $version + "_windows_" + $arch + ".zip"
|
||||
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename
|
||||
$url_cache = "http://ci-files01-hki.intra.qt.io/input/telegraf/" + $filename
|
||||
$url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename
|
||||
$tempfile = "C:\Windows\Temp\" + $filename
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## 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.
|
||||
@@ -35,5 +35,5 @@
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/linux/openssl_for_android_linux.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"
|
||||
# shellcheck source=../common/unix/python-modules.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh"
|
||||
@@ -46,6 +46,10 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
|
||||
done
|
||||
|
||||
function set_internal_repo {
|
||||
|
||||
# Stop fetching the dep-11 metadata, since our mirrors do not handle them well
|
||||
sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
|
||||
|
||||
sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse
|
||||
|
||||
7
coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh
Executable file
7
coin/provisioning/qtci-macos-10.13-x86_64/90-python-modules.sh
Executable file
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/python_modules.sh"
|
||||
|
||||
@@ -50,4 +50,4 @@ set -ex
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_10.2.1_update.tar.gz 10.2.1
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.2.1.tar.gz 11.2.1
|
||||
|
||||
@@ -38,10 +38,10 @@ set -ex
|
||||
# shellcheck source=../common/macos/install-commandlinetools.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
|
||||
|
||||
version="10.2.1"
|
||||
packageName="Command_Line_Tools_macOS_10.14_for_Xcode_$version.dmg"
|
||||
version="11.2"
|
||||
packageName="Command_Line_Tools_for_Xcode_$version.dmg"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName"
|
||||
sha1="18fea89bb743107aee372a212be608d6e35fdecf"
|
||||
sha1="04f288e0dce69ddbce52ea707f978afcbf6be107"
|
||||
|
||||
InstallCommandLineTools $url $url $sha1 $packageName $version
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ toolsVersion="r26.1.1"
|
||||
# toolsFile dertermines tools version
|
||||
toolsFile="sdk-tools-darwin-4333796.zip"
|
||||
|
||||
ndkVersion="r19c"
|
||||
ndkVersion="r20"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
# this is compile sdk version
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-defragment.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
|
||||
@@ -0,0 +1,3 @@
|
||||
# Needed by packaging scripts
|
||||
C:\Python36\Scripts\pip3 install bs4
|
||||
C:\Python36\Scripts\pip3 install sh
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-windows-file-protector.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-schedule-tasks.ps1"
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1"
|
||||
@@ -1,2 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\disable-windows-update-medic.ps1"
|
||||
|
||||
@@ -43,10 +43,10 @@
|
||||
# nmake install
|
||||
|
||||
|
||||
$version = "1.1.1b"
|
||||
$version = "1.1.1d"
|
||||
$zip = Get-DownloadLocation ("openssl-$version.7z")
|
||||
$sha1 = "7afba53ab984cecb54a1915c135cbb2a20c6b576"
|
||||
$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86.7z"
|
||||
$sha1 = "2bf9379c4cea81858c4288cf06cc3444996bcad5"
|
||||
$url = "http://ci-files01-hki.intra.qt.io/input/openssl/openssl_${version}_prebuild_x86_windows7_msvc2010.zip"
|
||||
|
||||
Download $url $url $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
@@ -55,6 +55,8 @@ $installFolder = "C:\openssl"
|
||||
Extract-7Zip $zip "C:\"
|
||||
Remove-Item -Path $zip
|
||||
|
||||
Move-Item -Path C:\openssl_${version}_prebuild_x86_windows7_msvc2010 -Destination C:\openssl
|
||||
|
||||
Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\openssl.cnf"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib"
|
||||
|
||||
Reference in New Issue
Block a user