Recent changes (master)
The following changes since commit 13169d44d3725847858a7c817965d2cac5abd8f8:
Merge branch 'pthread_getaffinity_1' of https://github.com/kusumi/fio (2021-04-25 10:23:34 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 6308ef297145e73add65ba86bfdbeaf967957d1f:
ioengines: don't call zbd_put_io_u() for engines not implementing commit (2021-04-27 11:56:55 -0600)
----------------------------------------------------------------
Niklas Cassel (1):
ioengines: don't call zbd_put_io_u() for engines not implementing commit
Rebecca Cran (1):
The GPL isn't a EULA: remove it and introduce WixUI_Minimal_NoEULA
ioengines.c | 1 - os/windows/WixUI_Minimal_NoEULA.wxs | 96 ++++++++++++++++++++++++++++++++++++ os/windows/WixUI_fio.wxl | 12 +++++ os/windows/dobuild.cmd | 5 +- os/windows/eula.rtf | Bin 1075 -> 0 bytes os/windows/install.wxs | 2 +- 6 files changed, 113 insertions(+), 3 deletions(-) create mode 100755 os/windows/WixUI_Minimal_NoEULA.wxs create mode 100755 os/windows/WixUI_fio.wxl delete mode 100755 os/windows/eula.rtf
---
Diff of recent changes:
ioengines.c +0 -1
@@ -414,7 +414,6 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)if (!td->io_ops->commit) {io_u_mark_submit (td,1 );io_u_mark_complete (td,1 ); -zbd_put_io_u (td, io_u); }if (ret ==FIO_Q_COMPLETED ) {
os/windows/WixUI_Minimal_NoEULA.wxs new file +96 -0
97 lines not on this page · raw message
os/windows/WixUI_fio.wxl new file +12 -0
@@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> + + +<WixLocalization Culture="en-US" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization"> + <!-- _locID@Culture="en-US" _locComment="American English" --> + <!-- _locID@Codepage="1252" _locComment="Windows-1252" --> + +<String Id="MyWelcomeDlgDescription" Overridable="yes"> +<!-- _locID_text="MyWelcomeDlgDescription" _locComment="MyWelcomeDlgDescription" -->The Setup Wizard will install [ProductName] on your computer. Click Install to continue or Cancel to exit the Setup Wizard. +</String> +</WixLocalization>
os/windows/dobuild.cmd +4 -1
@@ -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 (
os/windows/eula.rtf deleted binary +0 -0
os/windows/install.wxs +1 -1
@@ -107,7 +107,7 @@ <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" /> - <UIRef Id="WixUI_Minimal"/> + <UIRef Id="WixUI_Minimal_NoEULA"/> <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed." AllowSameVersionUpgrades="yes"/>