From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 25 Jun 2018 16:03:49 +0000 (+0100)
Subject: JAL-3033 more copy/git debugging of task
X-Git-Tag: Release_2_11_4_0~45^2~18^2~629^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b4c4e0342beb25104b3e2e8fc4ac87e248fe7382;p=jalview.git

JAL-3033 more copy/git debugging of task
---

diff --git a/build.xml b/build.xml
index 099e668..712affd 100755
--- a/build.xml
+++ b/build.xml
@@ -1017,13 +1017,16 @@
     <arg value="--short" />
     <arg value="HEAD" />
   </exec>
-  <!-- and checkout the same commit in the workspace project -->
+  <!-- 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>
   
-  <copyfile src=".classpath.js" dest="${eclipse-workrepo}/.classpath"/>
+  <copy file=".classpath.js" tofile="${eclipse-workrepo}/.classpath"/>
   
   <!-- 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">
@@ -1043,11 +1046,15 @@
   <!-- and reset the .classpath -->
   <exec executable="/usr/bin/git" failifexecutionfails="true" dir="${eclipse-workrepo}">
       <arg value="checkout" />
-      <arg value="${git.commit} .classpath" />
+      <arg value="${git.commit}"/>
+    <arg value="--"/>
+    <arg value=".classpath" />
       </exec>
   
   <!-- finally copy artefacts from eclipse project checkout to the build site -->
-  <copydir src="${eclipse-workrepo}/site" dest="${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"/>