X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Fdobuild.cmd;h=ef12d82d7a36c8eabdf9e8716ce782b3acc84a64;hp=cbbe2cbced20e1cad7464b328394d8388b2b0419;hb=dac7244bf482557c2e46aac1171c3890b3d9316f;hpb=84306c1d9ecd94e93436da62b41ef61ac6e281ac

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index cbbe2cbc..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,9 +26,9 @@ 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
-"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%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