From: Sitsofe Wheeler Date: Wed, 21 Feb 2018 14:41:14 +0000 (+0000) Subject: windows: minor windows installer improvements X-Git-Tag: fio-3.6~63^2~1 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=3a62cbace68d4c55a43d47dc9f4ef052a63bc0af windows: minor windows installer improvements - Stop hard coding fio version in the Windows installer build file and try and use the generated version instead - Make installer build use sys.BUILDARCH rather than env.FIO_ARCH - Change IO to I/O in descriptions to match other packages Signed-off-by: Sitsofe Wheeler --- diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd index fd54a9c6..ef12d82d 100644 --- a/os/windows/dobuild.cmd +++ b/os/windows/dobuild.cmd @@ -6,6 +6,16 @@ for /f "tokens=3" %%i in (..\..\FIO-VERSION-FILE) do ( set /a counter+=1 ) +for /f "tokens=2 delims=-" %%i in ("%FIO_VERSION%") do ( + set FIO_VERSION_NUMBERS=%%i +) + +if not defined FIO_VERSION_NUMBERS ( + echo Could not find version numbers in the string '%FIO_VERSION%' + echo Expected version to follow format 'fio-^([0-9]+.[0-9.]+^)' + goto end +) + if "%1"=="x86" set FIO_ARCH=x86 if "%1"=="x64" set FIO_ARCH=x64 @@ -16,7 +26,7 @@ if not defined FIO_ARCH ( goto end ) -"%WIX%bin\candle" -nologo -arch %FIO_ARCH% install.wxs +"%WIX%bin\candle" -nologo -arch %FIO_ARCH% -dFioVersionNumbers="%FIO_VERSION_NUMBERS%" install.wxs @if ERRORLEVEL 1 goto end "%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs @if ERRORLEVEL 1 goto end diff --git a/os/windows/eula.rtf b/os/windows/eula.rtf index 1c929321..b2798bb5 100755 Binary files a/os/windows/eula.rtf and b/os/windows/eula.rtf differ diff --git a/os/windows/install.wxs b/os/windows/install.wxs index 577af553..73b28103 100755 --- a/os/windows/install.wxs +++ b/os/windows/install.wxs @@ -1,7 +1,7 @@ - + @@ -10,9 +10,9 @@ + UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="$(var.FioVersionNumbers)"> @@ -48,7 +48,7 @@ - +