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:
f35dfec
)
JAL-3274 run buildProperties task when buildIndices and prepare-site are executed
author
Jim Procter
<jprocter@issues.jalview.org>
Wed, 22 May 2019 15:59:14 +0000
(16:59 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Wed, 22 May 2019 15:59:14 +0000
(16:59 +0100)
build.xml
patch
|
blob
|
history
diff --git
a/build.xml
b/build.xml
index
775df8d
..
327cc33
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-315,7
+315,7
@@
</testng>
</target>
</testng>
</target>
- <target name="buildindices" depends="init, prepare" unless="help.uptodate">
+ <target name="buildindices" depends="init, prepare, buildPropertiesFile" unless="help.uptodate">
<replace value="${JALVIEW_VERSION}">
<replacetoken>
<![CDATA[$$Version-Rel$$]]>
<replace value="${JALVIEW_VERSION}">
<replacetoken>
<![CDATA[$$Version-Rel$$]]>
@@
-1043,7
+1043,7
@@
<tarfileset dir="site" />
</tar>
</target>
<tarfileset dir="site" />
</tar>
</target>
-<target name="prepare-site" depends="init,prepare">
+<target name="prepare-site" depends="init,prepare,buildPropertiesFile">
<property name="swingjsdir" value="swingjs"/>
<property name="eclipse-inst" value="/home/bamboo/buildtools/eclipse/eclipse-js"/>
<property name="eclipse-exec" value="${eclipse-inst}/eclipse"/>
<property name="swingjsdir" value="swingjs"/>
<property name="eclipse-inst" value="/home/bamboo/buildtools/eclipse/eclipse-js"/>
<property name="eclipse-exec" value="${eclipse-inst}/eclipse"/>
@@
-1112,7
+1112,7
@@
<!-- finally copy artefacts from eclipse project checkout to the build site -->
<copy todir="${site}">
<fileset dir="${eclipse-workrepo}/site"/>
<!-- finally copy artefacts from eclipse project checkout to the build site -->
<copy todir="${site}">
<fileset dir="${eclipse-workrepo}/site"/>
- </copy>
+ </copy>
</target>
<target name="unzip-to-site" depends="prepare-site">
<ant antfile="build-site.xml"/>
</target>
<target name="unzip-to-site" depends="prepare-site">
<ant antfile="build-site.xml"/>