moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-11-10 11:25:04 -05:00
Code Issues Releases Wiki Activity

Remove Jar Index (no tangible benefits, but might break Linux deployments where JNA is linked in from the system repository)

Browse Source 
Remove filebot-resources.jar to simplify build, update and deployment
This commit is contained in:
Reinhard Pointner 2019-05-12 17:56:30 +07:00
parent 744f61a291
commit d945aec1e8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@ -264,11 +264,6 @@
<target name="jar" depends="revision"> <target name="jar" depends="revision">
<!-- static resources -->
<jar destfile="${dir.dist}/lib/${package.name}-resources.jar" index="yes" indexMetaInf="yes" compress="no">
<fileset dir="${dir.source}" includes="**/*.png" />
</jar>
<!-- select jar dependencies --> <!-- select jar dependencies -->
<fileset id="jar.classpath" dir="${dir.lib}" includesfile="${dir.lib}/jar.includes" /> <fileset id="jar.classpath" dir="${dir.lib}" includesfile="${dir.lib}/jar.includes" />
@ -295,7 +290,6 @@
<copy todir="${dir.build}" includeemptydirs="no"> <copy todir="${dir.build}" includeemptydirs="no">
<fileset dir="${dir.source}"> <fileset dir="${dir.source}">
<exclude name="**/*.java" /> <exclude name="**/*.java" />
<exclude name="**/*.png" />
<exclude name="**/*.properties" /> <exclude name="**/*.properties" />
</fileset> </fileset>
</copy> </copy>
@ -305,7 +299,7 @@
<fileset dir="${dir.source}" includes="**/*.properties" /> <fileset dir="${dir.source}" includes="**/*.properties" />
</copy-replace> </copy-replace>
<jar destfile="${dir.dist}/lib/${package.name}.jar" index="yes" indexMetaInf="yes" compress="no"> <jar destfile="${dir.dist}/lib/${package.name}.jar" compress="no">
<fileset dir="${dir.build}" /> <fileset dir="${dir.build}" />
<manifest> <manifest>
<attribute name="Main-Class" value="${main.class}" /> <attribute name="Main-Class" value="${main.class}" />

2
lib/jar.groovy
View File

@ -3,7 +3,7 @@ def destfile = { r ->
} }
project.references.'jar.classpath'.each { r -> project.references.'jar.classpath'.each { r ->
ant.jar(destfile: destfile(r), index: 'yes', indexMetaInf: 'yes', compress: 'no') { ant.jar(destfile: destfile(r), compress: 'no') {
zipfileset(src: r) { zipfileset(src: r) {
exclude(name: 'META-INF/MANIFEST.MF') exclude(name: 'META-INF/MANIFEST.MF')
exclude(name: 'META-INF/INDEX.LIST') exclude(name: 'META-INF/INDEX.LIST')