Windows build fixes

Bruce writes:

SIGUSR1 isn't defined on Windows so I've defined it.

Also, MSI packages need a version string of x.x.x.x where x is between 0
and 65535 so we can't include the git hash. It's easier just to go back
to hard-coding the version for now, and I'll update it (and the product
GUID) when I create a new package (it doesn't need checked in each
time).

Also, Cygwin doesn't like $(SHELL_PATH) but $(SHELL) seems to work -
does $(SHELL) cause a problem on other platforms?

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/Makefile b/Makefile
index 61e2163fb604f254b1e84e846e8ee8a1e49182fd..f72bf8e2562f6d941bc18a5984c0bab21a2c6f6e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ all: .depend $(PROGS) $(SCRIPTS) FORCE
 .PHONY: FORCE cscope
 
 FIO-VERSION-FILE: FORCE
-       @$(SHELL_PATH) ./FIO-VERSION-GEN
+       @$(SHELL) ./FIO-VERSION-GEN
 -include FIO-VERSION-FILE
 
 CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'

diff --git a/os/os-windows.h b/os/os-windows.h
index 8b801ed5bfabf959236fbf8711060d63e5db7037..7b61d16cce5c46db3e692bad238d984423f2f470 100644 (file)
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -82,6 +82,7 @@ typedef DWORD_PTR os_cpu_mask_t;
 #define POLLHUP        1
 
 #define SIGCONT        0
+#define SIGUSR1        1
 
 typedef int sigset_t;
 typedef int siginfo_t;

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index 43e5db4dad43f581e21a7da3483192d4124d0e96..cbbe2cbced20e1cad7464b328394d8388b2b0419 100644 (file)
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,11 +1,9 @@
 @echo off\r
 setlocal enabledelayedexpansion\r
-set /a counter=4\r
-for /f "tokens=3" %%i in (..\..\fio_version.h) do (\r
- if "!counter!"=="4" set FIO_MAJOR=%%i\r
- if "!counter!"=="5" set FIO_MINOR=%%i\r
- if "!counter!"=="6" set FIO_PATCH=%%i\r
-set /a counter+=1\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
 if "%1"=="x86" set FIO_ARCH=x86\r
@@ -22,5 +20,5 @@ if not defined FIO_ARCH (
 @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 install.wixobj examples.wixobj -ext WixUIExtension -out fio-%FIO_MAJOR%.%FIO_MINOR%.%FIO_PATCH%-%FIO_ARCH%.msi\r
+"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
 :end
\ No newline at end of file

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 18091bee9d6c215f76bfecd4d0c55a39dd613392..69753ba99d519a28db09b9e99697525fc72b2ce4 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -7,10 +7,10 @@
                <?define ProgramDirectory = ProgramFiles64Folder ?>\r
        <?endif?>\r
 \r
-       <Product Id="*"\r
+       <Product Id="CCE88492-8C5A-4EAF-8B82-E22A90CEC47B"\r
          Codepage="1252" Language="1033"\r
-         Manufacturer="fio" Name="FIO"\r
-         UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_VERSION)">\r
+         Manufacturer="fio" Name="fio"\r
+         UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.7">\r
                <Package \r
                  Comments="Contact: Your local administrator"\r
                  Description="Flexible IO Tester"\r