git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
09d9639
)
JAL-3033 more copy/git debugging of task
author
Jim Procter
<jprocter@issues.jalview.org>
Mon, 25 Jun 2018 16:03:49 +0000
(17:03 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Mon, 25 Jun 2018 16:03:49 +0000
(17:03 +0100)
build.xml
patch
|
blob
|
history
diff --git
a/build.xml
b/build.xml
index
099e668
..
712affd
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-1017,13
+1017,16
@@
<arg value="--short" />
<arg value="HEAD" />
</exec>
<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>
<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">
<!-- 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" />
<!-- 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 -->
</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"/>
<property name="swingjs.zip" value="${swingjsdir}/SwingJS-site.zip" />
<unzip src="${swingjs.zip}" dest="${site}/" overwrite="true"/>