moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 08:18:52 -05:00
Code Issues Releases Wiki Activity

Refactor MSI build (heat, candle, light, F*CK THIS SHIT)

Browse Source
This commit is contained in:
Reinhard Pointner 2018-06-09 14:06:55 +07:00
parent 5425c0f7e2
commit 042b496586
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build.xml
View File

@ -73,21 +73,17 @@
</macrodef> </macrodef>
<!-- deploy release artifacts --> <!-- fetch and unpack JRE bundle -->
<macrodef name="get-java"> <macrodef name="get-windows-jre">
<attribute name="arch" />
<attribute name="src" />
<attribute name="dest" /> <attribute name="dest" />
<sequential> <sequential>
<exec executable="powershell" dir="${dir.cache}" failonerror="yes"> <exec executable="powershell" dir="${dir.cache}" failonerror="yes">
<env key="PROCESSOR_ARCHITECTURE" value="@{arch}" />
<arg line="get-java" /> <arg line="get-java" />
</exec> </exec>
<untar src="${dir.cache}/@{src}" dest="@{dest}" compression="gzip"> <untar src="${dir.cache}/jre-${jre.version}_windows-x64_bin.tar.gz" dest="@{dest}" compression="gzip">
<patternset> <patternset>
<exclude name="**/dtplugin/**" /> <exclude name="**/dtplugin/**" />
<exclude name="**/plugin2/**" /> <exclude name="**/plugin2/**" />
<exclude name="**/jfxwebkit.dll" />
</patternset> </patternset>
<cutdirsmapper dirs="1" /> <cutdirsmapper dirs="1" />
</untar> </untar>
@ -634,19 +630,7 @@
</copy-replace> </copy-replace>
<!-- fetch latest JRE --> <!-- fetch latest JRE -->
<exec executable="powershell" dir="${dir.cache}" failonerror="yes"> <get-windows-jre dest="${dir.staging}/jre" />
<env key="PROCESSOR_ARCHITECTURE" value="${arch.env}" />
<arg line="get-java" />
</exec>
<untar src="${dir.cache}/jre-${jre.version}_windows-${arch.jre}_bin.tar.gz" dest="${dir.staging}/jre" compression="gzip">
<patternset>
<exclude name="**/dtplugin/**" />
<exclude name="**/plugin2/**" />
<exclude name="**/jfxwebkit.dll" />
</patternset>
<cutdirsmapper dirs="1" />
</untar>
<!-- Workaround for VS2013 / CoInitialize hack (see http://mail.openjdk.java.net/pipermail/swing-dev/2018-February/008323.html) --> <!-- Workaround for VS2013 / CoInitialize hack (see http://mail.openjdk.java.net/pipermail/swing-dev/2018-February/008323.html) -->
<delete verbose="yes"> <delete verbose="yes">
@ -679,7 +663,7 @@
<property name="dir.staging" location="${dir.dist}/msi/${arch}" /> <property name="dir.staging" location="${dir.dist}/msi/${arch}" />
<!-- 1. prepare application files for heat harvest --> <!-- 1. prepare application files for heat harvest -->
<get-java arch="${arch.env}" src="jre-${jre.version}_windows-${arch}_bin.tar.gz" dest="${dir.staging}/jre" /> <get-windows-jre dest="${dir.staging}/jre" />
<copy todir="${dir.staging}/jar"> <copy todir="${dir.staging}/jar">
<fileset dir="${dir.dist}/lib" includes="*.jar" /> <fileset dir="${dir.dist}/lib" includes="*.jar" />