Fix Windows installer build: LICENSE is now MORAL-LICENSE

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

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 1494a64616b4c761a212c69d6b8cf75cbd1e2ad0..f392606730cfc0f4148046642d852601ceb11d65 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -10,7 +10,7 @@
        <Product Id="*"
          Codepage="1252" Language="1033"
          Manufacturer="fio" Name="fio"
-         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.0.15">
+         UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.2.7">
                <Package
                  Description="Flexible IO Tester"
                  InstallerVersion="301" Keywords="Installer,MSI,Database"
@@ -25,9 +25,7 @@
                                        <Directory Id="fio" Name="fio">
                                                <Component>
                                                        <File Source="..\..\fio.exe"/>
-                                               </Component>
-                                               <Component>
-                                                       <File KeyPath="yes" Source="..\..\pthreadGC2.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>
@@ -52,12 +50,11 @@
 
        <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"/>
+               <ComponentRef Id="MORAL_LICENSE"/>
                <ComponentGroupRef Id="examples"/>
        </Feature>
 
@@ -70,6 +67,7 @@
 
        <UIRef Id="WixUI_Minimal"/>
 
-       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."/>
+       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."
+                  AllowSameVersionUpgrades="yes"/>
 </Product>
 </Wix>