From 4c655a140b55502179e69930c019bbb4abb3271a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 1 Apr 2019 08:53:27 +0200 Subject: Provisioning: install latest cmake - 3.14.1 on Windows Change-Id: I461589be02c26e048d5975d59600376022d728fd Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/cmake.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ec84d706..1c19c980 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -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. @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.6" -$version = "3.6.2" +$majorminorversion = "3.14" +$version = "3.14.1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" +Verify-Checksum $zip "C1626FD07B09C76736F5AC9DA7B4374919EB9964" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 21604cf7da1e9645cec1b944d413a27b3e420193 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 2 Apr 2019 10:48:34 +0200 Subject: Provisioning: install vcpkg and some packages on Windows 10 Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/install-vcpkg.ps1 | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 coin/provisioning/common/windows/install-vcpkg.ps1 (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 new file mode 100644 index 00000000..673274da --- /dev/null +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -0,0 +1,65 @@ +############################################################################# +## +## 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$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install vcpkg + +$version = "08ad9d88ecabf9f8111bd4df0ca74723550503cd" +$sha1 = "43b471aebc2f46bee00c86710d0311ef6fb7bb19" +$officialUrl = "https://codeload.github.com/liangqi/vcpkg/zip/qt" +$cachedUrl = "http://ci-files01-hki.ci.local/input/vcpkg/vcpkg-$version.zip" +$zip = "C:\Utils\vcpkg-$version.zip" +$installationFolder = "C:\Utils\vcpkg" + +Write-Host "Installing vcpkg" +Download "$officialUrl" "$cachedUrl" "$zip" +Verify-Checksum "$zip" "$sha1" +Extract-7Zip "$zip" C:\Utils +cmd /c mklink /d "$installationFolder" "C:\Utils\vcpkg-qt" +cd "C:\Utils\vcpkg-qt\" +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && bootstrap-vcpkg.bat" + +if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ + Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" + exit 1 +} + +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "x64-windows" +Set-EnvironmentVariable VCPKG_CMAKE_TOOLCHAIN_FILE "$installationFolder\scripts\buildsystems\vcpkg.cmake" + +# pcre2-16.dll was used when generating qvulkanfunctions.h +Add-Path "C:\Utils\vcpkg\installed\x64-windows\bin" + +cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && $installationFolder\vcpkg.exe --triplet x64-windows install zlib pcre2 double-conversion harfbuzz openssl" + +Remove-Item "$zip" -- cgit v1.2.3 From a6d159c9e714a6b743ae13b96e2ebcd241c50a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 09:48:28 +0200 Subject: Bump cmake to 3.15-rc1 on Windows Same as for the recent Linux and macOS change. Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32 Reviewed-by: Simon Hausmann --- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 1c19c980..cc7015a8 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.14" -$version = "3.14.1" +$majorminorversion = "3.15" +$version = "3.15.0-rc1" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "C1626FD07B09C76736F5AC9DA7B4374919EB9964" +Verify-Checksum $zip "F196900509D7CA1947F04084DB8BEAA1DB1F7B59" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 2e5b5cc075bb03e1f28dcc02b29296ad50c3e1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 6 Jun 2019 15:50:22 +0200 Subject: Update cmake sha1 for Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It amends a6d159c9e714a6b743ae13b96e2ebcd241c50a01. Seems that I computed sha1 for a wrong file. Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/windows/cmake.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index cc7015a8..3367440b 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "F196900509D7CA1947F04084DB8BEAA1DB1F7B59" +Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 9d7437859b2297481db267a5e307e0a3a362c9dd Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Jun 2019 14:56:52 +0200 Subject: Update vcpkg installation Use the latest snapshot, fetch the package set from the repo itself and set the VCPKG_ROOT environment variable as that's the vcpkg documented interface. The qt specific triplet defaults to static linkage, which allows removing the %PATH% handling and resembles the same setup as in Qt 5 where we linked the 3rd-party code statically into qt. Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7 Reviewed-by: Liang Qi --- coin/provisioning/common/windows/install-vcpkg.ps1 | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 673274da..36b0d826 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -34,32 +34,33 @@ # This script will install vcpkg -$version = "08ad9d88ecabf9f8111bd4df0ca74723550503cd" -$sha1 = "43b471aebc2f46bee00c86710d0311ef6fb7bb19" -$officialUrl = "https://codeload.github.com/liangqi/vcpkg/zip/qt" -$cachedUrl = "http://ci-files01-hki.ci.local/input/vcpkg/vcpkg-$version.zip" -$zip = "C:\Utils\vcpkg-$version.zip" -$installationFolder = "C:\Utils\vcpkg" - Write-Host "Installing vcpkg" -Download "$officialUrl" "$cachedUrl" "$zip" -Verify-Checksum "$zip" "$sha1" -Extract-7Zip "$zip" C:\Utils -cmd /c mklink /d "$installationFolder" "C:\Utils\vcpkg-qt" -cd "C:\Utils\vcpkg-qt\" -cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && bootstrap-vcpkg.bat" + +$version = "qt-snapshot-2019-06-20" +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$zip = "C:\Utils\vcpkg.zip" + +Download "$officialUrl" "" "$zip" +Extract-7Zip "$zip" c:\utils +Remove-Item $zip + +$installationFolder = "c:\utils\vcpkg-$version" + +cd $installationFolder + +cmd /c bootstrap-vcpkg.bat if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" exit 1 } -Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "x64-windows" -Set-EnvironmentVariable VCPKG_CMAKE_TOOLCHAIN_FILE "$installationFolder\scripts\buildsystems\vcpkg.cmake" - -# pcre2-16.dll was used when generating qvulkanfunctions.h -Add-Path "C:\Utils\vcpkg\installed\x64-windows\bin" +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "qt-x64-windows-static" +Set-EnvironmentVariable VCPKG_ROOT "$installationFolder" -cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && $installationFolder\vcpkg.exe --triplet x64-windows install zlib pcre2 double-conversion harfbuzz openssl" +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x64-windows-static @qt-packages-windows.txt +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x86-windows-static @qt-packages-windows.txt -Remove-Item "$zip" +Remove-Item -Recurse -Force packages +Remove-Item -Recurse -Force buildtrees +Remove-Item -Recurse -Force downloads -- cgit v1.2.3 From 8eab11f6961f146fa9a4bc9c523504694d880c02 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Thu, 17 Oct 2019 11:28:24 +0200 Subject: Update CMake to version 3.15.5 Update required as there's a bug with setting the CXX_STANDARD on android. Updating to this version fixes the issue. Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649 Reviewed-by: Liang Qi --- coin/provisioning/common/windows/cmake.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 3367440b..256d2439 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" $majorminorversion = "3.15" -$version = "3.15.0-rc1" +$version = "3.15.5" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "3739F2FF0CAD6EC15475A32D419EBEB0864C4800" +Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3 From 1aa25c10840f702fd9155b3bf394c89817a8e2b9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 9 Oct 2019 16:32:59 +0200 Subject: Bump vcpkg to a new snapshot Some patches were upstreamed and this beings the version in line with what we need for Android. This patch also centralizes the version into a shared file, for future use. Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Liang Qi --- coin/provisioning/common/windows/install-vcpkg.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 36b0d826..52f1518f 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -36,15 +36,18 @@ Write-Host "Installing vcpkg" -$version = "qt-snapshot-2019-06-20" -$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" +$n = Get-Content "$PSScriptRoot\..\shared\vcpkg_version.txt" +$n = $n.Split('=') +New-Variable -Name $n[0] -Value $n[1] + +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$vcpkg_version" $zip = "C:\Utils\vcpkg.zip" Download "$officialUrl" "" "$zip" Extract-7Zip "$zip" c:\utils Remove-Item $zip -$installationFolder = "c:\utils\vcpkg-$version" +$installationFolder = "c:\utils\vcpkg-$vcpkg_version" cd $installationFolder -- cgit v1.2.3 From 95c7b90309de24badd51aa8017e8145c7f2e655e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 22 Nov 2019 20:10:43 +0100 Subject: Update CMake to version 3.16.0-rc4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94 Reviewed-by: Qt CMake Build Bot Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/cmake.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/provisioning/common/windows') diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 256d2439..bbec4b4f 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.15" -$version = "3.15.5" +$majorminorversion = "3.16" +$version = "3.16.0-rc4" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" +Verify-Checksum $zip "989e5c6384870a77425f2ddbbf305bd3f6dad426" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" -- cgit v1.2.3