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

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index e69c676..89c93c9 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1001,29 +1001,61 @@
 </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 -->
-  <property name="eclipse-workspace" value="/cluster/gjb_lab/jprocter/eclipse-js-workspace"/>
-  
-  <!-- execute eclipse build, trap log and dump to stdout here -->
-  <copy file="${swingjsdir}/net.sf.j2s.core.jar" todir="${eclipse-inst}/dropins"/>
+  <property name="eclipse-work" value="/home/bamboo/buildtools/eclipse/eclipse-js-workspace"/>
+  <!-- git repository linked to project in workspace -->
+  <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" 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" />
+    <arg value="--short" />
+    <arg value="HEAD" />
+  </exec>
+  <!-- update and checkout the same commit in the workspace project -->
+  <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
+  <arg value="pull" />
+  </exec>
+  <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
+  <arg value="checkout" />
+  <arg value="${git.commit}" />
+  </exec>
+  <!-- custom classpath for .js builds -->
+  <copy file=".classpath.js" tofile="${eclipse-workrepo}/.classpath" overwrite="true"/>
   
-  <!-- the build may fail but valid javascript may still be produced, so we ignore return codes -->
+  <!-- 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">
     <arg value="-nosplash"/>
     <arg value="--launcher.suppressErrors"/>
     <arg value="-application"/>
     <arg value="org.eclipse.jdt.apt.core.aptBuild"/>
     <arg value="-data"/>
-    <arg value="/cluster/gjb_lab/jprocter/eclipse-js-workspace"/>
+    <arg value="${eclipse-work}"/>
   </exec>
-
+    
   <!-- TODO: run jslint and something else here to check we have a complete set of .js files for java -->
   <!-- possibly compare timestamps between .js files and their mate in source - any newer or not present triggers a new build -->
   <!-- <mkdir dir="${packageDir}/${site}" /> -->
   <!--   <property name="swingjs.zipurl" value="https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip?raw=true" /> -->
+  
+  <!-- and reset the .classpath -->
+  <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
+      <arg value="checkout" />
+      <arg value="${git.commit}"/>
+    <arg value="--"/>
+    <arg value=".classpath" />
+      </exec>
+  
+  <!-- finally copy artefacts from eclipse project checkout to the build site -->
+  <copy todir="${site}">
+    <fileset dir="${eclipse-workrepo}/site"/>
+  </copy>
+  
   <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
   <unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>
   <copy todir="${site}/swingjs/j2s/">
@@ -1031,6 +1063,7 @@
        <include name="**"/>
        </fileset>
   </copy>
+  
   <copy todir="${site}/examples">
   <fileset dir="examples">
   <include name="*.*"/>