docs: update for new data placement options

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

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index ea79dd03b4eb62ae04834641c0465f78ce5f1d62..7b9cb1ddad95d62713323fc7e3b1149a2fdec8e4 100644 (file)
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,18 +1,5 @@
 @echo off\r
 setlocal enabledelayedexpansion\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
-C:\Cygwin64\bin\bash -l %cd%/_domake.sh %FIO_ARCH% %cd%\r
-\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
@@ -29,6 +16,16 @@ if not defined FIO_VERSION_NUMBERS (
   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
 if defined SIGN_FIO (\r
   signtool sign /n "%SIGNING_CN%" /t http://timestamp.digicert.com ..\..\fio.exe\r
   signtool sign /as /n "%SIGNING_CN%" /tr http://timestamp.digicert.com /td sha256 /fd sha256 ..\..\fio.exe\r
@@ -47,7 +44,10 @@ if exist ..\..\fio.pdb (
 @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
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% WixUI_Minimal_NoEULA.wxs\r
+@if ERRORLEVEL 1 goto end\r
+\r
+"%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj WixUI_Minimal_NoEULA.wixobj -loc WixUI_fio.wxl -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
 :end\r
 \r
 if defined SIGN_FIO (\r