X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Fdobuild.cmd;h=fd54a9c670888bdf7e0f123cd55c7b6eb151c8ef;hp=43e5db4dad43f581e21a7da3483192d4124d0e96;hb=a2b3cb65a9d3dfafbe52da2916c9524a71ad0ac7;hpb=93bcfd20e37cef8cec350fe06d3a086724c9f257 diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd index 43e5db4d..fd54a9c6 100644 --- a/os/windows/dobuild.cmd +++ b/os/windows/dobuild.cmd @@ -1,11 +1,9 @@ @echo off setlocal enabledelayedexpansion -set /a counter=4 -for /f "tokens=3" %%i in (..\..\fio_version.h) do ( - if "!counter!"=="4" set FIO_MAJOR=%%i - if "!counter!"=="5" set FIO_MINOR=%%i - if "!counter!"=="6" set FIO_PATCH=%%i -set /a counter+=1 +set /a counter=1 +for /f "tokens=3" %%i in (..\..\FIO-VERSION-FILE) do ( + if "!counter!"=="1" set FIO_VERSION=%%i + set /a counter+=1 ) if "%1"=="x86" set FIO_ARCH=x86 @@ -22,5 +20,5 @@ if not defined FIO_ARCH ( @if ERRORLEVEL 1 goto end "%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs @if ERRORLEVEL 1 goto end -"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out fio-%FIO_MAJOR%.%FIO_MINOR%.%FIO_PATCH%-%FIO_ARCH%.msi -:end \ No newline at end of file +"%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi +:end