Control 32 and 64-bit MSI builds.

This commit is contained in:
Karl Mortensen 2015-12-01 11:18:57 -05:00
parent 1b7d7052ee
commit 6fb4086689
2 changed files with 13 additions and 8 deletions

View File

@ -3,11 +3,12 @@
<!-- ADVANCED INSTALLER TARGETS --> <!-- ADVANCED INSTALLER TARGETS -->
<target name="build-installer-windows" depends="getProps,init-advanced-installer" <target name="build-installer-windows" depends="getProps,init-advanced-installer"
description="Makes an installer from the opened ZIP file"> 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>
<target name="init-advanced-installer" depends="autoAIPath,inputAIPath" <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."/> <fail unless="ai-exe-path" message="Could not locate Advanced Installer."/>
<property environment="env"/> <property environment="env"/>
@ -44,22 +45,24 @@
<target name="autoAIPath" description="Attempt to find the AI path based on standard installation location"> <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" /> <property name="AI.path" value="C:\Program Files (x86)\Caphyon\Advanced Installer 10.3\bin\x86\AdvancedInstaller.com" />
<available file="${AI.path}" <available file="${AI.path}"
property="ai-exe-path" property="ai-exe-path"
value="${AI.path}"/> value="${AI.path}"/>
<echo message="${ai-exe-path}" /> <echo message="${ai-exe-path}" />
</target> </target>
<target name="inputAIPath" unless="ai-exe-path" description="Have the user input the path to the AI executable"> <target name="inputAIPath" unless="ai-exe-path" description="Have the user input the path to the AI executable">
<input addProperty="ai-exe-path" <input addProperty="ai-exe-path"
message="Enter the location of AdvancedInstaller.com"/> message="Enter the location of AdvancedInstaller.com"/>
</target> </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="build32" inheritAll="true" />
<antcall target="build64" inheritAll="true" />
</target> </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."> <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 --> <!-- Copy the template file to add details to -->
<property name="aip-path-base" value="${nbdist.dir}\installer_${app.name}_base.aip"/> <property name="aip-path-base" value="${nbdist.dir}\installer_${app.name}_base.aip"/>

View File

@ -254,6 +254,8 @@
<target name="versioning-script" depends="check-release, versioning-script-if-release, versioning-script-if-not-release"/> <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."> <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"/> <delete dir="${nbdist.dir}/${app.name}-installer" quiet="true"/>
<unzip src="${nbdist.dir}/${app.name}-${app.version}.zip" dest="${nbdist.dir}/${app.name}-installer"/> <unzip src="${nbdist.dir}/${app.name}-${app.version}.zip" dest="${nbdist.dir}/${app.name}-installer"/>
<antcall target="build-installer-${os.family}" /> <antcall target="build-installer-${os.family}" />