X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fwindows%2Finstall.wxs;h=d3d683e72a9365a078862e865d932fa265458aec;hp=a4ffa0c8173eb081de7416e170cc7a85f2ae88c3;hb=93bcfd20e37cef8cec350fe06d3a086724c9f257;hpb=01155a985b13bd98f8fc8f3e49f84091dc6e1080

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index a4ffa0c8..d3d683e7 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,79 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-
-<?define VersionMajor = 1?>
-<?define VersionMinor = 51?>
-<?define VersionBuild = 0?>
+	
+	<?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="$(var.VersionMajor).$(var.VersionMinor).$(var.VersionBuild)">
+	  UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_MAJOR).$(env.FIO_MINOR).$(env.FIO_PATCH)">
 		<Package 
 		  Comments="Contact: Your local administrator"
 		  Description="Flexible IO Tester"
 		  InstallerVersion="200" Keywords="Installer,MSI,Database"
-		  Languages="1033" Manufacturer="fio" Platform="x86"
+		  Languages="1033" Manufacturer="fio"
 		  InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>
 
-		<Media Id="1" Cabinet="Product.cab" EmbedCab="yes" />
+		<Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high"/>
 
 		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder" SourceName="program files">
+			<Directory Id="$(var.ProgramDirectory)">
 				<Directory Id="INSTALLDIR">
-					<Directory Id="cygwin" Name="FIO">
-						<Directory Id="bin" Name="bin">
-							<Component Id="fio.exe" Location="either">
-								<File Id="fio.exe" Name="fio.exe" KeyPath="yes" Source="..\..\fio.exe"/>
-							</Component>
-						</Directory>
-						
-						<Component Id="fio.lnk" Location="either">
-							<File Id="fio.lnk" Name="FIO.lnk" KeyPath="yes" Source="FIO.lnk"/>
-							<Shortcut Id="FIO_SC" Name="FIO" Description="Opens an FIO shell" Directory="ApplicationProgramsFolder" Target="[cygwin]\FIO.lnk"/>
+					<Directory Id="fio" Name="fio">
+						<Component>
+							<File Source="..\..\fio.exe"/>
 						</Component>
-
-						<Directory Id="examples" Name="examples"/>
-						<Component Id="README">
-							<File Id="README" Name="README.txt" KeyPath="yes" Source="..\..\README"/>
-							<Shortcut Id="README_SC" Name="Readme" Description="Documentation" Directory="ApplicationProgramsFolder" Target="[#README]"/>
+						<Component>
+							<File KeyPath="yes" Source="..\..\pthreadGC2.dll"/>
 						</Component>
-						<Component Id="REPORTING_BUGS">
-							<File Id="REPORTING_BUGS" Name="REPORTING-BUGS.txt" KeyPath="yes" Source="..\..\REPORTING-BUGS"/>
-							<Shortcut Id="REPORTING_BUGS_SC" Name="Reporting bugs" Description="How to report bugs in FIO" Directory="ApplicationProgramsFolder" Target="[#REPORTING_BUGS]"/>
+						<Component>
+							<File Id="README" Name="README.rtf" Source="..\..\README"/>
 						</Component>
-						<Component Id="HOWTO">
-							<File Id="HOWTO" Name="HOWTO.txt" KeyPath="yes" Source="..\..\HOWTO"/>
-							<Shortcut Id="HOWTO_SC" Name="How to use FIO" Description="FIO Tutorial - how to setup FIO" Directory="ApplicationProgramsFolder" Target="[#HOWTO]"/>
+						<Component>
+							<File Id="REPORTING_BUGS" Name="REPORTING-BUGS.rtf" Source="..\..\REPORTING-BUGS"/>
 						</Component>
-						<Component Id="COPYING">
-							<File Id="COPYING" Name="COPYING.txt" KeyPath="yes" Source="..\..\COPYING"/>
-							<Shortcut Id="COPYING_SC" Name="License" Description="FIO license" Directory="ApplicationProgramsFolder" Target="[#COPYING]"/>
+						<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 Id="ProgramMenuFolder">
-			<Directory Id="ApplicationProgramsFolder" Name="FIO">
-				<Component Id="ShortcutDir" Guid="475862c2-ae75-4325-96c8-335edb490214">
-					<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
-				</Component>
-			</Directory>
-		</Directory>
 	</Directory>
 
-	<Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Always Install">
-		<ComponentRef Id="fio.exe" />
-		<ComponentRef Id="fio.lnk" />
-		<ComponentGroupRef Id="examples"/>
-		<ComponentGroupRef Id="cygwin"/>
-
+	<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="ShortcutDir"/>
+		<ComponentGroupRef Id="examples"/>
 	</Feature>
 		
 	<Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git" />
@@ -85,7 +67,7 @@
 
 	<UIRef Id="WixUI_Minimal"/>
 
-	<Condition Message="Per-User installations are not supported">
+	<Condition Message="Per-user installations are not supported">
 		Installed OR
 		ALLUSERS=1
 	</Condition>