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

Merge branch 'develop' of github.com:sleuthkit/autopsy into leappFix

Browse Source
This commit is contained in:
Greg DiCristofaro 2023-07-02 20:07:51 -04:00
commit 9d52b1f715
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
build-windows-installer.xml
View File

@ -27,19 +27,6 @@
<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."/> <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> </else>
</if> --> </if> -->
<condition property="jre.home.64">
<isset property="env.JRE_HOME_64"/>
</condition>
<if>
<isset property="jre.home.64" />
<then>
<echo message="64-bit JRE found, 64-bit installer will be built."/>
</then>
<else>
<echo message="64-bit JRE not found. No 64-bit installer will be built. Set the JRE_HOME_64 environment variable to generate a 64-bit installer."/>
</else>
</if>
<property name="lib-rel-path" value="${app.name}\modules\lib" /> <property name="lib-rel-path" value="${app.name}\modules\lib" />
<!-- where libs are in build folder; forward slashes because not used directly by advanced installer --> <!-- where libs are in build folder; forward slashes because not used directly by advanced installer -->
@ -100,14 +87,27 @@
<target name="copyJRE" description="Copy a given JRE to the installation folder"> <target name="copyJRE" description="Copy a given JRE to the installation folder">
<var name="new-jre-path" value="${inst-path}\jre"/> <property environment="env"/>
<delete failonerror="false" dir="${new-jre-path}"/> <if>
<mkdir dir="${new-jre-path}"/> <isset property="env.JDK_HOME" />
<copy todir="${new-jre-path}" overwrite="true"> <then>
<fileset dir="${jre-path}"> <echo message="JDK found at: ${env.JDK_HOME}."/>
<include name="**/*"/> </then>
</fileset> <else>
</copy> <fail message="Environment variable, JDK_HOME, not set. Cannot build installer."/>
</else>
</if>
<exec executable="${env.JDK_HOME}/bin/jlink" dir="${inst-path}">
<arg value="--add-modules"/>
<arg value="ALL-MODULE-PATH"/>
<arg value="--output"/>
<arg value="jre"/>
<arg value="--no-man-pages"/>
<arg value="--no-header-files"/>
<arg value="--compress=2"/>
</exec>
</target> </target>
@ -140,7 +140,7 @@
<target name="build64" if="jre.home.64" description="Builds the 64 bit installer IF JRE_HOME_64 is set."> <target name="build64" description="Builds the 64 bit installer IF JRE_HOME_64 is set.">
<property environment="env"/> <property environment="env"/>
<var name="aip-path" value="${aip-path-64}"/> <var name="aip-path" value="${aip-path-64}"/>