projects / fio.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Windows: add CONFIG_TLS_THREAD=y and swap pthreadGC2 to libwinpthread-1.
[fio.git] / os / windows / install.wxs
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 18091bee9d6c215f76bfecd4d0c55a39dd613392..adc50f65844b488b23d7da1bcfc4134312a66029 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,77 +1,76 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-       \r
-       <?if $(env.FIO_ARCH) = x86 ?>\r
-               <?define ProgramDirectory = ProgramFilesFolder ?>\r
-       <?else?>\r
-               <?define ProgramDirectory = ProgramFiles64Folder ?>\r
-       <?endif?>\r
-\r
-       <Product Id="*"\r
-         Codepage="1252" Language="1033"\r
-         Manufacturer="fio" Name="FIO"\r
-         UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_VERSION)">\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"\r
-                 InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>\r
-\r
-               <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high"/>\r
-\r
-               <Directory Id="TARGETDIR" Name="SourceDir">\r
-                       <Directory Id="$(var.ProgramDirectory)">\r
-                               <Directory Id="INSTALLDIR">\r
-                                       <Directory Id="fio" Name="fio">\r
-                                               <Component>\r
-                                                       <File Source="..\..\fio.exe"/>\r
-                                               </Component>\r
-                                               <Component>\r
-                                                       <File KeyPath="yes" Source="..\..\pthreadGC2.dll"/>\r
-                                               </Component>\r
-                                               <Component>\r
-                                                       <File Id="README" Name="README.rtf" Source="..\..\README"/>\r
-                                               </Component>\r
-                                               <Component>\r
-                                                       <File Id="REPORTING_BUGS" Name="REPORTING-BUGS.rtf" Source="..\..\REPORTING-BUGS"/>\r
-                                               </Component>\r
-                                               <Component>\r
-                                                       <File Id="HOWTO" Name="HOWTO.rtf" Source="..\..\HOWTO"/>\r
-                                               </Component>\r
-                                               <Component>\r
-                                                       <File Id="COPYING" Name="COPYING.rtf" Source="..\..\COPYING"/>\r
-                                               </Component>\r
-                                               <Directory Id="examples" Name="examples"/>\r
-                                       </Directory>\r
-                               </Directory>\r
-                       </Directory>\r
-       </Directory>\r
-\r
-       <Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Flexible IO Tester">\r
-               <ComponentRef Id="fio.exe"/>\r
-               <ComponentRef Id="pthreadGC2.dll"/>\r
-               <ComponentRef Id="HOWTO"/>\r
-               <ComponentRef Id="README"/>\r
-               <ComponentRef Id="REPORTING_BUGS"/>\r
-               <ComponentRef Id="COPYING"/>\r
-               <ComponentGroupRef Id="examples"/>\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>
fio - Flexible IO Tester