X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Fdobuild.cmd;h=ef12d82d7a36c8eabdf9e8716ce782b3acc84a64;hp=05f85af2a54026e0152486e8dec928a1d9aaba3a;hb=3a62cbace68d4c55a43d47dc9f4ef052a63bc0af;hpb=d9a7ba88af39b1047c9f8c077280932cd12cb58e

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
old mode 100755
new mode 100644
index 05f85af2..ef12d82d
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,4 +1,34 @@
-"%WIX%\bin\candle" cygwin.wxs
-"%WIX%\bin\candle" install.wxs
-"%WIX%\bin\candle" examples.wxs
-"%WIX%\bin\light" install.wixobj cygwin.wixobj examples.wixobj -ext WixUIExtension -out fio-1.44.msi
\ No newline at end of file
+@echo off
+setlocal enabledelayedexpansion
+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
+)
+
+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
+
+if not defined FIO_ARCH (
+  echo Error: must specify the architecture.
+  echo Usage: dobuild x86
+  echo Usage: dobuild x64
+  goto end
+)
+
+"%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 -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
+:end