From c6be5764cfd17ee85fe4adffe340da6c7b4e1722 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Thu, 14 Jun 2018 13:55:07 +0700
Subject: [PATCH] Update build file

---
 build.xml | 185 ++----------------------------------------------------
 1 file changed, 4 insertions(+), 181 deletions(-)

diff --git a/build.xml b/build.xml
index 648e0198..92848ff6 100644
--- a/build.xml
+++ b/build.xml
@@ -214,183 +214,6 @@
 	</target>
 
 
-	<target name="fatjar" depends="jar" description="Build executable jar">
-		<jar destfile="${path.fatjar}" filesetmanifest="merge" duplicate="fail">
-			<!-- include main jar -->
-			<zipfileset src="${dir.dist}/lib/filebot.jar" />
-
-			<!-- include core libraries -->
-			<zipfileset src="${dir.dist}/lib/args4j.jar">
-				<include name="org/kohsuke/args4j/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/ehcache.jar">
-				<include name="META-INF/services/**" />
-				<include name="net/sf/ehcache/**" />
-				<include name="org/terracotta/**" />
-				<include name="ehcache-failsafe.xml" />
-				<include name="build-info.properties" />
-			</zipfileset>
-
-			<!-- include UI libraries -->
-			<zipfileset src="${dir.dist}/lib/miglayout-core.jar">
-				<include name="net/miginfocom/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/miglayout-swing.jar">
-				<include name="net/miginfocom/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/glazedlists_java16.jar">
-				<include name="ca/odell/glazedlists/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/controlsfx.jar">
-				<include name="org/controlsfx/dialog/**" />
-				<include name="impl/org/controlsfx/i18n/**" />
-				<include name="controlsfx.properties" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/rsyntaxtextarea.jar">
-				<include name="org/fife/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/lanterna.jar">
-				<include name="com/googlecode/lanterna/**" />
-				<include name="**/*.properties" />
-			</zipfileset>
-
-			<!-- include IO libraries -->
-			<zipfileset src="${dir.dist}/lib/xz.jar">
-				<include name="org/tukaani/xz/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/json-io.jar">
-				<include name="com/cedarsoftware/util/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/xmlrpc.jar">
-				<include name="redstone/xmlrpc/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/sevenzipjbinding.jar">
-				<include name="net/sf/sevenzipjbinding/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/commons-io.jar">
-				<include name="org/apache/commons/io/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/commons-vfs2.jar">
-				<include name="org/apache/commons/vfs2/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/junrar.jar">
-				<include name="com/github/junrar/**" />
-			</zipfileset>
-
-			<!-- include native libraries -->
-			<zipfileset src="${dir.dist}/lib/ObjCBridge.jar">
-				<include name="ca/weblite/**" />
-				<include name="com/sun/jna/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/jna.jar">
-				<include name="com/sun/jna/**" />
-
-				<!-- exclude native libraries -->
-				<exclude name="**/*.a" />
-				<exclude name="**/*.so" />
-				<exclude name="**/*.dll" />
-				<exclude name="**/*.dylib" />
-				<exclude name="**/*.jnilib" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/jna-platform.jar">
-				<include name="com/sun/jna/platform/**" />
-			</zipfileset>
-
-			<!-- include extra libraries -->
-			<zipfileset src="${dir.dist}/lib/guava.jar">
-				<include name="com/google/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/streamex.jar">
-				<include name="one/util/streamex/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/icu4j.jar">
-				<include name="com/ibm/icu/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/simmetrics.jar">
-				<include name="uk/ac/shef/wit/simmetrics/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/language-detector.jar">
-				<include name="be/frma/langguess/**" />
-				<include name="com/cybozu/labs/langdetect/**" />
-				<include name="com/optimaize/langdetect/**" />
-				<include name="languages/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/metadata-extractor.jar">
-				<include name="com/drew/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/xmpcore.jar">
-				<include name="com/adobe/xmp/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/jacksum.jar">
-				<include name="jonelo/jacksum/adapt/**" />
-				<include name="jonelo/jacksum/algorithm/**" />
-				<include name="jonelo/sugar/util/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/commons-logging.jar">
-				<include name="org/apache/commons/logging/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/slf4j-api.jar">
-				<include name="org/slf4j/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/slf4j-jdk14.jar">
-				<include name="org/slf4j/**" />
-			</zipfileset>
-
-			<!-- include Groovy libraries -->
-			<zipfileset src="${dir.dist}/lib/groovy.jar">
-				<include name="groovy*/**" />
-				<include name="org/codehaus/groovy/**" />
-				<include name="META-INF/dgminfo" />
-				<include name="META-INF/services/**" />
-				<include name="META-INF/*.properties" />
-
-				<!-- filebot already includes it's own extension modules -->
-				<exclude name="META-INF/services/org.codehaus.groovy.runtime.ExtensionModule" />
-			</zipfileset>
-
-			<!-- Ivy for @Grapes automatic dependency management -->
-			<zipfileset src="${dir.dist}/lib/ivy.jar">
-				<include name="org/apache/ivy/**" />
-			</zipfileset>
-
-			<!-- libraries used in external scripts -->
-			<zipfileset src="${dir.dist}/lib/jsoup.jar">
-				<include name="org/jsoup/**" />
-			</zipfileset>
-
-			<!-- AntBuilder including dependencies for ant-javamail, ant-commons-net and ant-jsch -->
-			<zipfileset src="${dir.dist}/lib/ant.jar">
-				<include name="org/apache/tools/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/ant-launcher.jar">
-				<include name="org/apache/tools/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/ant-commons-net.jar">
-				<include name="org/apache/tools/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/ant-jsch.jar">
-				<include name="org/apache/tools/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/ant-javamail.jar">
-				<include name="org/apache/tools/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/commons-net.jar">
-				<include name="org/apache/commons/net/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/jsch.jar">
-				<include name="com/jcraft/jsch/**" />
-			</zipfileset>
-			<zipfileset src="${dir.dist}/lib/javax.mail.jar">
-				<include name="javax/mail/**" />
-				<include name="com/sun/mail/**" />
-				<include name="META-INF/*mail*" />
-			</zipfileset>
-		</jar>
-	</target>
-
-
-
-
 	<target name="appbundle-maspkg-core">
 		<antcall target="appbundle-maspkg">
 			<param name="application.name" value="FileBot" />
@@ -559,7 +382,7 @@
 	</target>
 
 
-	<target name="app" depends="revision">
+	<target name="app" depends="revision" description="Build Mac app package">
 		<property name="dir.staging" location="${dir.dist}/app" />
 
 		<copy-replace todir="${dir.staging}/bin">
@@ -677,7 +500,7 @@
 	</target>
 
 
-	<target name="deb" description="Build Debian Linux packages" depends="revision">
+	<target name="deb" description="Build Debian Linux package" depends="revision">
 		<antcall target="deb-arch">
 			<param name="arch" value="amd64" />
 			<param name="deb.arch" value="amd64" />
@@ -778,7 +601,7 @@
 	</target>
 
 
-	<target name="msi" description="Build Windows Installer packages" depends="revision">
+	<target name="msi" description="Build Windows Installer package" depends="revision">
 		<property name="dir.staging" location="${dir.dist}/msi/x64" />
 
 		<!-- 1. prepare application files for heat harvest -->
@@ -964,7 +787,7 @@
 	</target>
 
 
-	<target name="clean" description="Delete build folders">
+	<target name="clean" description="Delete build artifacts">
 		<delete dir="${dir.dist}" />
 		<delete dir="${dir.build}" />
 	</target>