t/axmap: add pre/post bit set checks

[fio.git] / os / windows / install.wxs

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index e02347e4b4c0c50da9671c0c3bc00fe659100102..b43120a1ea726c000f2fce282cb18a3ada32a850 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-       \r
+\r
        <?if $(env.FIO_ARCH) = x86 ?>\r
                <?define ProgramDirectory = ProgramFilesFolder ?>\r
        <?else?>\r
                <?define ProgramDirectory = ProgramFiles64Folder ?>\r
        <?endif?>\r
 \r
-       <Product Id="2BA394F9-0D9E-4597-BB9D-6B18097D64BB"\r
+       <Product Id="*"\r
          Codepage="1252" Language="1033"\r
          Manufacturer="fio" Name="fio"\r
-         UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.10">\r
-               <Package \r
-                 Comments="Contact: Your local administrator"\r
+         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.0.13">\r
+               <Package\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
@@ -57,7 +56,7 @@
                <ComponentRef Id="COPYING"/>\r
                <ComponentGroupRef Id="examples"/>\r
        </Feature>\r
-               \r
+\r
        <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git" />\r
        <Property Id='ARPCONTACT'>fio@vger.kernel.org</Property>\r
        <Property Id='ARPHELPLINK'>http://www.spinics.net/lists/fio/</Property>\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