From 63485c788e88ca30b0a841bc2dc99014899914f8 Mon Sep 17 00:00:00 2001
From: Florian Kohlmayer <kohlmayer@gmail.com>
Date: Sat, 10 May 2014 15:59:49 +0200
Subject: [PATCH] Cleanup build file

---
 build.xml | 436 ++++++++++++++----------------------------------------
 1 file changed, 108 insertions(+), 328 deletions(-)

diff --git a/build.xml b/build.xml
index f3a601a9a0..72b6e3e875 100644
--- a/build.xml
+++ b/build.xml
@@ -3,18 +3,63 @@
 
     <description>Builds, tests, and runs the project.</description>
 
+    <!-- defines the version number -->
+    <property name="arx.version" value="2.1.1" />
+
+
+    <!-- defines the to be included libraries -->
+    <fileset id="lib.jars" dir="lib">
+        <or>
+            <filename name="**/colt-1.2.0.jar" />
+            <filename name="**/commons-math3-3.1.1.jar" />
+            <filename name="**/Jama-1.0.2.jar" />
+            <filename name="**/objectselector-0.1-lib.jar" />
+            <filename name="**/commons-io-2.4.jar" />
+            <filename name="**/mysql-connector-java-5.1.27-bin.jar" />
+            <filename name="**/commons-codec-1.5.jar" />
+            <filename name="**/commons-logging-1.1.jar" />
+            <filename name="**/dom4j-1.6.1.jar" />
+            <filename name="**/stax-api-1.0.1.jar" />
+            <filename name="**/xmlbeans-2.3.0.jar" />
+            <filename name="**/poi-3.10-FINAL-20140208.jar" />
+            <filename name="**/poi-ooxml-3.10-FINAL-20140208.jar" />
+            <filename name="**/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
+            <filename name="**/postgresql-9.3-1101.jdbc41.jar" />
+            <filename name="**/sqlite-jdbc-3.7.2.jar" />
+        </or>
+    </fileset>
+
+
+    <fileset id="gui.jars" dir="lib">
+        <or>
+            <filename name="**/commons-lang-2.6.jar" />
+            <filename name="**/org.eclipse.draw2d_3.8.1.201301141834.jar" />
+            <filename name="**/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" />
+            <filename name="**/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" />
+            <filename name="**/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" />
+            <filename name="**/org.eclipse.jface_3.8.102.v20130123-162658.jar" />
+            <filename name="**/junit-4.11.jar" />
+            <filename name="**/log4j-1.2.17.jar" />
+            <filename name="**/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" />
+            <filename name="**/org.swtchart_0.8.0.v20120301.jar" />
+        </or>
+    </fileset>
+
+
     <target name="release" depends="jars">
     </target>
 
     <target name="clean">
         <delete dir="build/lib" failonerror="true" />
         <delete dir="build/gui" failonerror="true" />
+        <delete dir="build/extLibs" failonerror="true" />
         <delete dir="build" failonerror="true" />
         <delete dir="jars" failonerror="true" />
     </target>
 
     <target name="prepare" depends="clean">
         <mkdir dir="build" />
+        <mkdir dir="build/extLibs" />
         <mkdir dir="build/lib" />
         <mkdir dir="build/gui" />
         <mkdir dir="jars" />
@@ -39,24 +84,9 @@
     </target>
 
     <target name="javadoc-api" depends="clean-javadoc">
-        <javadoc overview="doc/overview-api.html" destdir="doc/api" source="1.7" notree="false" nonavbar="false" noindex="false" splitindex="true" access="public" use="true" author="Florian Kohlmayer and Fabian Praßer" version="2.1" windowtitle="ARX API Documentation" private="false" failonerror="true">
+        <javadoc overview="doc/overview-api.html" destdir="doc/api" source="1.7" notree="false" nonavbar="false" noindex="false" splitindex="true" access="public" use="true" author="Florian Kohlmayer and Fabian Praßer" version="${arx.version}" windowtitle="ARX API Documentation" private="false" failonerror="true">
             <classpath>
-            	<path path="lib/commons/commons-io-2.4.jar" />
-                <path path="lib/colt/colt-1.2.0.jar" />
-                <path path="lib/commons/commons-math3-3.1.1.jar"/>
-            	<path path="lib/jama/Jama-1.0.2.jar"/>
-            	<path path="lib/objectselector/objectselector-0.1-lib.jar"/>
-                <path path="lib/mysql/mysql-connector-java-5.1.27-bin.jar" />
-                <path path="lib/poi/lib/commons-codec-1.5.jar" />
-                <path path="lib/poi/lib/commons-logging-1.1.jar" />
-                <path path="lib/poi/ooxml-lib/dom4j-1.6.1.jar" />
-                <path path="lib/poi/ooxml-lib/stax-api-1.0.1.jar" />
-                <path path="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" />
-                <path path="lib/poi/poi-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
-                <path path="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" />
-                <path path="lib/sqlite/sqlite-jdbc-3.7.2.jar" />
+                <fileset refid="lib.jars" />
                 <path path="src/main" />
             </classpath>
 
@@ -69,24 +99,9 @@
     </target>
 
     <target name="javadoc-dev" depends="clean-javadoc">
-        <javadoc overview="doc/overview-dev.html" destdir="doc/dev" source="1.7" notree="false" use="true" nonavbar="false" noindex="false" splitindex="false" author="Florian Kohlmayer and Fabian Praßer" version="2.1" windowtitle="ARX Developer Documentation" private="false" failonerror="true">
+        <javadoc overview="doc/overview-dev.html" destdir="doc/dev" source="1.7" notree="false" use="true" nonavbar="false" noindex="false" splitindex="false" author="Florian Kohlmayer and Fabian Praßer" version="${arx.version}" windowtitle="ARX Developer Documentation" private="false" failonerror="true">
             <classpath>
-            	<path path="lib/commons/commons-io-2.4.jar" />
-                <path path="lib/colt/colt-1.2.0.jar" />
-				<path path="lib/commons/commons-math3-3.1.1.jar"/>
-            	<path path="lib/jama/Jama-1.0.2.jar"/>
-            	<path path="lib/objectselector/objectselector-0.1-lib.jar"/>
-                <path path="lib/mysql/mysql-connector-java-5.1.27-bin.jar" />
-                <path path="lib/poi/lib/commons-codec-1.5.jar" />
-                <path path="lib/poi/lib/commons-logging-1.1.jar" />
-                <path path="lib/poi/ooxml-lib/dom4j-1.6.1.jar" />
-                <path path="lib/poi/ooxml-lib/stax-api-1.0.1.jar" />
-                <path path="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" />
-                <path path="lib/poi/poi-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
-                <path path="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" />
-                <path path="lib/sqlite/sqlite-jdbc-3.7.2.jar" />
+                <fileset refid="lib.jars" />
                 <path path="src/main" />
             </classpath>
 
@@ -98,35 +113,11 @@
 
 
     <target name="javadoc-gui" depends="clean-javadoc">
-        <javadoc overview="doc/overview-gui.html" destdir="doc/gui" source="1.7" notree="false" use="true" nonavbar="false" noindex="false" splitindex="false" author="Florian Kohlmayer and Fabian Praßer" version="2.1" windowtitle="ARX GUI Documentation" private="false" failonerror="true">
+        <javadoc overview="doc/overview-gui.html" destdir="doc/gui" source="1.7" notree="false" use="true" nonavbar="false" noindex="false" splitindex="false" author="Florian Kohlmayer and Fabian Praßer" version="${arx.version}" windowtitle="ARX GUI Documentation" private="false" failonerror="true">
             <classpath>
-                <path path="lib/colt/colt-1.2.0.jar" />
-                <path path="lib/commons/commons-io-2.4.jar" />
-                <path path="lib/commons/commons-lang-2.6.jar" />
-                <path path="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" />
-                <path path="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" />
-                <path path="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" />
-                <path path="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" />
-                <path path="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" />
-                <path path="lib/junit/junit-4.11.jar" />
-                <path path="lib/log4j/log4j-1.2.17.jar" />
-                <path path="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" />
-                <path path="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" />
-                <path path="lib/commons/commons-math3-3.1.1.jar"/>
-            	<path path="lib/jama/Jama-1.0.2.jar"/>
+                <fileset refid="lib.jars" />
+                <fileset refid="gui.jars" />
                 <path path="lib/swt/swt-4.2.1-gtk-linux-x86.jar" />
-				<path path="lib/objectselector/objectselector-0.1-lib.jar"/>
-                <path path="lib/mysql/mysql-connector-java-5.1.27-bin.jar" />
-                <path path="lib/poi/lib/commons-codec-1.5.jar" />
-                <path path="lib/poi/lib/commons-logging-1.1.jar" />
-                <path path="lib/poi/ooxml-lib/dom4j-1.6.1.jar" />
-                <path path="lib/poi/ooxml-lib/stax-api-1.0.1.jar" />
-                <path path="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" />
-                <path path="lib/poi/poi-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
-                <path path="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" />
-                <path path="lib/sqlite/sqlite-jdbc-3.7.2.jar" />
                 <path path="src/main" />
             </classpath>
 
@@ -147,54 +138,15 @@
     <target name="compile" depends="prepare" description="compile the source ">
         <javac srcdir="src/main/" destdir="build/lib" source="1.7">
             <classpath>
-                <path path="lib/colt/colt-1.2.0.jar" />
-                <path path="lib/commons/commons-io-2.4.jar" />
-                <path path="lib/commons/commons-math3-3.1.1.jar"/>
-            	<path path="lib/jama/Jama-1.0.2.jar"/>
-            	<path path="lib/objectselector/objectselector-0.1-lib.jar"/>
-                <path path="lib/mysql/mysql-connector-java-5.1.27-bin.jar" />
-                <path path="lib/poi/lib/commons-codec-1.5.jar" />
-                <path path="lib/poi/lib/commons-logging-1.1.jar" />
-                <path path="lib/poi/ooxml-lib/dom4j-1.6.1.jar" />
-                <path path="lib/poi/ooxml-lib/stax-api-1.0.1.jar" />
-                <path path="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" />
-                <path path="lib/poi/poi-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
-                <path path="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" />
-                <path path="lib/sqlite/sqlite-jdbc-3.7.2.jar" />
+                <fileset refid="lib.jars" />
                 <path path="src/main" />
             </classpath>
         </javac>
         <javac srcdir="src/main:src/gui/" destdir="build/gui" source="1.7">
             <classpath>
-                <path path="lib/colt/colt-1.2.0.jar" />
-                <path path="lib/commons/commons-io-2.4.jar" />
-                <path path="lib/commons/commons-lang-2.6.jar" />
-                <path path="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" />
-                <path path="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" />
-                <path path="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" />
-                <path path="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" />
-                <path path="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" />
-                <path path="lib/junit/junit-4.11.jar" />
-                <path path="lib/log4j/log4j-1.2.17.jar" />
-                <path path="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" />
-                <path path="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" />
-				<path path="lib/commons/commons-math3-3.1.1.jar"/>
-            	<path path="lib/jama/Jama-1.0.2.jar"/>
+                <fileset refid="lib.jars" />
+                <fileset refid="gui.jars" />
                 <path path="lib/swt/swt-4.2.1-gtk-linux-x86.jar" />
-				<path path="lib/objectselector/objectselector-0.1-lib.jar"/>
-                <path path="lib/mysql/mysql-connector-java-5.1.27-bin.jar" />
-                <path path="lib/poi/lib/commons-codec-1.5.jar" />
-                <path path="lib/poi/lib/commons-logging-1.1.jar" />
-                <path path="lib/poi/ooxml-lib/dom4j-1.6.1.jar" />
-                <path path="lib/poi/ooxml-lib/stax-api-1.0.1.jar" />
-                <path path="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" />
-                <path path="lib/poi/poi-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" />
-                <path path="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" />
-                <path path="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" />
-                <path path="lib/sqlite/sqlite-jdbc-3.7.2.jar" />
                 <path path="src/main" />
             </classpath>
         </javac>
@@ -205,260 +157,87 @@
         </copy>
     </target>
 
-    <target name="jars" depends="compile, javadoc">
-        <jar destfile="jars/libarx-2.1-doc.jar">
-            <fileset dir="doc/api" defaultexcludes="no">
-            </fileset>
+    <target name="buildExternalLibs">
+        <jar jarfile="build/extLibs/lib.jar">
+            <zipgroupfileset refid="lib.jars" />
         </jar>
-        <jar destfile="jars/libarx-2.1-dev-doc.jar">
-            <fileset dir="doc/dev" defaultexcludes="no">
-            </fileset>
+        <jar jarfile="build/extLibs/gui.jar">
+            <zipgroupfileset refid="gui.jars" />
         </jar>
-        <jar destfile="jars/arx-2.1-doc.jar">
-            <fileset dir="doc/gui" defaultexcludes="no">
-            </fileset>
+    </target>
+
+    <target name="jars" depends="compile, javadoc, buildExternalLibs">
+        <jar destfile="jars/libarx-${arx.version}-doc.jar">
+            <fileset dir="doc/api" defaultexcludes="no" />
         </jar>
-        <jar destfile="jars/arx-2.1-src.jar">
-            <fileset dir="src/gui" defaultexcludes="no">
-            </fileset>
+        <jar destfile="jars/libarx-${arx.version}-dev-doc.jar">
+            <fileset dir="doc/dev" defaultexcludes="no" />
+        </jar>
+        <jar destfile="jars/arx-${arx.version}-doc.jar">
+            <fileset dir="doc/gui" defaultexcludes="no" />
         </jar>
-        <jar destfile="jars/libarx-2.1-src.jar">
+        <jar destfile="jars/arx-${arx.version}-src.jar">
+            <fileset dir="src/gui" defaultexcludes="no" />
+        </jar>
+        <jar destfile="jars/libarx-${arx.version}-src.jar">
             <fileset dir="src/main" defaultexcludes="no" />
             <fileset dir="src/test" defaultexcludes="no" />
             <fileset dir="src/example" defaultexcludes="no" />
         </jar>
-        <jar destfile="jars/libarx-2.1.jar">
-            <fileset dir="build/lib" defaultexcludes="no">
-            </fileset>
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-			<zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
+        <jar destfile="jars/libarx-${arx.version}.jar">
+            <fileset dir="build/lib" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
         </jar>
-        <jar destfile="jars/arx-2.1-osx.jar">
-            <fileset dir="build/gui" defaultexcludes="no">
-            </fileset>
-			<zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-lang-2.6.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/junit/junit-4.11.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/log4j/log4j-1.2.17.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" excludes="META-INF/*.SF" />
-			<zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swt/swt-4.2.1-cocoa-macosx.jar" excludes="META-INF/*.SF" />
-
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
-
+        <jar destfile="jars/arx-${arx.version}-osx.jar">
+            <fileset dir="build/gui" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="build/extLibs/gui.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="lib/swt/swt-4.2.1-cocoa-macosx.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
             <manifest>
                 <attribute name="Main-Class" value="org.deidentifier.arx.gui.Main" />
             </manifest>
         </jar>
-        <jar destfile="jars/arx-2.1-osx-64.jar">
-            <fileset dir="build/gui" defaultexcludes="no">
-            </fileset>
-			<zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-lang-2.6.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/junit/junit-4.11.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/log4j/log4j-1.2.17.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" excludes="META-INF/*.SF" />
-			<zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swt/swt-4.2.1-cocoa-macosx-x86_64.jar" excludes="META-INF/*.SF" />
-            
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
-
+        <jar destfile="jars/arx-${arx.version}-osx-64.jar">
+            <fileset dir="build/gui" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="build/extLibs/gui.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="lib/swt/swt-4.2.1-cocoa-macosx-x86_64.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
             <manifest>
                 <attribute name="Main-Class" value="org.deidentifier.arx.gui.Main" />
             </manifest>
         </jar>
-        <jar destfile="jars/arx-2.1-gtk.jar">
-            <fileset dir="build/gui" defaultexcludes="no">
-            </fileset>
-            <zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-lang-2.6.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/junit/junit-4.11.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/log4j/log4j-1.2.17.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" excludes="META-INF/*.SF" />
-			<zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swt/swt-4.2.1-gtk-linux-x86.jar" excludes="META-INF/*.SF" />
-            
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
-
+        <jar destfile="jars/arx-${arx.version}-gtk.jar">
+            <fileset dir="build/gui" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="build/extLibs/gui.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="lib/swt/swt-4.2.1-gtk-linux-x86.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
             <manifest>
                 <attribute name="Main-Class" value="org.deidentifier.arx.gui.Main" />
             </manifest>
         </jar>
-        <jar destfile="jars/arx-2.1-gtk-64.jar">
-            <fileset dir="build/gui" defaultexcludes="no">
-            </fileset>
-            <zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-lang-2.6.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/junit/junit-4.11.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/log4j/log4j-1.2.17.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" excludes="META-INF/*.SF" />
-			<zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swt/swt-4.2.1-gtk-linux-x86_64.jar" excludes="META-INF/*.SF" />
-            
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
-
+        <jar destfile="jars/arx-${arx.version}-gtk-64.jar">
+            <fileset dir="build/gui" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="build/extLibs/gui.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="lib/swt/swt-4.2.1-gtk-linux-x86_64.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
             <manifest>
                 <attribute name="Main-Class" value="org.deidentifier.arx.gui.Main" />
             </manifest>
         </jar>
-        <jar destfile="jars/arx-2.1-win.jar">
-            <fileset dir="build/gui" defaultexcludes="no">
-            </fileset>
-            <zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-lang-2.6.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/junit/junit-4.11.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/log4j/log4j-1.2.17.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" excludes="META-INF/*.SF" />
-			<zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swt/swt-4.2.1-win32-win32-x86.jar" excludes="META-INF/*.SF" />
-
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
-            
+        <jar destfile="jars/arx-${arx.version}-win.jar">
+            <fileset dir="build/gui" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="build/extLibs/gui.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="lib/swt/swt-4.2.1-win32-win32-x86.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
             <manifest>
                 <attribute name="Main-Class" value="org.deidentifier.arx.gui.Main" />
             </manifest>
         </jar>
-        <jar destfile="jars/arx-2.1-win-64.jar">
-            <fileset dir="build/gui" defaultexcludes="no">
-            </fileset>
-            <zipfileset src="lib/objectselector/objectselector-0.1-lib.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/colt/colt-1.2.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-io-2.4.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-lang-2.6.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/draw2d/org.eclipse.draw2d_3.8.1.201301141834.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.commands_3.6.2.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.core.runtime_3.8.0.v20120912-155025.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jface/org.eclipse.jface_3.8.102.v20130123-162658.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/junit/junit-4.11.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/log4j/log4j-1.2.17.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/nattable/org.eclipse.nebula.widgets.nattable.core-0.9.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swtchart/org.swtchart_0.8.0.v20120301.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/commons/commons-math3-3.1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/jama/Jama-1.0.2.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/swt/swt-4.2.1-win32-win32-x86_64.jar" excludes="META-INF/*.SF" />
-            
-            <zipfileset src="lib/mysql/mysql-connector-java-5.1.27-bin.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-codec-1.5.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/lib/commons-logging-1.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/dom4j-1.6.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/stax-api-1.0.1.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/ooxml-lib/xmlbeans-2.3.0.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/poi/poi-ooxml-schemas-3.10-FINAL-20140208.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/postgresql/postgresql-9.3-1101.jdbc41.jar" excludes="META-INF/*.SF" />
-            <zipfileset src="lib/sqlite/sqlite-jdbc-3.7.2.jar" excludes="META-INF/*.SF" />
-
+        <jar destfile="jars/arx-${arx.version}-win-64.jar">
+            <fileset dir="build/gui" defaultexcludes="no" />
+            <zipfileset src="build/extLibs/lib.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="build/extLibs/gui.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
+            <zipfileset src="lib/swt/swt-4.2.1-win32-win32-x86_64.jar" excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
             <manifest>
                 <attribute name="Main-Class" value="org.deidentifier.arx.gui.Main" />
             </manifest>
@@ -466,6 +245,7 @@
 
         <delete dir="build/lib" failonerror="true" />
         <delete dir="build/gui" failonerror="true" />
+        <delete dir="build/extLibs" failonerror="true" />
         <delete dir="build" failonerror="true" />
     </target>
 </project>
\ No newline at end of file