# HG changeset patch
# User Chris Cannam
# Date 1585575394 -3600
# Node ID 692cd6d3144d9118674b74a3e967909cbf8d12a0
# Parent  eb3ee81babf85436bb0ed559e90b9f888aa264b2
Use most recent redist dir, rather than hardcoding one

diff -r eb3ee81babf8 -r 692cd6d3144d deploy/win64/generate-wxs.ps1
--- a/deploy/win64/generate-wxs.ps1	Mon Mar 30 12:32:26 2020 +0100
+++ b/deploy/win64/generate-wxs.ps1	Mon Mar 30 14:36:34 2020 +0100
@@ -2,13 +2,23 @@
 Set-StrictMode -Version 2.0
 $ErrorActionPreference = "Stop"
 
-$redist_ver = "14.24.28127"
+$redist_parent_dir = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\"
+
+$redists = (Get-ChildItem -Path $redist_parent_dir -Name -Include 14.* -Attributes Directory)
+
+if (!$redists) {
+    echo "ERROR: No 14.x redistributable directories found under $redist_parent_dir"
+    exit 1
+}
+
+$redist_ver = $redists[-1]
+
 $version = (Get-Content version.h) -replace '#define SV_VERSION ','' -replace '"',''
 $wxs = "deploy\win64\sonic-visualiser.wxs"
 
 $in = "$wxs.in"
 
-$redist_dir="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\$redist_ver\x64\Microsoft.VC142.CRT"
+$redist_dir="$redist_parent_dir\$redist_ver\x64\Microsoft.VC142.CRT"
 
 echo "Generating $wxs..."
 echo " ...for SV version $version"