diff options
author | Jens Axboe <axboe@kernel.dk> | 2020-11-05 15:33:00 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2020-11-05 15:33:00 -0700 |
commit | ea693b6e4501a1385bf62a01f6fb1f3609d31a4a (patch) | |
tree | dc2d591b73acd7650a4972b689a761ba46b8689d /os | |
parent | 0a7511a69ea6ca8ff32d392edf027e31aa614716 (diff) | |
download | fio-ea693b6e4501a1385bf62a01f6fb1f3609d31a4a.tar.gz fio-ea693b6e4501a1385bf62a01f6fb1f3609d31a4a.tar.bz2 |
Revert "Windows: update dobuild.cmd to run the configure/make"
This reverts commit 38c2f9384db8dbd93f59d965d70ab0d3a53343fa.
It's causing issues for CI, revert it for now.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'os')
-rwxr-xr-x | os/windows/_domake.sh | 17 | ||||
-rw-r--r-- | os/windows/dobuild.cmd | 23 |
2 files changed, 10 insertions, 30 deletions
diff --git a/os/windows/_domake.sh b/os/windows/_domake.sh deleted file mode 100755 index 05625ff4..00000000 --- a/os/windows/_domake.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 ea79dd03..08df3e87 100644 --- a/os/windows/dobuild.cmd +++ b/os/windows/dobuild.cmd @@ -1,18 +1,5 @@ @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
@@ -29,6 +16,16 @@ 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
|