windows: prepare for Windows build split

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

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index adc50f65844b488b23d7da1bcfc4134312a66029..73b281036f332b06dac0d78c2baa1554e7eaa08f 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-       <?if $(env.FIO_ARCH) = x86 ?>
+       <?if $(sys.BUILDARCH) = x86 ?>
                <?define ProgramDirectory = ProgramFilesFolder ?>
        <?else?>
                <?define ProgramDirectory = ProgramFiles64Folder ?>
@@ -10,9 +10,9 @@
        <Product Id="*"
          Codepage="1252" Language="1033"
          Manufacturer="fio" Name="fio"
-         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.1.4">
+         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="$(var.FioVersionNumbers)">
                <Package
-                 Description="Flexible IO Tester"
+                 Description="Flexible I/O Tester"
                  InstallerVersion="301" Keywords="Installer,MSI,Database"
                  Languages="1033" Manufacturer="fio"
                  InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>
@@ -25,9 +25,7 @@
                                        <Directory Id="fio" Name="fio">
                                                <Component>
                                                        <File Source="..\..\fio.exe"/>
-                                               </Component>
-                                               <Component>
-                                                       <File KeyPath="yes" Source="..\..\libwinpthread-1.dll"/>
+                                                       <Environment Action="set" Part="last" Id="PATH" Name="PATH" Value="[INSTALLDIR]fio\" System="yes"/>
                                                </Component>
                                                <Component>
                                                        <File Id="README" Name="README.txt" Source="..\..\README"/>
@@ -42,7 +40,7 @@
                                                        <File Id="COPYING" Name="COPYING.txt" Source="..\..\COPYING"/>
                                                </Component>
                                                <Component>
-                                                       <File Id="LICENSE" Name="LICENSE.txt" Source="..\..\LICENSE"/>
+                                                       <File Id="MORAL_LICENSE" Name="MORAL-LICENSE.txt" Source="..\..\MORAL-LICENSE"/>
                                                </Component>
                                                <Directory Id="examples" Name="examples"/>
                                        </Directory>
@@ -50,18 +48,17 @@
                        </Directory>
        </Directory>
 
-       <Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Flexible IO Tester">
+       <Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Flexible I/O 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"/>
+               <ComponentRef Id="MORAL_LICENSE"/>
                <ComponentGroupRef Id="examples"/>
        </Feature>
 
-       <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git" />
+       <Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/cgit/fio/" />
        <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>