1
0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 16:28:51 -05:00

Don't use fatjar in MAS build to help with incremental auto-updates

This commit is contained in:
Reinhard Pointner 2017-03-06 13:55:52 +08:00
parent 6ab3c946c3
commit 064f310877

View File

@ -122,7 +122,7 @@
<target name="jar" depends="build"> <target name="jar" depends="build">
<jar destfile="${dir.dist}/filebot.jar"> <jar destfile="${dir.dist}/lib/filebot.jar">
<fileset dir="${dir.build}" /> <fileset dir="${dir.build}" />
<manifest> <manifest>
<attribute name="Build-Date" value="${tstamp.date}" /> <attribute name="Build-Date" value="${tstamp.date}" />
@ -136,7 +136,7 @@
<target name="fatjar" depends="jar" description="Build executable jar"> <target name="fatjar" depends="jar" description="Build executable jar">
<jar destfile="${path.fatjar}" filesetmanifest="merge" duplicate="fail" compress="no"> <jar destfile="${path.fatjar}" filesetmanifest="merge" duplicate="fail" compress="no">
<!-- include main jar --> <!-- include main jar -->
<zipfileset src="${dir.dist}/filebot.jar" /> <zipfileset src="${dir.dist}/lib/filebot.jar" />
<!-- include core libraries --> <!-- include core libraries -->
<zipfileset src="${dir.dist}/lib/args4j.jar"> <zipfileset src="${dir.dist}/lib/args4j.jar">
@ -413,7 +413,7 @@
<bundleapp jvmrequired="${jvm.version}" minimumsystemversion="${mac.version}" outputdirectory="${dir.dist}" executablename="${application.executable}" name="${application.name}" displayname="${application.name}" version="${revision}" shortversion="${version}" identifier="${application.identifier}" mainclassname="${main.class}" icon="${application.icon}" copyright="${tstamp.year} ${package.company}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true"> <bundleapp jvmrequired="${jvm.version}" minimumsystemversion="${mac.version}" outputdirectory="${dir.dist}" executablename="${application.executable}" name="${application.name}" displayname="${application.name}" version="${revision}" shortversion="${version}" identifier="${application.identifier}" mainclassname="${main.class}" icon="${application.icon}" copyright="${tstamp.year} ${package.company}" applicationcategory="${mac.application.category}" highresolutioncapable="true" supportsautomaticgraphicsswitching="true" debug="true">
<classpath file="${path.fatjar}" /> <classpath dir="${dir.dist}/lib" />
<librarypath dir="${dir.lib}/native/mac-x86_64" /> <librarypath dir="${dir.lib}/native/mac-x86_64" />
<arch name="x86_64" /> <arch name="x86_64" />