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

Fix jre path

Browse Source
This commit is contained in:
Jeff Wallace 2013-10-15 15:36:59 -04:00
parent 7ef76a332b
commit 02ecf0c800
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build-windows.xml
View File

@ -145,7 +145,7 @@
<propertyfile file="${inst.property.file}"> <propertyfile file="${inst.property.file}">
<!-- Note: can be higher on 64 bit systems, should be in sync with project.properties --> <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
<entry key="default_options" value="@JVM_OPTIONS" /> <entry key="default_options" value="@JVM_OPTIONS" />
<entry key="jdkhome" value="&quot;jre7&quot;" /> <entry key="jdkhome" value="&quot;jre&quot;" />
</propertyfile> </propertyfile>
<!-- workaround for ant escaping : and = when setting properties --> <!-- workaround for ant escaping : and = when setting properties -->
<replace file="${inst.property.file}" token="@JVM_OPTIONS" value="${jvm.args}" /> <replace file="${inst.property.file}" token="@JVM_OPTIONS" value="${jvm.args}" />
@ -183,10 +183,17 @@
</target> </target>
<target name="add-ai-jre" description="Adds JRE to Advanced Installer project"> <target name="add-ai-jre" description="Adds JRE to Advanced Installer project">
<var name="new-jre-path" value="${inst-path}/jre"/>
<mkdir dir="${new-jre-path}"/>
<copy todir="${new-jre-path}" >
<fileset dir="&quot;${jre-path}&quot;">
<include name="**"/>
</fileset>
</copy>
<echo message="${ai-exe-path}" /> <echo message="${ai-exe-path}" />
<echo message="Adding JRE to installer: ${jre-path}"/> <echo message="Adding JRE to installer: ${jre-path}"/>
<exec executable="${ai-exe-path}"> <exec executable="${ai-exe-path}">
<arg line="/edit ${aip-path} /AddFolder APPDIR &quot;${jre-path}&quot;" /> <arg line="/edit ${aip-path} /AddFolder APPDIR &quot;${new-jre-path}&quot;" />
</exec> </exec>
</target> </target>