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>

diff --git a/os/windows/eula.rtf b/os/windows/eula.rtf
index be37fad50189d161a61ce0d273fba610be56cd66..cc7be7fb216a232bc50ad8f6daf65b0d9fe19be3 100755 (executable)
Binary files a/os/windows/eula.rtf and b/os/windows/eula.rtf differ

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