From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 22 May 2019 15:59:14 +0000 (+0100)
Subject: JAL-3274 run buildProperties task when buildIndices and prepare-site are executed
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~133
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=40829022ddccf0cd6fa7b2d7c8ce84c8c38a5e87;hp=f35dfec0655116f4eb1afec4997eb496683687f6;p=jalview.git

JAL-3274 run buildProperties task when buildIndices and prepare-site are executed
---

diff --git a/build.xml b/build.xml
index 775df8d..327cc33 100755
--- a/build.xml
+++ b/build.xml
@@ -315,7 +315,7 @@
     </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$$]]>
@@ -1043,7 +1043,7 @@
     <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"/>
@@ -1112,7 +1112,7 @@
   <!-- 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"/>