changeset 442:49b88195961c

Windows deployment fixes
author Chris Cannam
date Fri, 26 Jun 2020 14:52:43 +0100
parents 7180bdbcf7cb
children db3c5c831ca0
files deploy/win64/build-and-package.bat deploy/win64/generate-wxs.ps1
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/win64/build-and-package.bat	Fri Jun 26 13:52:26 2020 +0100
+++ b/deploy/win64/build-and-package.bat	Fri Jun 26 14:52:43 2020 +0100
@@ -16,7 +16,7 @@
 if errorlevel 1 exit /b %errorlevel%
 
 set ORIGINALPATH=%PATH%
-set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
+set PATH=C:\Program Files (x86)\Windows Kits\10\bin\x64;%PATH%
 set NAME=Open Source Developer, Christopher Cannam
 
 set ARG=%1
--- a/deploy/win64/generate-wxs.ps1	Fri Jun 26 13:52:26 2020 +0100
+++ b/deploy/win64/generate-wxs.ps1	Fri Jun 26 14:52:43 2020 +0100
@@ -13,7 +13,7 @@
 
 $redist_ver = $redists[-1]
 
-$version = (Get-Content version.h) -replace '#define VECT_VERSION ','' -replace '"',''
+$version = (Get-Content version.h) -replace '#define VECT_VERSION ','' -replace '"','' -replace '-pre.*',''
 $wxs = "deploy\win64\sonic-lineup.wxs"
 
 $in = "$wxs.in"