diff options
author | Rebecca Cran <rebecca@bsdio.com> | 2021-04-21 20:32:25 -0600 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2021-04-27 07:40:29 -0600 |
commit | 3277b7e48e9d3600d4a33a652e8c2a20e59f2f37 (patch) | |
tree | 48dd39a1a5b334601faf3a487aa4450d15d9c8d2 /os/windows/dobuild.cmd | |
parent | 13169d44d3725847858a7c817965d2cac5abd8f8 (diff) | |
download | fio-3277b7e48e9d3600d4a33a652e8c2a20e59f2f37.tar.gz fio-3277b7e48e9d3600d4a33a652e8c2a20e59f2f37.tar.bz2 |
The GPL isn't a EULA: remove it and introduce WixUI_Minimal_NoEULA
The GPL shouldn't be used as a EULA in an installer.
Remove it, and since the WixUI_Minimal dialog set requires a EULA
create a custom WixUI_Minimal_NoEULA set.
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'os/windows/dobuild.cmd')
-rw-r--r-- | os/windows/dobuild.cmd | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd index 08df3e87..7b9cb1dd 100644 --- a/os/windows/dobuild.cmd +++ b/os/windows/dobuild.cmd @@ -44,7 +44,10 @@ if exist ..\..\fio.pdb ( @if ERRORLEVEL 1 goto end
"%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs
@if ERRORLEVEL 1 goto end
-"%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% WixUI_Minimal_NoEULA.wxs
+@if ERRORLEVEL 1 goto end
+
+"%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj WixUI_Minimal_NoEULA.wixobj -loc WixUI_fio.wxl -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
:end
if defined SIGN_FIO (
|