From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 10 Jul 2018 10:51:54 +0000 (+0100)
Subject: JAL-3033 unpack SwingJS last to ensure we always have the latest version of SwingJS... 
X-Git-Tag: Release_2_11_4_0~45^2~18^2~555
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9ee61e0b05f215f6ffa0eb33d65d7b2023ff9bad;p=jalview.git

JAL-3033 unpack SwingJS last to ensure we always have the latest version of SwingJS in site/swingjs
---

diff --git a/build.xml b/build.xml
index b7f1af3..5a698f0 100755
--- a/build.xml
+++ b/build.xml
@@ -1072,11 +1072,6 @@
 <target name="unzip-to-site" depends="prepare-site">
   <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
   <unzip dest="${site}/" overwrite="true">
-    <fileset dir="${swingjsdir}">
-      <include name="SwingJS-site.zip"/>
-    </fileset>
-  </unzip>
-  <unzip dest="${site}/" overwrite="true">
     <fileset dir="libjs">
       <include name="*.zip" />
     </fileset>
@@ -1093,5 +1088,11 @@
       <include name="*.*"/>
     </fileset>
   </copy>
+  <!-- lastly, update SwingJS -->
+  <unzip dest="${site}/" overwrite="true">
+    <fileset dir="${swingjsdir}">
+      <include name="SwingJS-site.zip"/>
+    </fileset>
+  </unzip>
 </target>
 </project>