From d1010338ecb251585e88e2f79d20146304e01885 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Mon, 22 Oct 2012 11:02:14 +0000
Subject: [PATCH] * fix various MSI installer update/upgrade 32/64-bit issues

---
 build.xml                     |  2 +-
 installer/msi/filebot-wix.xml | 61 ++++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/build.xml b/build.xml
index cf381b65..da5dfb88 100644
--- a/build.xml
+++ b/build.xml
@@ -289,7 +289,7 @@
 		<property name="installer" location="${dir.dist}/FileBot_${version}_${arch}.msi" />
 
 		<exec executable="candle.exe" dir="${dir.installer}/msi" failonerror="true">
-			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -arch ${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path}" />
+			<arg line="filebot-wix.xml -out ${dir.dist}/msi.wixobj -darch=${arch} -dreleaseversion=${version} -dfatjar=${path.fatjar} -dmediainfo=${mediainfo} -dlib7z_binding=${lib7z_binding} -dlibgcc_name=${libgcc_name} -dlibgcc_path=${libgcc_path}" />
 		</exec>
 		<exec executable="light.exe" dir="${dir.installer}/msi" failonerror="true">
 			<arg line="${dir.dist}/msi.wixobj -sval -ext WixUIExtension -out ${installer}" />
diff --git a/installer/msi/filebot-wix.xml b/installer/msi/filebot-wix.xml
index 31dc51f4..21b9eca5 100644
--- a/installer/msi/filebot-wix.xml
+++ b/installer/msi/filebot-wix.xml
@@ -1,15 +1,34 @@
-<?xml version='1.0' encoding='windows-1252'?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- These variables define the Windows Installer  product code and upgrade code.   -->
+<?define ProductName = "FileBot" ?>
+<?define Manufacturer = "Reinhard Pointner" ?>
+<?define UpgradeCode = "86809B6B-E2E3-43EC-9351-D4D66CAF7864" ?>
+
+<!-- Set a specific product code based on the processor architecture build variable -->
+<?if $(var.arch)=x64 ?>
+	<?define Platform = "x64" ?>
+	<?define ProgramFiles = "ProgramFiles64Folder" ?>
+	<?define Win64 = "yes" ?>
+<?else ?>
+	<?define Platform = "x86" ?>
+	<?define ProgramFiles = "ProgramFilesFolder" ?>
+	<?define Win64 = "no" ?>
+<?endif ?>
+
+
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-	<Product Name='FileBot' Manufacturer='Reinhard Pointner' Version='$(var.releaseversion)' Id='C171FBBE-E471-4509-AA63-DB2FB61F778E' UpgradeCode='FD96D8C9-9194-4C7B-9DE7-9437D0F57330' Language='1033' Codepage='1252'>
-
-		<Package Id='*' Keywords='Installer' Description="FileBot Installer" Manufacturer='Reinhard Pointner' InstallerVersion='200' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-		<Media Id='1' Cabinet='FileBot.cab' EmbedCab='yes' />
-
+	<Product Id='*' Name='$(var.ProductName)' Manufacturer='$(var.Manufacturer)' Version='$(var.releaseversion)' UpgradeCode='$(var.UpgradeCode)' Language='1033' Codepage='1252'>
+	
+		<Package Description="FileBot Installer" Manufacturer='$(var.Manufacturer)' InstallerVersion='300' Compressed='yes' Platform="$(var.Platform)" />
+		
+		<MajorUpgrade AllowDowngrades="yes" IgnoreRemoveFailure="yes" />
+		
 		<Directory Id='TARGETDIR' Name='SourceDir'>
-			<Directory Id='ProgramFilesFolder' Name='PFiles'>
+			<Directory Id='$(var.ProgramFiles)' Name='Program Files'>
 				<Directory Id='INSTALLDIR' Name='FileBot'>
 
-					<Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E'>
+					<Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E' Win64="$(var.Win64)">
 						<File Id='filebot.launcher.exe' Name='filebot.launcher.exe' Source='filebot.launcher.exe' KeyPath='yes'>
 							<Shortcut Id="shortcut.menu.filebot" Directory="ProgramMenuDir" Name="FileBot" Description="The ultimate TV Renamer and Subtitle Downloader" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="no" />
 							<Shortcut Id="shortcut.desktop" Directory="DesktopFolder" Name="FileBot" Description="The ultimate TV Renamer and Subtitle Downloader" WorkingDirectory='INSTALLDIR' Icon="icon.ico" IconIndex="0" Advertise="no" />
@@ -22,14 +41,14 @@
 						<Shortcut Id="shortcut.uninstall" Directory="ProgramMenuDir" Name="Uninstall" Description="Uninstall FileBot" Target="[SystemFolder]msiexec.exe" Arguments="/x [ProductCode]" Advertise="no" />
 					</Component>
 					
-					<Component Id='ApplicationStubCmd' Guid='D2B1A845-3B5C-4B59-B0D0-A4E80C173220'>
+					<Component Id='ApplicationStubCmd' Guid='D2B1A845-3B5C-4B59-B0D0-A4E80C173220' Win64="$(var.Win64)">
 						<File Id='filebot.cmd' Name='filebot.cmd' Source='filebot.cmd' KeyPath='yes'>
 							<Shortcut Id="shortcut.menu.filebot.cmd" Directory="ProgramMenuDir" Name="FileBot (console)" Description="Launch FileBot with debug logging" WorkingDirectory='INSTALLDIR' />
 						</File>
 						<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Action="set" Part="last" Permanent="no" System="yes" />
 					</Component>
 					
-					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E'>
+					<Component Id='ApplicationBase' Guid='9E365344-A00C-45DE-A2A4-266412C3D06E' Win64="$(var.Win64)">
 						<File Id='FileBot.jar' Name='FileBot.jar' Source='$(var.fatjar)' KeyPath='yes' />
 						<File Id='MediaInfo.dll' Name='MediaInfo.dll' Source='$(var.mediainfo)' />
 						<File Id='lib7_Zip_JBinding.dll' Name='7-Zip-JBinding.dll' Source='$(var.lib7z_binding)' />
@@ -57,8 +76,26 @@
 			<ComponentRef Id='ProgramMenuDir' />
 		</Feature>
 		
-		<UIRef Id="WixUI_InstallDir" />
-		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+		<!-- The media table defines the location that the MSI will look to find source files during         -->
+		<!-- installation or repair scenarios. In this case, the source files are in a cab file that will be -->
+		<!-- embedded directly into the MSI at build time.                                                   -->
+		<Media Id='1' Cabinet='FileBot.cab' EmbedCab='yes' />
+		
+		<!-- These properties define links that will appear in the Add/Remove Programs control panel when    -->
+		<!-- this product is installed on the system.                                                        -->
+		<Property Id="ARPURLINFOABOUT" Value="http://filebot.sourceforge.net/" />
+		
+		<!-- This property is used as the default installation directory, and the user can change this path  -->
+		<!-- during setup. The Id must be set to WIXUI_INSTALLDIR and the value must match the directory Id  -->
+		<!-- defined above that represents the root installation directory.                                  -->
+		<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+		
+		<!-- This UIRef element specifies what WiXUI dialog set to use for the setup UI. This package uses   -->
+		<!-- the WixUI_InstallDir dialog set, which provides a welcome page, a license agreement page, a     -->
+		<!-- page to allow changing the installation path, an installation confirmation page, a progress     -->
+		<!-- page and a completion page. Other dialog sets are available in the WiX toolset and are          -->
+		<!-- described in more detail in the WiX documentation.                                              -->
+		<UIRef Id="WixUI_InstallDir"/>
 
 		<WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="dialog.bmp" />