projects / fio.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fio 2.0.12.1
[fio.git] / os / windows / install.wxs
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index f70d8fac272dd579b66b4b6c11febdc3a06577a7..d4913b6a310df80ba13b5748268526af16a72140 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,100 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
 \r
-  <?define VersionMajor = 1?>\r
-  <?define VersionMinor = 44?>\r
-  <?define VersionBuild = 3?>\r
-  \r
-       <Product Id="*"\r
-             Codepage="1252" Language="1033"\r
-             Manufacturer="fio" Name="FIO"\r
-             UpgradeCode="{2338a332-5511-43cf-b9bd-5c60496ccfcc}" Version="$(var.VersionMajor).$(var.VersionMinor).$(var.VersionBuild)">\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" Platform="x86"\r
-                 InstallScope="perMachine" InstallPrivileges="elevated" Compressed="yes"/>\r
+       <?if $(env.FIO_ARCH) = x86 ?>\r
+               <?define ProgramDirectory = ProgramFilesFolder ?>\r
+       <?else?>\r
+               <?define ProgramDirectory = ProgramFiles64Folder ?>\r
+       <?endif?>\r
 \r
-               <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" />\r
+    <Product Id="C3DC8A4F-1191-412F-8287-ACB6BA798F6A"\r
+         Codepage="1252" Language="1033"\r
+         Manufacturer="fio" Name="fio"\r
+         UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.12.1">\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
-    <Directory Id="TARGETDIR" Name="SourceDir">\r
-      <Directory Id="ProgramFilesFolder" SourceName="program files">\r
-        <Directory Id="INSTALLDIR">\r
-          <Directory Id="cygwin" Name="fio">\r
-            <Directory Id="bin" Name="bin">\r
-              <Component Id="fio.exe" Location="either">\r
-                <File Id="fio.exe" Name="fio.exe" KeyPath="yes" Source="..\..\fio.exe"/>\r
-                <Shortcut Id="FIO_SC" Name="FIO" Description="Opens an FIO shell" Directory="ApplicationProgramsFolder" Target="[cygwin]\Cygwin.bat"/>\r
-              </Component>\r
-            </Directory>\r
-            <Directory Id="usr" Name="usr">\r
-              <Directory Id="share" Name="share">\r
-                <Directory Id="doc" Name="doc">\r
-                  <Directory Id="fio" Name="fio">\r
-                    <Directory Id="examples" Name="examples"/>\r
-                    <Component Id="README">\r
-                      <File Id="README" Name="README.txt" KeyPath="yes" Source="..\..\README"/>\r
-                      <Shortcut Id="README_SC" Name="Readme" Description="Documentation" Directory="ApplicationProgramsFolder" Target="[#README]"/>\r
-                    </Component>\r
-                    <Component Id="REPORTING_BUGS">\r
-                      <File Id="REPORTING_BUGS" Name="REPORTING-BUGS.txt" KeyPath="yes" Source="..\..\REPORTING-BUGS"/>\r
-                      <Shortcut Id="REPORTING_BUGS_SC" Name="Reporting bugs" Description="How to report bugs in FIO" Directory="ApplicationProgramsFolder" Target="[#REPORTING_BUGS]"/>\r
-                    </Component>\r
-                    <Component Id="HOWTO">\r
-                      <File Id="HOWTO" Name="HOWTO.txt" KeyPath="yes" Source="..\..\HOWTO"/>\r
-                      <Shortcut Id="HOWTO_SC" Name="How to use FIO" Description="FIO Tutorial - how to setup FIO" Directory="ApplicationProgramsFolder" Target="[#HOWTO]"/>\r
-                    </Component>\r
-                    <Component Id="COPYING">\r
-                      <File Id="COPYING" Name="COPYING.txt" KeyPath="yes" Source="..\..\COPYING"/>\r
-                      <Shortcut Id="COPYING_SC" Name="License" Description="FIO license" Directory="ApplicationProgramsFolder" Target="[#COPYING]"/>\r
-                    </Component>\r
-                  </Directory>\r
-                </Directory>\r
-              </Directory>\r
-            </Directory>\r
-          </Directory>\r
-        </Directory>\r
-      </Directory>\r
-      <Directory Id="ProgramMenuFolder">\r
-        <Directory Id="ApplicationProgramsFolder" Name="FIO">\r
-          <Component Id="ShortcutDir" Guid="475862c2-ae75-4325-96c8-335edb490214">\r
-            <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>\r
-            <!-- <RegistryValue Root="HKLM" Key="Software\FIO\FIO" Name="shortcuts" Type="string" Value="" KeyPath="yes"/> -->\r
-          </Component>\r
-        </Directory>\r
-      </Directory>\r
-    </Directory>\r
+               <Media Id="1" Cabinet="Product.cab" EmbedCab="yes" CompressionLevel="high"/>\r
 \r
-    <Feature Id="AlwaysInstall" Absent="disallow" ConfigurableDirectory="INSTALLDIR" Display="hidden" Level="1" Title="Always Install">\r
-                       <ComponentRef Id="fio.exe" />\r
-      <ComponentGroupRef Id="examples"/>\r
-      <ComponentGroupRef Id="cygwin"/>\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
-      <ComponentRef Id="HOWTO"/>\r
-      <ComponentRef Id="README"/>\r
-      <ComponentRef Id="REPORTING_BUGS"/>\r
-      <ComponentRef Id="COPYING"/>\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
-      <ComponentRef Id="ShortcutDir"/>\r
-               </Feature>\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
-               <!-- <Property Id="ARPPRODUCTICON" Value="ARPPRODUCTICON" /> -->\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
+       <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />\r
 \r
-               <WixVariable Id="WixUILicenseRtf" Value="eula.rtf" />\r
+       <UIRef Id="WixUI_Minimal"/>\r
 \r
-               <UIRef Id="WixUI_Minimal"/>\r
+       <Condition Message="Per-user installations are not supported">\r
+               Installed OR\r
+               ALLUSERS=1\r
+       </Condition>\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>
\ No newline at end of file
+       <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of the application is already installed."/>\r
+</Product>\r
+</Wix>\r
fio - Flexible IO Tester