updates to windows build

This commit is contained in:
Greg DiCristofaro 2020-06-11 17:11:22 -04:00
parent 0c57f1a747
commit 51421996d8
2 changed files with 18 additions and 13 deletions

View File

@ -22,21 +22,9 @@
<target name="get-thirdparty-dependencies" description="get third-party dependencies">
<!--Copy photorec to release-->
<var name="photorec-base-src-path" value="${thirdparty.dir}/photorec_exec"/>
<if>
<isset property="jre.home.64" />
<then>
<var name="photorec-src-path" value="${photorec-base-src-path}/64-bit"/>
</then>
<else>
<var name="photorec-src-path" value="${photorec-base-src-path}/32-bit"/>
</else>
</if>
<copy todir="${basedir}/release/photorec_exec" >
<fileset dir="${photorec-src-path}"/>
<fileset dir="${thirdparty.dir}/photorec_exec"/>
</copy>
<!--Copy ewfexport to release-->
<copy todir="${basedir}/release/ewfexport_exec" >
<fileset dir="${thirdparty.dir}/ewfexport_exec"/>

View File

@ -3,6 +3,13 @@
<!-- ADVANCED INSTALLER TARGETS -->
<target name="build-installer-windows" depends="getProps,init-advanced-installer"
description="Makes an installer from the opened ZIP file">
<!-- the path on disk for photorec files -->
<var name="photorec-inst-path" value="${inst-path}\${app.name}\photorec_exec"/>
<!-- the destination in installer for photorec relative to APPDATA -->
<var name="photorec-path" value="${app.name}\photorec_exec"/>
<antcall target="run-advanced-installer-32" inheritAll="true" />
<antcall target="run-advanced-installer-64" inheritAll="true" />
</target>
@ -111,6 +118,8 @@
<var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86_64"/>
<var name="photorec-path-toadd" value="${photorec-inst-path}\32-bit"/>
<var name="jvm.max.mem" value="512m" />
<var name="jre-path" value="${env.JRE_HOME_32}"/>
@ -137,6 +146,8 @@
<var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86"/>
<var name="photorec-path-toadd" value="${photorec-inst-path}\64-bit"/>
<var name="jvm.max.mem" value="4G"/>
<var name="jre-path" value="${env.JRE_HOME_64}"/>
@ -195,6 +206,12 @@
<exec executable="${ai-exe-path}">
<arg line="/edit ${aip-path} /DelFolder APPDIR\${gstreamer-path-todelete}"/>
</exec>
<echo message="Using photorec with correct processor architecture..."/>
<exec executable="${ai-exe-path}">
<arg line="/edit ${aip-path} /DelFolder APPDIR\${photorec-path}"/>
<arg line="/edit ${aip-path} /AddFolder APPDIR\${photorec-path} ${photorec-path-toadd}"/>
</exec>
</target>
<target name="add-file-or-dir">