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>

diff --git a/os/windows/WixUI_Minimal_NoEULA.wxs b/os/windows/WixUI_Minimal_NoEULA.wxs
new file mode 100755 (executable)
index 0000000..4839118
--- /dev/null
+++ b/os/windows/WixUI_Minimal_NoEULA.wxs
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!-- 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. -->\r
+\r
+\r
+\r
+<!--\r
+First-time install dialog sequence:\r
+ - WixUI_MyWelcomeDlg\r
+Maintenance dialog sequence:\r
+ WixUI_MaintenanceWelcomeDlg\r
+ - WixUI_MaintenanceTypeDlg\r
+ - WixUI_VerifyReadyDlg\r
+-->\r
+\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
+  <Fragment>\r
+    <UI Id="WixUI_Minimal_NoEULA">\r
+      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />\r
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />\r
+      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />\r
+\r
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />\r
+      <Property Id="WixUI_Mode" Value="Minimal" />\r
+\r
+      <DialogRef Id="ErrorDlg" />\r
+      <DialogRef Id="FatalError" />\r
+      <DialogRef Id="FilesInUse" />\r
+      <DialogRef Id="MsiRMFilesInUse" />\r
+      <DialogRef Id="PrepareDlg" />\r
+      <DialogRef Id="ProgressDlg" />\r
+      <DialogRef Id="ResumeDlg" />\r
+      <DialogRef Id="UserExit" />\r
+      <DialogRef Id="MyWelcomeDlg" />\r
+\r
+      <Dialog Id="MyWelcomeDlg" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">\r
+          <Control Id="Install" Type="PushButton" ElevationShield="yes" X="236" Y="243" Width="56" Height="17" Default="yes" Hidden="yes" Text="!(loc.WelcomeEulaDlgInstall)" >\r
+            <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish>\r
+            <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>\r
+            <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>\r
+            <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>\r
+            <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>\r
+            <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>\r
+            <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>\r
+            <Condition Action="show">ALLUSERS</Condition>\r
+        </Control>\r
+        <Control Id="InstallNoShield" Type="PushButton" ElevationShield="no" X="212" Y="243" Width="80" Height="17" Default="yes" Text="!(loc.WelcomeEulaDlgInstall)" Hidden="yes">\r
+          <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>\r
+          <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>\r
+          <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)</Publish>\r
+          <Publish Event="EndDialog" Value="Return">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>\r
+          <Publish Event="EnableRollback" Value="False">OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"</Publish>\r
+          <Publish Event="SpawnDialog" Value="OutOfDiskDlg">(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")</Publish>\r
+          <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>\r
+          <Condition Action="show">NOT ALLUSERS</Condition>\r
+        </Control>\r
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">\r
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>\r
+        </Control>\r
+        <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />\r
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />\r
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
+        <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.MyWelcomeDlgDescription)" >\r
+          <Condition Action="show">NOT Installed OR NOT PATCH</Condition>\r
+          <Condition Action="hide">Installed AND PATCH</Condition>\r
+        </Control>\r
+        <Control Id="PatchDescription" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeUpdateDlgDescriptionUpdate)" >\r
+          <Condition Action="show">Installed AND PATCH</Condition>\r
+          <Condition Action="hide">NOT Installed OR NOT PATCH</Condition>\r
+        </Control>\r
+        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />\r
+      </Dialog>\r
+\r
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>\r
+\r
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>\r
+\r
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>\r
+\r
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>\r
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>\r
+\r
+      <Publish Dialog="MyWelcomeDlg" Control="Install" Event="NewDialog" Value="PrepareDlg">1</Publish>\r
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>\r
+\r
+      <InstallUISequence>\r
+        <Show Dialog="WelcomeDlg" Before="ProgressDlg">0</Show>\r
+        <Show Dialog="MyWelcomeDlg" Before="ProgressDlg">NOT Installed</Show>\r
+      </InstallUISequence>\r
+\r
+      <Property Id="ARPNOMODIFY" Value="1" />\r
+    </UI>\r
+\r
+    <UIRef Id="WixUI_Common" />\r
+  </Fragment>\r
+</Wix>
\ No newline at end of file

diff --git a/os/windows/WixUI_fio.wxl b/os/windows/WixUI_fio.wxl
new file mode 100755 (executable)
index 0000000..11ec736
--- /dev/null
+++ b/os/windows/WixUI_fio.wxl
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- 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. -->\r
+\r
+\r
+<WixLocalization Culture="en-US" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">\r
+  <!-- _locID@Culture="en-US" _locComment="American English" -->\r
+  <!-- _locID@Codepage="1252" _locComment="Windows-1252" -->\r
+\r
+<String Id="MyWelcomeDlgDescription" Overridable="yes">\r
+<!-- _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.\r
+</String>\r
+</WixLocalization>
\ No newline at end of file

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index 08df3e876da6d3f761ba5ca5d335428bbbd2be71..7b9cb1ddad95d62713323fc7e3b1149a2fdec8e4 100644 (file)
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -44,7 +44,10 @@ if exist ..\..\fio.pdb (
 @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 -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% WixUI_Minimal_NoEULA.wxs\r
+@if ERRORLEVEL 1 goto end\r
+\r
+"%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\r
 :end\r
 \r
 if defined SIGN_FIO (\r

diff --git a/os/windows/eula.rtf b/os/windows/eula.rtf
deleted file mode 100755 (executable)
index a931017..0000000
Binary files a/os/windows/eula.rtf and /dev/null differ

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index f73ec5e2517487f3623dfbbccf37aa5567d0792e..7773bb3b86ac0284a4818cca19aa96dd33df1cf4 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -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"/>