summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorRebecca Cran <rebecca@bsdio.com>2020-11-03 02:47:41 +0000
committerJens Axboe <axboe@kernel.dk>2020-11-04 16:43:14 -0700
commit38c2f9384db8dbd93f59d965d70ab0d3a53343fa (patch)
tree2f177365ea21170ce484ed36d1a00a19778ae920 /os
parent08a3f6fef1fe6c9fcd18d5ed40ca81097922bb14 (diff)
downloadfio-38c2f9384db8dbd93f59d965d70ab0d3a53343fa.tar.gz
fio-38c2f9384db8dbd93f59d965d70ab0d3a53343fa.tar.bz2
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>
Diffstat (limited to 'os')
-rwxr-xr-xos/windows/_domake.sh17
-rw-r--r--os/windows/dobuild.cmd23
2 files changed, 30 insertions, 10 deletions
diff --git a/os/windows/_domake.sh b/os/windows/_domake.sh
new file mode 100755
index 00000000..05625ff4
--- /dev/null
+++ b/os/windows/_domake.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$2"
+cd ../..
+if [ -e "fio.exe" ]; then
+ make clean
+fi
+
+if [ "$1" = "x86" ]; then
+ ./configure --disable-native --build-32bit-win
+else
+ ./configure --disable-native
+fi
+
+make -j
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