X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Fdobuild.cmd;h=166578acdd0b3eb03c6bfa91a0d3483422dcb881;hp=fa855a2ebb022ca84608992ca15f129ff47664fb;hb=9f873e2e652a1450bd54ff48059ab993398e35a6;hpb=034ca7e4b63ff63dee43770c20d0860903705cf3

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
old mode 100755
new mode 100644
index fa855a2e..166578ac
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,4 +1,24 @@
-"%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.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
+)
+
+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% 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:61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
+:end
\ No newline at end of file