windows: minor windows installer improvements

[fio.git] / os / windows / dobuild.cmd

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
old mode 100755 (executable)
new mode 100644 (file)
index 05f85af..ef12d82
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,4 +1,34 @@
-"%WIX%\bin\candle" cygwin.wxs\r
-"%WIX%\bin\candle" install.wxs\r
-"%WIX%\bin\candle" examples.wxs\r
-"%WIX%\bin\light" install.wixobj cygwin.wixobj examples.wixobj -ext WixUIExtension -out fio-1.44.msi
\ No newline at end of file
+@echo off\r
+setlocal enabledelayedexpansion\r
+set /a counter=1\r
+for /f "tokens=3" %%i in (..\..\FIO-VERSION-FILE) do (\r
+ if "!counter!"=="1" set FIO_VERSION=%%i\r
+ set /a counter+=1\r
+)\r
+\r
+for /f "tokens=2 delims=-" %%i in ("%FIO_VERSION%") do (\r
+ set FIO_VERSION_NUMBERS=%%i\r
+)\r
+\r
+if not defined FIO_VERSION_NUMBERS (\r
+  echo Could not find version numbers in the string '%FIO_VERSION%'\r
+  echo Expected version to follow format 'fio-^([0-9]+.[0-9.]+^)'\r
+  goto end\r
+)\r
+\r
+if "%1"=="x86" set FIO_ARCH=x86\r
+if "%1"=="x64" set FIO_ARCH=x64\r
+\r
+if not defined FIO_ARCH (\r
+  echo Error: must specify the architecture.\r
+  echo Usage: dobuild x86\r
+  echo Usage: dobuild x64\r
+  goto end\r
+)\r
+\r
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% -dFioVersionNumbers="%FIO_VERSION_NUMBERS%" install.wxs\r
+@if ERRORLEVEL 1 goto end\r
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs\r
+@if ERRORLEVEL 1 goto end\r
+"%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
+:end\r