lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 03:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump vcpkg to a new snapshot

Browse Source 
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 <liang.qi@qt.io>
This commit is contained in:
Simon Hausmann
2019-10-09 16:32:59 +02:00
committed by Liang Qi
parent 8eab11f696
commit 1aa25c1084
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coin/provisioning/common/linux/vcpkg.sh
View File

@@ -43,8 +43,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build. # Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build.
source ~/.bashrc source ~/.bashrc
version="qt-snapshot-2019-10-09" source "${BASH_SOURCE%/*}/../shared/vcpkg_version.txt"
officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$version"
officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$vcpkg_version"
targetFile="vcpkg.tar.gz" targetFile="vcpkg.tar.gz"
targetFolder="$HOME/vcpkg" targetFolder="$HOME/vcpkg"
@@ -69,4 +70,4 @@ cd $targetFolder
rm -rf packages buildtrees downloads rm -rf packages buildtrees downloads
echo "VCPKG = $version" >> ~/versions.txt echo "VCPKG = $vcpkg_version" >> ~/versions.txt

1
coin/provisioning/common/shared/vcpkg_version.txt Normal file
View File

@@ -0,0 +1 @@
vcpkg_version=qt-snapshot-2019-10-09

9
coin/provisioning/common/windows/install-vcpkg.ps1
View File

@@ -36,15 +36,18 @@
Write-Host "Installing vcpkg" Write-Host "Installing vcpkg"
$version = "qt-snapshot-2019-06-20" $n = Get-Content "$PSScriptRoot\..\shared\vcpkg_version.txt"
$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$version" $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" $zip = "C:\Utils\vcpkg.zip"
Download "$officialUrl" "" "$zip" Download "$officialUrl" "" "$zip"
Extract-7Zip "$zip" c:\utils Extract-7Zip "$zip" c:\utils
Remove-Item $zip Remove-Item $zip
$installationFolder = "c:\utils\vcpkg-$version" $installationFolder = "c:\utils\vcpkg-$vcpkg_version"
cd $installationFolder cd $installationFolder