mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-08 22:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deletion of Gstreamer binaries was not right so now just remove them from installer.

Browse Source
This commit is contained in:
esaunders 2019-04-01 17:15:00 -04:00
parent 04e0c6e678
commit 65a80f7042
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build-windows-installer.xml
View File

@ -109,6 +109,8 @@
<var name="aut-bin-name-todelete" value="${app.name}64.exe"/> <var name="aut-bin-name-todelete" value="${app.name}64.exe"/>
<var name="aut-bin-name" value="${app.name}.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="jvm.max.mem" value="512m" /> <var name="jvm.max.mem" value="512m" />
<var name="jre-path" value="${env.JRE_HOME_32}"/> <var name="jre-path" value="${env.JRE_HOME_32}"/>
@ -118,12 +120,6 @@
<arg line="/edit ${aip-path-base} /SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][ProductName]-${app.version}"/> <arg line="/edit ${aip-path-base} /SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][ProductName]-${app.version}"/>
</exec> </exec>
<!-- Delete the 64 bit version of gstreamer since its not needed by the 32 bit installer -->
<var name="gstreamer-relative-path" value="gstreamer/1.0/x86_64"/>
<delete includeEmptyDirs="true">
<fileset dir="${inst-path}/${app.name}/${gstreamer-relative-path}"/>
</delete>
<antcall target="ai-build" inheritAll="true" /> <antcall target="ai-build" inheritAll="true" />
<delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/> <delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/>
@ -139,6 +135,8 @@
<var name="aut-bin-name" value="${app.name}64.exe"/> <var name="aut-bin-name" value="${app.name}64.exe"/>
<var name="aut-bin-name-todelete" value="${app.name}.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="jvm.max.mem" value="4G"/> <var name="jvm.max.mem" value="4G"/>
<var name="jre-path" value="${env.JRE_HOME_64}"/> <var name="jre-path" value="${env.JRE_HOME_64}"/>
@ -153,12 +151,6 @@
<arg line="/edit ${aip-path} /SetPackageType x64"/> <arg line="/edit ${aip-path} /SetPackageType x64"/>
</exec> </exec>
<!-- Delete the 32 bit version of gstreamer since its not needed by the 64 bit installer -->
<var name="gstreamer-relative-path" value="gstreamer/1.0/x86"/>
<delete includeEmptyDirs="true">
<fileset dir="${inst-path}/${app.name}/${gstreamer-relative-path}"/>
</delete>
<antcall target="ai-build" inheritAll="true" /> <antcall target="ai-build" inheritAll="true" />
<delete dir="${nbdist.dir}/installer_${app.name}_64-cache"/> <delete dir="${nbdist.dir}/installer_${app.name}_64-cache"/>
@ -198,6 +190,11 @@
<exec executable="${ai-exe-path}"> <exec executable="${ai-exe-path}">
<arg line="/edit ${aip-path} /DelFile APPDIR\bin\${aut-bin-name-todelete}"/> <arg line="/edit ${aip-path} /DelFile APPDIR\bin\${aut-bin-name-todelete}"/>
</exec> </exec>
<echo message="Removing extra Gstreamer binaries..."/>
<exec executable="${ai-exe-path}">
<arg line="/edit ${aip-path} /DelFolder APPDIR\${gstreamer-path-todelete}"/>
</exec>
</target> </target>
<target name="add-file-or-dir"> <target name="add-file-or-dir">