mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-06 12:50:22 +00:00
remove 32 bit installer
This commit is contained in:
Greg DiCristofaro
parent
ce8581ced0
commit
1d4f66c9d7
@ -3,7 +3,7 @@
|
||||
<!-- 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-32" inheritAll="true" />
|
||||
<!-- <antcall target="run-advanced-installer-32" inheritAll="true" /> -->
|
||||
<antcall target="run-advanced-installer-64" inheritAll="true" />
|
||||
</target>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<property name="inst-path" value="${nbdist.dir}\${app.name}-installer"/>
|
||||
|
||||
<!-- see what JREs they have installed -->
|
||||
<condition property="jre.home.32">
|
||||
<!-- <condition property="jre.home.32">
|
||||
<isset property="env.JRE_HOME_32"/>
|
||||
</condition>
|
||||
<if>
|
||||
@ -26,7 +26,7 @@
|
||||
<else>
|
||||
<echo message="32-bit JRE not found. No 32-bit installer will be built. Set the JRE_HOME_32 environment variable to generate a 32-bit installer."/>
|
||||
</else>
|
||||
</if>
|
||||
</if> -->
|
||||
|
||||
<condition property="jre.home.64">
|
||||
<isset property="env.JRE_HOME_64"/>
|
||||
@ -60,9 +60,9 @@
|
||||
message="Enter the location of AdvancedInstaller.com"/>
|
||||
</target>
|
||||
|
||||
<target name="run-advanced-installer-32" depends="setup-aip-files" unless="DoNotCreate32BitInstaller">
|
||||
<!-- <target name="run-advanced-installer-32" depends="setup-aip-files" unless="DoNotCreate32BitInstaller">
|
||||
<antcall target="build32" inheritAll="true" />
|
||||
</target>
|
||||
</target> -->
|
||||
|
||||
<target name="run-advanced-installer-64" depends="setup-aip-files" unless="DoNotCreate64BitInstaller">
|
||||
<antcall target="build64" inheritAll="true" />
|
||||
@ -87,8 +87,8 @@
|
||||
match="ProductVersion" Value="\d+\.{1}\d+\.{1}\d+"
|
||||
replace="ProductVersion" Value="${app.version}" />
|
||||
|
||||
<property name="aip-path-32" value="${nbdist.dir}\installer_${app.name}_32.aip"/>
|
||||
<copy file="${aip-path-base}" tofile="${aip-path-32}" overwrite="true"/>
|
||||
<!-- <property name="aip-path-32" value="${nbdist.dir}\installer_${app.name}_32.aip"/>
|
||||
<copy file="${aip-path-base}" tofile="${aip-path-32}" overwrite="true"/> -->
|
||||
|
||||
<property name="aip-path-64" value="${nbdist.dir}\installer_${app.name}_64.aip"/>
|
||||
<copy file="${aip-path-base}" tofile="${aip-path-64}" overwrite="true"/>
|
||||
@ -107,17 +107,17 @@
|
||||
</target>
|
||||
|
||||
|
||||
<target name="build32" if="jre.home.32" description="Builds the 32 bit installer IF JRE_HOME_32 is set.">
|
||||
<!-- <target name="build32" if="jre.home.32" description="Builds the 32 bit installer IF JRE_HOME_32 is set.">
|
||||
<property environment="env"/>
|
||||
<var name="aip-path" value="${aip-path-32}"/>
|
||||
|
||||
<var name="aut-bin-name-todelete" value="${app.name}64.exe"/>
|
||||
<var name="aut-bin-name" value="${app.name}.exe"/>
|
||||
|
||||
<var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86_64"/>
|
||||
<var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86_64"/> -->
|
||||
|
||||
<!-- The path to the correct version of photorec to use. -->
|
||||
<var name="photorec-path-to-use" value="${photorec-inst-path}\bin"/>
|
||||
<!-- <var name="photorec-path-to-use" value="${photorec-inst-path}\bin"/>
|
||||
|
||||
<var name="jvm.max.mem" value="512m" />
|
||||
|
||||
@ -132,7 +132,7 @@
|
||||
|
||||
<delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/>
|
||||
<move file="${nbdist.dir}/installer_${app.name}_32-SetupFiles/installer_${app.name}_32.msi" tofile="${nbdist.dir}/${app.name}-${app.version}-32bit.msi" />
|
||||
</target>
|
||||
</target> -->
|
||||
|
||||
|
||||
|
||||
@ -143,7 +143,12 @@
|
||||
<var name="aut-bin-name" value="${app.name}64.exe"/>
|
||||
<var name="aut-bin-name-todelete" value="${app.name}.exe"/>
|
||||
|
||||
<var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86"/>
|
||||
<var name="gstreamer-path-todelete" value="autopsy\gstreamer\1.0\x86"/>
|
||||
<!-- only keep amd64,x86_64 -->
|
||||
<var name="libs-to-delete" value="i386,i586,i686,ia64,x86"/>
|
||||
|
||||
<var name="ewfexport-path-todelete" value="autopsy\ewfexport_exec\32-bit"/>
|
||||
<var name="plaso-path-todelete" value="autopsy\plaso\plaso-20180818-Win32"/>
|
||||
|
||||
<!-- The path to the correct version of photorec to use. -->
|
||||
<var name="photorec-path-to-use" value="${photorec-inst-path}\64-bit\bin"/>
|
||||
@ -196,7 +201,8 @@
|
||||
</dirset>
|
||||
</path>
|
||||
</foreach>
|
||||
|
||||
|
||||
|
||||
<echo message="Removing extra Autopsy executable..."/>
|
||||
<exec executable="${ai-exe-path}">
|
||||
<arg line="/edit ${aip-path} /DelFile APPDIR\bin\${aut-bin-name-todelete}"/>
|
||||
@ -216,6 +222,27 @@
|
||||
<exec executable="${ai-exe-path}">
|
||||
<arg line="/edit ${aip-path} /AddFolder APPDIR\${photorec-rel-path} ${photorec-path-to-use}"/>
|
||||
</exec>
|
||||
|
||||
|
||||
<echo message="Removing extra ewfexport_exec binaries..."/>
|
||||
<exec executable="${ai-exe-path}">
|
||||
<arg line="/edit ${aip-path} /DelFolder APPDIR\${ewfexport-path-todelete}"/>
|
||||
</exec>
|
||||
|
||||
<echo message="Removing extra plaso binaries..."/>
|
||||
<exec executable="${ai-exe-path}">
|
||||
<arg line="/edit ${aip-path} /DelFolder APPDIR\${plaso-path-todelete}"/>
|
||||
</exec>
|
||||
|
||||
<property name="base-lib-folder" value="autopsy\modules\lib" />
|
||||
<echo message="Removing extra module lib binaries..."/>
|
||||
<for list="${libs-to-delete}" param="lib-to-delete">
|
||||
<sequential>
|
||||
<exec executable="${ai-exe-path}">
|
||||
<arg line="/edit ${aip-path} /DelFolder APPDIR\${base-lib-folder}\@{lib-to-delete}"/>
|
||||
</exec>
|
||||
</sequential>
|
||||
</for>
|
||||
</target>
|
||||
|
||||
<target name="add-file-or-dir">
|
||||
|
||||
@ -25,10 +25,10 @@
|
||||
<property environment="env"/>
|
||||
<property name="tskLogicalImager.path" value="${env.TSK_HOME}/win32/Release_NoLibs/tsk_logical_imager.exe" />
|
||||
<property name="win64.TskLib.path" value="${env.TSK_HOME}/win32/x64/Release"/>
|
||||
<property name="win32.TskLib.path" value="${env.TSK_HOME}/win32/Release" />
|
||||
<!-- <property name="win32.TskLib.path" value="${env.TSK_HOME}/win32/Release" /> -->
|
||||
<available property="tskLogicalImager.exists" type="file" file="${tskLogicalImager.path}" />
|
||||
<available property="win64.TskLib.exists" type="dir" file="${win64.TskLib.path}" />
|
||||
<available property="win32.TskLib.exists" type="dir" file="${win32.TskLib.path}" />
|
||||
<!-- <available property="win32.TskLib.exists" type="dir" file="${win32.TskLib.path}" /> -->
|
||||
</target>
|
||||
|
||||
<!-- The following copy the libtsk_jni dependencies to the Autopsy
|
||||
@ -51,7 +51,7 @@
|
||||
</target>
|
||||
|
||||
<!-- copy 32-bit dlls into the installer folder -->
|
||||
<target name="copyWinTskLibs32ToBaseDir" if="win32.TskLib.exists">
|
||||
<!-- <target name="copyWinTskLibs32ToBaseDir" if="win32.TskLib.exists">
|
||||
<fileset dir="${win32.TskLib.path}" id="win32dlls">
|
||||
<include name="*.dll" />
|
||||
<exclude name="libtsk_jni.dll"/>
|
||||
@ -72,7 +72,7 @@
|
||||
<copy todir="${i686}" overwrite="true">
|
||||
<fileset refid="win32dlls" />
|
||||
</copy>
|
||||
</target>
|
||||
</target> -->
|
||||
|
||||
<target name="copyTskLogicalImager" if="tskLogicalImager.exists">
|
||||
<fileset file="${tskLogicalImager.path}" id="tskLogicalImager" />
|
||||
@ -85,7 +85,7 @@
|
||||
<!-- This gets called from the main build.xml -->
|
||||
<target name="copyLibsToBaseDir" depends="checkTskLibDirs" description="Copy windows dlls to the correct location." >
|
||||
<antcall target="makeBaseLibDirs" inheritRefs="true" />
|
||||
<antcall target="copyWinTskLibs32ToBaseDir" inheritRefs="true" />
|
||||
<!-- <antcall target="copyWinTskLibs32ToBaseDir" inheritRefs="true" /> -->
|
||||
<antcall target="copyWinTskLibs64ToBaseDir" inheritRefs="true" />
|
||||
<antcall target="copyTskLogicalImager" inheritRefs="true" />
|
||||
</target>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user