Merge branch 'develop' into Jalview-BH/JAL-3026

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 712affd..89c93c9 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1001,7 +1001,7 @@
 </target>
 <target name="build-site" depends="init,prepare">
   <property name="swingjsdir" value="swingjs"/>
-  <property name="eclipse-inst" value="../../eclipse-js/"/>
+  <property name="eclipse-inst" value="/home/bamboo/buildtools/eclipse/eclipse-js"/>
   <property name="eclipse-exec" value="${eclipse-inst}/eclipse"/>
   <property name="site" value="site"/>
   <!-- where the eclipse js workspace has been initialised -->
@@ -1010,7 +1010,7 @@
   <property name="eclipse-workrepo" value="/home/bamboo/buildtools/eclipse/eclipse-js-workspace/jalview-js"/>
     
   <!-- update transpiler -->
-  <copy file="${swingjsdir}/net.sf.j2s.core.jar" todir="${eclipse-inst}/dropins"/>
+  <copy file="${swingjsdir}/net.sf.j2s.core.jar" todir="${eclipse-inst}/dropins" overwrite="true" failonerror="true"/>
   <!-- update the git repo linked to the eclipse workspace -->
   <exec executable="/usr/bin/git" outputproperty="git.commit" failifexecutionfails="true">
     <arg value="rev-parse" />
@@ -1025,8 +1025,8 @@
   <arg value="checkout" />
   <arg value="${git.commit}" />
   </exec>
-  
-  <copy file=".classpath.js" tofile="${eclipse-workrepo}/.classpath"/>
+  <!-- custom classpath for .js builds -->
+  <copy file=".classpath.js" tofile="${eclipse-workrepo}/.classpath" overwrite="true"/>
   
   <!-- execute the eclipse build - the build may fail but valid javascript may still be produced, so we ignore return codes -->
   <exec executable="${eclipse-exec}" failonerror="no">