JAL-3192 call buildcore.xml:make-all-cores as part of JalviewJS site build

diff --git a/.ant-targets-build.xml b/.ant-targets-build.xml
index 8dd03da..c965779 100644 (file)
--- a/.ant-targets-build.xml
+++ b/.ant-targets-build.xml
@@ -6,6 +6,8 @@ buildextclients
 buildindices
 castorbinding
 clean
+clean-site
+compile-site
 compileApplet
 distclean
 eclipse-install
@@ -18,6 +20,7 @@ makefulldist
 obfuscate
 packageApplet
 prepare
+prepare-site
 prepareTests
 preparejnlp
 prepubapplet_1
@@ -29,5 +32,6 @@ sourcedoc
 sourcescrub
 testclean
 testng
+unzip-to-site
 usage
 writejnlpf

diff --git a/build.xml b/build.xml
index 7394235..b1abce9 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1016,8 +1016,7 @@
 
 </target>
 
-<target name="build-site" depends="init,prepare,compile-site,unzip-to-site">
-  <!-- closure compile -->
+<target name="build-site" depends="init,prepare,compile-site,unzip-to-site,make-j2s-cores">
   <!-- tarball -->
   <tar compression="gzip" destfile="site.tar.gz">
     <tarfileset dir="site" />
@@ -1120,4 +1119,8 @@
     </fileset>
   </unzip>
 </target>
+
+  <target name="make-j2s-cores" depends="">
+    <ant antfile="buildcore.xml" target="build-all-cores"/>
+  </target>
 </project>