From dd8dd3de80910934d8d54325ad52b6d759a71095 Mon Sep 17 00:00:00 2001
From: Bruce Cran <bruce@cran.org.uk>
Date: Mon, 4 Feb 2013 13:50:51 +0100
Subject: [PATCH] Update the Windows installer

Update the EULA copyright year to 2013, auto-generate the product ID,
remove the comment field and allow per-user installs.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 os/windows/eula.rtf    | Bin 1055 -> 1060 bytes
 os/windows/install.wxs |  12 +++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/os/windows/eula.rtf b/os/windows/eula.rtf
index be37fad50189d161a61ce0d273fba610be56cd66..cc7be7fb216a232bc50ad8f6daf65b0d9fe19be3 100755
GIT binary patch
delta 23
fcmbQwv4mqnKa-)s#EHvUb&U)RjW=5`K4$^|T=@rV

delta 17
ZcmZ3&F`r{XKa+vw#EHu{+cG|90suMS27v$o

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 5845d5f3..b43120a1 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -7,14 +7,13 @@
 		<?define ProgramDirectory = ProgramFiles64Folder ?>
 	<?endif?>
 
-	<Product Id="F9883688-6AB3-4BD1-AB93-91D39F12F003"
+	<Product Id="*"
 	  Codepage="1252" Language="1033"
 	  Manufacturer="fio" Name="fio"
-	  UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.13">
+	  UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.0.13">
 		<Package
-		  Comments="Contact: Your local administrator"
 		  Description="Flexible IO Tester"
-		  InstallerVersion="200" Keywords="Installer,MSI,Database"
+		  InstallerVersion="301" Keywords="Installer,MSI,Database"
 		  Languages="1033" Manufacturer="fio"
 		  InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>
 
@@ -67,11 +66,6 @@
 
 	<UIRef Id="WixUI_Minimal"/>
 
-	<Condition Message="Per-user installations are not supported">
-		Installed OR
-		ALLUSERS=1
-	</Condition>
-
 	<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."/>
 </Product>
 </Wix>
-- 
2.25.1