X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Finstall.wxs;h=ed9f98bfe164a65ff9b90216672be91f7848f704;hp=5bea45c5ccb3898223ee772d7c6985544dc10834;hb=99ac409c91fb38af259e871a305b1461d1b02fa4;hpb=cf9a74c8bd63d9db5256f1362885c740e11a1fe5

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 5bea45c5..ed9f98bf 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,77 +1,73 @@
-<?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="CCE88492-8C5A-4EAF-8B82-E22A90CEC47B"
-	  Codepage="1252" Language="1033"
-	  Manufacturer="fio" Name="fio"
-	  UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.8">
-		<Package 
-		  Comments="Contact: Your local administrator"
-		  Description="Flexible IO Tester"
-		  InstallerVersion="200" 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="..\..\pthreadGC2.dll"/>
-						</Component>
-						<Component>
-							<File Id="README" Name="README.rtf" Source="..\..\README"/>
-						</Component>
-						<Component>
-							<File Id="REPORTING_BUGS" Name="REPORTING-BUGS.rtf" Source="..\..\REPORTING-BUGS"/>
-						</Component>
-						<Component>
-							<File Id="HOWTO" Name="HOWTO.rtf" Source="..\..\HOWTO"/>
-						</Component>
-						<Component>
-							<File Id="COPYING" Name="COPYING.rtf" Source="..\..\COPYING"/>
-						</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"/>
-		<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://git.kernel.dk/?p=fio.git</Property>
-
-	<WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />
-
-	<UIRef Id="WixUI_Minimal"/>
-
-	<Condition Message="Per-user installations are not supported">
-		Installed OR
-		ALLUSERS=1
-	</Condition>
-
-	<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."/>
-</Product>
-</Wix>
+<?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.7">
+		<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"/>
+							<Environment Action="set" Part="last" Id="PATH" Name="PATH" Value="[INSTALLDIR]fio\" System="yes"/>
+						</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="MORAL_LICENSE" Name="MORAL-LICENSE.txt" Source="..\..\MORAL-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="HOWTO"/>
+		<ComponentRef Id="README"/>
+		<ComponentRef Id="REPORTING_BUGS"/>
+		<ComponentRef Id="COPYING"/>
+		<ComponentRef Id="MORAL_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>