JAL-3210 replacing j11lib/Jmol-14.29.17-no_netscape.jar with unsigned version. Tempor...

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 5a8fbc6..327cc33 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -315,7 +315,7 @@
     </testng>
   </target>
 
-  <target name="buildindices" depends="init, prepare" unless="help.uptodate">
+  <target name="buildindices" depends="init, prepare, buildPropertiesFile" unless="help.uptodate">
     <replace value="${JALVIEW_VERSION}">
       <replacetoken>
         <![CDATA[$$Version-Rel$$]]>
@@ -1043,7 +1043,7 @@
     <tarfileset dir="site" />
   </tar>
 </target>
-<target name="prepare-site" depends="init,prepare">
+<target name="prepare-site" depends="init,prepare,buildPropertiesFile">
   <property name="swingjsdir" value="swingjs"/>
   <property name="eclipse-inst" value="/home/bamboo/buildtools/eclipse/eclipse-js"/>
   <property name="eclipse-exec" value="${eclipse-inst}/eclipse"/>
@@ -1112,33 +1112,10 @@
   <!-- finally copy artefacts from eclipse project checkout to the build site -->
   <copy todir="${site}">
     <fileset dir="${eclipse-workrepo}/site"/>
-  </copy>
+  </copy>  
 </target>
 <target name="unzip-to-site" depends="prepare-site">
-  <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
-  <unzip dest="${site}/" overwrite="true">
-    <fileset dir="libjs">
-      <include name="*.zip" />
-    </fileset>
-  </unzip>
-  <copy overwrite="true" todir="${site}/swingjs/j2s/">
-    <fileset dir="${resourceDir}">
-      <include name="**"/>
-    </fileset>
-  </copy>
-
-  <!-- copy test files into place in site -->
-  <copy todir="${site}/examples">
-    <fileset dir="examples">
-      <include name="*.*"/>
-    </fileset>
-  </copy>
-  <!-- lastly, update SwingJS -->
-  <unzip dest="${site}/" overwrite="true">
-    <fileset dir="${swingjsdir}">
-      <include name="SwingJS-site.zip"/>
-    </fileset>
-  </unzip>
+  <ant antfile="build-site.xml"/>
 </target>
 
   <target name="make-j2s-cores" depends="">