-<?xml version="1.0" encoding="utf-8"?>\r
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-\r
-<?define VersionMajor = 1?>\r
-<?define VersionMinor = 50?>\r
-<?define VersionBuild = 0?>\r
-\r
- <Product Id="*"\r
- Codepage="1252" Language="1033"\r
- Manufacturer="fio" Name="FIO"\r
- UpgradeCode="{2338a332-5511-43cf-b9bd-5c60496ccfcc}" Version="$(var.VersionMajor).$(var.VersionMinor).$(var.VersionBuild)">\r
- <Package \r
- Comments="Contact: Your local administrator"\r
- Description="Flexible IO Tester"\r
- InstallerVersion="200" Keywords="Installer,MSI,Database"\r
- Languages="1033" Manufacturer="fio" Platform="x86"\r
- InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>\r
-\r
- <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" />\r
-\r
- <Directory Id="TARGETDIR" Name="SourceDir">\r
- <Directory Id="ProgramFilesFolder" SourceName="program files">\r
- <Directory Id="INSTALLDIR">\r
- <Directory Id="cygwin" Name="FIO">\r
- <Directory Id="bin" Name="bin">\r
- <Component Id="fio.exe" Location="either">\r
- <File Id="fio.exe" Name="fio.exe" KeyPath="yes" Source="..\..\fio.exe"/>\r
- </Component>\r
- </Directory>\r
- \r
- <Component Id="fio.lnk" Location="either">\r
- <File Id="fio.lnk" Name="FIO.lnk" KeyPath="yes" Source="FIO.lnk"/>\r
- <Shortcut Id="FIO_SC" Name="FIO" Description="Opens an FIO shell" Directory="ApplicationProgramsFolder" Target="[cygwin]\FIO.lnk"/>\r
- </Component>\r
-\r
- <Directory Id="examples" Name="examples"/>\r
- <Component Id="README">\r
- <File Id="README" Name="README.txt" KeyPath="yes" Source="..\..\README"/>\r
- <Shortcut Id="README_SC" Name="Readme" Description="Documentation" Directory="ApplicationProgramsFolder" Target="[#README]"/>\r
- </Component>\r
- <Component Id="REPORTING_BUGS">\r
- <File Id="REPORTING_BUGS" Name="REPORTING-BUGS.txt" KeyPath="yes" Source="..\..\REPORTING-BUGS"/>\r
- <Shortcut Id="REPORTING_BUGS_SC" Name="Reporting bugs" Description="How to report bugs in FIO" Directory="ApplicationProgramsFolder" Target="[#REPORTING_BUGS]"/>\r
- </Component>\r
- <Component Id="HOWTO">\r
- <File Id="HOWTO" Name="HOWTO.txt" KeyPath="yes" Source="..\..\HOWTO"/>\r
- <Shortcut Id="HOWTO_SC" Name="How to use FIO" Description="FIO Tutorial - how to setup FIO" Directory="ApplicationProgramsFolder" Target="[#HOWTO]"/>\r
- </Component>\r
- <Component Id="COPYING">\r
- <File Id="COPYING" Name="COPYING.txt" KeyPath="yes" Source="..\..\COPYING"/>\r
- <Shortcut Id="COPYING_SC" Name="License" Description="FIO license" Directory="ApplicationProgramsFolder" Target="[#COPYING]"/>\r
- </Component>\r
- </Directory>\r
- </Directory>\r
- </Directory>\r
- <Directory Id="ProgramMenuFolder">\r
- <Directory Id="ApplicationProgramsFolder" Name="FIO">\r
- <Component Id="ShortcutDir" Guid="475862c2-ae75-4325-96c8-335edb490214">\r
- <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>\r
- </Component>\r
- </Directory>\r
- </Directory>\r
- </Directory>\r
-\r
- <Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Always Install">\r
- <ComponentRef Id="fio.exe" />\r
- <ComponentRef Id="fio.lnk" />\r
- <ComponentGroupRef Id="examples"/>\r
- <ComponentGroupRef Id="cygwin"/>\r
-\r
- <ComponentRef Id="HOWTO"/>\r
- <ComponentRef Id="README"/>\r
- <ComponentRef Id="REPORTING_BUGS"/>\r
- <ComponentRef Id="COPYING"/>\r
-\r
- <ComponentRef Id="ShortcutDir"/>\r
- </Feature>\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
- <Property Id='ARPURLUPDATEINFO'>http://git.kernel.dk/?p=fio.git</Property>\r
-\r
- <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />\r
-\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
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+ <?if $(env.FIO_ARCH) = x86 ?>
+ <?define ProgramDirectory = ProgramFilesFolder ?>
+ <?else?>
+ <?define ProgramDirectory = ProgramFiles64Folder ?>
+ <?endif?>
+
+ <Product Id="*"
+ Codepage="1252" Language="1033"
+ Manufacturer="fio" Name="fio"
+ UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.4">
+ <Package
+ Description="Flexible IO Tester"
+ InstallerVersion="301" Keywords="Installer,MSI,Database"
+ Languages="1033" Manufacturer="fio"
+ InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>
+
+ <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high"/>
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="$(var.ProgramDirectory)">
+ <Directory Id="INSTALLDIR">
+ <Directory Id="fio" Name="fio">
+ <Component>
+ <File Source="..\..\fio.exe"/>
+ </Component>
+ <Component>
+ <File KeyPath="yes" Source="..\..\libwinpthread-1.dll"/>
+ </Component>
+ <Component>
+ <File Id="README" Name="README.txt" Source="..\..\README"/>
+ </Component>
+ <Component>
+ <File Id="REPORTING_BUGS" Name="REPORTING-BUGS.txt" Source="..\..\REPORTING-BUGS"/>
+ </Component>
+ <Component>
+ <File Id="HOWTO" Name="HOWTO.txt" Source="..\..\HOWTO"/>
+ </Component>
+ <Component>
+ <File Id="COPYING" Name="COPYING.txt" Source="..\..\COPYING"/>
+ </Component>
+ <Component>
+ <File Id="LICENSE" Name="LICENSE.txt" Source="..\..\LICENSE"/>
+ </Component>
+ <Directory Id="examples" Name="examples"/>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Flexible IO Tester">
+ <ComponentRef Id="fio.exe"/>
+ <ComponentRef Id="pthreadGC2.dll"/>
+ <ComponentRef Id="HOWTO"/>
+ <ComponentRef Id="README"/>
+ <ComponentRef Id="REPORTING_BUGS"/>
+ <ComponentRef Id="COPYING"/>
+ <ComponentRef Id="LICENSE"/>
+ <ComponentGroupRef Id="examples"/>
+ </Feature>
+
+ <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git" />
+ <Property Id='ARPCONTACT'>fio@vger.kernel.org</Property>
+ <Property Id='ARPHELPLINK'>http://www.spinics.net/lists/fio/</Property>
+ <Property Id='ARPURLUPDATEINFO'>http://bluestop.org/fio/</Property>
+
+ <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />
+
+ <UIRef Id="WixUI_Minimal"/>
+
+ <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."
+ AllowSameVersionUpgrades="yes"/>
+</Product>
+</Wix>