JAL-3033 unpack SwingJS last to ensure we always have the latest version of SwingJS...
authorJim Procter <jprocter@issues.jalview.org>
Tue, 10 Jul 2018 10:51:54 +0000 (11:51 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 10 Jul 2018 10:51:54 +0000 (11:51 +0100)
build.xml

index b7f1af3..5a698f0 100755 (executable)
--- a/build.xml
+++ b/build.xml
 <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>
       <include name="*.*"/>
     </fileset>
   </copy>
+  <!-- lastly, update SwingJS -->
+  <unzip dest="${site}/" overwrite="true">
+    <fileset dir="${swingjsdir}">
+      <include name="SwingJS-site.zip"/>
+    </fileset>
+  </unzip>
 </target>
 </project>