Windows: update dobuild.cmd to run the configure/make

Add a new shell script, _domake.sh which runs under Cygwin. This
is invoked via dobuild.cmd to run the configure and make steps of
the build. In this way, a single command, run from a Developer Command
Prompt, can be used to go from a clean workspace to a final installer
binary.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 13 insertions, 10 deletions

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index 08df3e87..ea79dd03 100644
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,5 +1,18 @@
 @echo off

 setlocal enabledelayedexpansion

+

+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

+)

+

+C:\Cygwin64\bin\bash -l %cd%/_domake.sh %FIO_ARCH% %cd%

+

 set /a counter=1

 for /f "tokens=3" %%i in (..\..\FIO-VERSION-FILE) do (

  if "!counter!"=="1" set FIO_VERSION=%%i

@@ -16,16 +29,6 @@ if not defined FIO_VERSION_NUMBERS (
   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

-)

-

 if defined SIGN_FIO (

   signtool sign /n "%SIGNING_CN%" /t http://timestamp.digicert.com ..\..\fio.exe

   signtool sign /as /n "%SIGNING_CN%" /tr http://timestamp.digicert.com /td sha256 /fd sha256 ..\..\fio.exe