git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3033 unpack SwingJS last to ensure we always have the latest version of SwingJS...
[jalview.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
b7f1af3
..
5a698f0
100755
(executable)
--- 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">
<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>
<fileset dir="libjs">
<include name="*.zip" />
</fileset>
@@
-1093,5
+1088,11
@@
<include name="*.*"/>
</fileset>
</copy>
<include name="*.*"/>
</fileset>
</copy>
+ <!-- lastly, update SwingJS -->
+ <unzip dest="${site}/" overwrite="true">
+ <fileset dir="${swingjsdir}">
+ <include name="SwingJS-site.zip"/>
+ </fileset>
+ </unzip>
</target>
</project>
</target>
</project>