From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 26 Apr 2016 09:57:42 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2080_javaws_slow' into Release_2_9_0b1_Branch
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=807b2416b1486b4acfddff0cd7c29402ceb016c9;hp=f92b601879c3cb6f3f8cf475786dbca82ff8ab23;p=jalview.git

Merge branch 'bug/JAL-2080_javaws_slow' into Release_2_9_0b1_Branch
---

diff --git a/build.xml b/build.xml
index be2b732..bb9f247 100755
--- a/build.xml
+++ b/build.xml
@@ -421,13 +421,11 @@
         </information>
         <resources>
           <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
+          <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
-            <include name="jalview.jar" />
-          </fileset>
-          <fileset dir="${packageDir}">
+            <exclude name="jalview.jar" />
             <include name="*.jar" />
             <include name="*_*.jar" />
-            <exclude name="jalview.jar" />
             <exclude name="*jnilib.jar" />
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}" />