summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5c3f7ce)
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>
.PHONY: FORCE cscope
FIO-VERSION-FILE: 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)"'
-include FIO-VERSION-FILE
CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
#define POLLHUP 1
#define SIGCONT 0
#define POLLHUP 1
#define SIGCONT 0
typedef int sigset_t;
typedef int siginfo_t;
typedef int sigset_t;
typedef int siginfo_t;
@echo off\r
setlocal enabledelayedexpansion\r
@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
)\r
\r
if "%1"=="x86" set FIO_ARCH=x86\r
@if ERRORLEVEL 1 goto end\r
"%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs\r
@if ERRORLEVEL 1 goto end\r
@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
:end
\ No newline at end of file
<?define ProgramDirectory = ProgramFiles64Folder ?>\r
<?endif?>\r
\r
<?define ProgramDirectory = ProgramFiles64Folder ?>\r
<?endif?>\r
\r
+ <Product Id="CCE88492-8C5A-4EAF-8B82-E22A90CEC47B"\r
Codepage="1252" Language="1033"\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
<Package \r
Comments="Contact: Your local administrator"\r
Description="Flexible IO Tester"\r