X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=5a698f07d8d17b4aede2aa41ea3a53b8e7a0d1b2;hb=bd53adc27eab07569b1944a7c33f31c41dad785f;hp=dbe9f717ee655d7ef2f82827c34a81b263d21eff;hpb=9d1dc2f2dd9a2d8774772d5d9f67ec7939a43ce1;p=jalview.git

diff --git a/build.xml b/build.xml
index dbe9f71..5a698f0 100755
--- a/build.xml
+++ b/build.xml
@@ -999,18 +999,49 @@
     <get url="${java2scriptURL}" dest="eclipse-inst/dropins/net.sf.j2s.core.jar" /> -->
 
 </target>
-<target name="build-site" depends="init,prepare">
+
+<target name="build-site" depends="init,prepare,compile-site,unzip-to-site">
+  <!-- closure compile -->
+  <!-- tarball -->
+  <tar compression="gzip" destfile="site.tar.gz">
+    <tarfileset dir="site" />
+  </tar>
+</target>
+<target name="prepare-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-work" 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"/>
-  
-  <!-- the build may fail but valid javascript may still be produced, so we ignore return codes -->
+  <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"/>
+</target>
+<target name="compile-site" depends="prepare-site">
+  <!-- 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="reset" />
+    <arg value="--hard" />
+  </exec>
+  <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"/>
+
+  <!-- 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"/>
@@ -1024,19 +1055,44 @@
   <!-- 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>
+</target>
+<target name="unzip-to-site" depends="prepare-site">
   <property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
-  <unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>
-  <copy todir="${site}/swingjs/j2s/">
+  <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>
+      <include name="**"/>
+    </fileset>
   </copy>
+
+  <!-- copy test files into place in site -->
   <copy todir="${site}/examples">
-  <fileset dir="examples">
-  <include name="*.*"/>
+    <fileset dir="examples">
+      <include name="*.*"/>
     </fileset>
   </copy>
-  <!-- closure compile -->
-  <!-- copy test files into place in site -->
+  <!-- lastly, update SwingJS -->
+  <unzip dest="${site}/" overwrite="true">
+    <fileset dir="${swingjsdir}">
+      <include name="SwingJS-site.zip"/>
+    </fileset>
+  </unzip>
 </target>
 </project>