From eef194a40b76864de602971dac7ce6690a19213f Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 12 Aug 2018 12:22:03 +0700
Subject: [PATCH] Try to fix 32-bit MSI support

---
 build.xml                 | 11 +++++++----
 installer/msi/filebot.wix |  7 +++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 58429630..901226e9 100644
--- a/build.xml
+++ b/build.xml
@@ -304,8 +304,11 @@
 
 
 	<target name="msi" depends="revision" description="Build Windows Installer package">
-		<property name="msi.arch" value="x64" />
-		<property name="dir.staging" location="${dir.dist}/msi/${msi.arch}" />
+		<property name="msi.package.platform" value="x64" />
+		<property name="msi.directory.id" value="ProgramFiles64Folder" />
+		<property name="msi.component.win64" value="yes" />
+
+		<property name="dir.staging" location="${dir.dist}/msi/${msi.package.platform}" />
 
 		<!-- 1. prepare application files for heat harvest -->
 		<get-windows-jre dest="${dir.staging}/base/jre" />
@@ -314,7 +317,7 @@
 			<fileset dir="${dir.dist}/lib" includes="*.jar" />
 		</copy>
 		<copy todir="${dir.staging}/base/lib">
-			<fileset dir="${dir.lib}/native/win32-${msi.arch}" />
+			<fileset dir="${dir.lib}/native/win32-${msi.package.platform}" />
 		</copy>
 
 		<exec executable="heat" dir="${dir.staging}" failonerror="true">
@@ -335,7 +338,7 @@
 
 		<!-- 3. compile MSI package (use -b to add additional resource folders) -->
 		<exec executable="light" dir="${dir.staging}" failonerror="true">
-			<arg line="filebot.wixobj base.wixobj -b base -b ${dir.installer}/msi -sval -ext WixUIExtension -out ${dir.dist}/${release}_${msi.arch}.msi" />
+			<arg line="filebot.wixobj base.wixobj -b base -b ${dir.installer}/msi -sval -ext WixUIExtension -out ${dir.dist}/${release}_${msi.package.platform}.msi" />
 		</exec>
 	</target>
 
diff --git a/installer/msi/filebot.wix b/installer/msi/filebot.wix
index 4768be89..fbea7f56 100644
--- a/installer/msi/filebot.wix
+++ b/installer/msi/filebot.wix
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 	<Product Id='*' Name='@{application.name}' Manufacturer='@{package.developer}' Version='@{application.version}' UpgradeCode='86809B6B-E2E3-43EC-9351-D4D66CAF7864' Language='1033' Codepage='1252'>
 
-		<Package Description="FileBot Installer" Manufacturer='@{package.developer}' InstallerVersion='300' Compressed='yes' Platform="x64" />
+		<Package Description="FileBot Installer" Manufacturer='@{package.developer}' InstallerVersion='300' Compressed='yes' Platform="@{msi.package.platform}" />
 
 		<MajorUpgrade AllowDowngrades="yes" IgnoreRemoveFailure="yes" />
 
 		<Directory Id='TARGETDIR' Name='SourceDir'>
-			<Directory Id='ProgramFiles64Folder' Name='Program Files'>
+			<Directory Id='@{msi.directory.id}' Name='Program Files'>
 				<Directory Id='INSTALLDIR' Name='@{application.name}'>
 
-					<Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E' Win64="yes">
+					<Component Id='ApplicationStub' Guid='A7B21026-DA54-4AF8-9227-188565AB9C4E' Win64="@{msi.component.win64}">
 						<File Id='filebot.launcher.exe' Name='filebot.launcher.exe' Source='filebot.launcher.exe' KeyPath='yes'>
 							<Shortcut Id="shortcut.menu.filebot" Directory="ProgramMenuDir" Name="@{application.name}" Description="@{package.synopsis}" WorkingDirectory='INSTALLDIR' Icon="icon.ico" Advertise="no">
 								<ShortcutProperty Key="System.AppUserModel.ID" Value="@{application.name}" />