From 6fb40866896d6c65a890a360a265e1fbde0283e0 Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Tue, 1 Dec 2015 11:18:57 -0500
Subject: [PATCH] Control 32 and 64-bit MSI builds.

---
 build-windows-installer.xml | 19 +++++++++++--------
 build.xml                   |  2 ++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build-windows-installer.xml b/build-windows-installer.xml
index b8efca0718..daf635998e 100644
--- a/build-windows-installer.xml
+++ b/build-windows-installer.xml
@@ -3,11 +3,12 @@
     <!-- ADVANCED INSTALLER TARGETS -->
     <target name="build-installer-windows" depends="getProps,init-advanced-installer"
             description="Makes an installer from the opened ZIP file">
-        <antcall target="run-advanced-installer"  inheritAll="true" />
+        <antcall target="run-advanced-installer-32"  inheritAll="true" />
+        <antcall target="run-advanced-installer-64"  inheritAll="true" />
     </target>
 
     <target name="init-advanced-installer" depends="autoAIPath,inputAIPath"
-        description="Find AdvancedInstaller executable.">
+            description="Find AdvancedInstaller executable.">
         <fail unless="ai-exe-path" message="Could not locate Advanced Installer."/>
         <property environment="env"/>
         
@@ -44,22 +45,24 @@
     <target name="autoAIPath" description="Attempt to find the AI path based on standard installation location">
         <property name="AI.path" value="C:\Program Files (x86)\Caphyon\Advanced Installer 10.3\bin\x86\AdvancedInstaller.com" />
         <available file="${AI.path}"
-                    property="ai-exe-path"
-                    value="${AI.path}"/>
+                   property="ai-exe-path"
+                   value="${AI.path}"/>
         <echo message="${ai-exe-path}" /> 
     </target>
    
     <target name="inputAIPath" unless="ai-exe-path" description="Have the user input the path to the AI executable">
         <input addProperty="ai-exe-path"
-            message="Enter the location of AdvancedInstaller.com"/>
+               message="Enter the location of AdvancedInstaller.com"/>
     </target>
 
-    <target name="run-advanced-installer" depends="setup-aip-files">
+    <target name="run-advanced-installer-32" depends="setup-aip-files" if="create32BitInstaller">
         <antcall target="build32"  inheritAll="true" />
-        <antcall target="build64"  inheritAll="true" />
     </target> 
     
-    
+    <target name="run-advanced-installer-64" depends="setup-aip-files" if="create64BitInstaller">
+        <antcall target="build64"  inheritAll="true" />
+    </target> 
+        
     <target name="setup-aip-files" description="Configure the base AIP file and then  make 32- and 64-bit versions.">
         <!-- Copy the template file to add details to -->
         <property name="aip-path-base" value="${nbdist.dir}\installer_${app.name}_base.aip"/>
diff --git a/build.xml b/build.xml
index a3c66ff69c..4312f4eac7 100755
--- a/build.xml
+++ b/build.xml
@@ -254,6 +254,8 @@
     <target name="versioning-script" depends="check-release, versioning-script-if-release, versioning-script-if-not-release"/>
      
     <target name="build-installer" depends="getProps, doxygen, build-zip" description="Builds Autopsy installer.">
+        <property name="create32BitInstaller" value="true"/> <!-- Enables building 32-bit MSI installer -->
+        <property name="create64BitInstaller" value="true"/> <!-- Enables building 64-bit MSI installer -->
         <delete dir="${nbdist.dir}/${app.name}-installer" quiet="true"/>
         <unzip src="${nbdist.dir}/${app.name}-${app.version}.zip" dest="${nbdist.dir}/${app.name}-installer"/>
         <antcall target="build-installer-${os.family}" />