diff options
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
9 files changed, 16 insertions, 10 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 new file mode 100644 index 00000000..3cf989d3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index 72ac1ca7..b2949632 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,8 +36,5 @@ # MSVC 2015 Update 3 Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt -# MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" -# MSVC 2017 Build Tools -Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 new file mode 100644 index 00000000..82b91257 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 index 71abc7e1..09c5b21c 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -50,20 +50,20 @@ Run-Conan-Install ` Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86_64 ` + -BuildinfoDir Mingw-x86_64 ` -Arch x86_64 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "seh" ` -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 new file mode 100644 index 00000000..a2ecfba2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 new file mode 100755 index 00000000..22d19322 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-mcuxpresso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 new file mode 100644 index 00000000..25c2bb42 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-stm32cubeprogrammer.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 new file mode 100644 index 00000000..f1d5acc3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 491c9375..eaafc008 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -2,7 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake |