summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-09 16:32:59 +0200
committerLiang Qi <liang.qi@qt.io>2019-11-13 09:57:53 +0000
commit1aa25c10840f702fd9155b3bf394c89817a8e2b9 (patch)
tree45a87c1ac8ddd72db97066ed8225f6cabc3e9ad8 /coin/provisioning/common
parent8eab11f6961f146fa9a4bc9c523504694d880c02 (diff)
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 <liang.qi@qt.io>
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-xcoin/provisioning/common/linux/vcpkg.sh7
-rw-r--r--coin/provisioning/common/shared/vcpkg_version.txt1
-rw-r--r--coin/provisioning/common/windows/install-vcpkg.ps19
3 files changed, 11 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh
index a25e91a1..35f2ece8 100755
--- a/coin/provisioning/common/linux/vcpkg.sh
+++ b/coin/provisioning/common/linux/vcpkg.sh
@@ -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.
source ~/.bashrc
-version="qt-snapshot-2019-10-09"
-officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$version"
+source "${BASH_SOURCE%/*}/../shared/vcpkg_version.txt"
+
+officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$vcpkg_version"
targetFile="vcpkg.tar.gz"
targetFolder="$HOME/vcpkg"
@@ -69,4 +70,4 @@ cd $targetFolder
rm -rf packages buildtrees downloads
-echo "VCPKG = $version" >> ~/versions.txt
+echo "VCPKG = $vcpkg_version" >> ~/versions.txt
diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt
new file mode 100644
index 00000000..993101eb
--- /dev/null
+++ b/coin/provisioning/common/shared/vcpkg_version.txt
@@ -0,0 +1 @@
+vcpkg_version=qt-snapshot-2019-10-09
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