From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 15 Oct 2015 13:52:24 +0000 (+0100)
Subject: JAL-1791 fix ant target dependencies
X-Git-Tag: Release_2_9_0b2~1^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=63011f970b6213b12ab3e6252dcba8cd38996e2f;p=jalview.git

JAL-1791 fix ant target dependencies
---

diff --git a/build.xml b/build.xml
index ed888d6..2004335 100755
--- a/build.xml
+++ b/build.xml
@@ -369,7 +369,7 @@
         <association mime-type="application-x/ext-file" extensions="jar"/>-->
       </target>
   
-  <target name="-jarsignwithtsa" depends="preparejnlp" if="timestamp">
+  <target name="-jarsignwithtsa" depends="makedist,preparejnlp" if="timestamp">
     <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA"
       tsaurl="${jalview.tsaurl}">
       <fileset dir="${packageDir}">
@@ -377,7 +377,7 @@
       </fileset>      
     </signjar>
   </target>
-  <target name="-jarsignnotsa" depends="preparejnlp" unless="timestamp">
+  <target name="-jarsignnotsa" depends="makedist,preparejnlp" unless="timestamp">
     <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA">
       <fileset dir="${packageDir}">
         <include name="*.jar" />
@@ -385,7 +385,7 @@
     </signjar>
   </target>
 
-  <target name="makefulldist" depends="-jarsignwithtsa,-jarsignnotsa">
+  <target name="makefulldist" depends="makedist,preparejnlp,-jarsignwithtsa,-jarsignnotsa">
     <!-- and sign the jars -->
     <!-- the default keystore details might need to be edited here -->
   </target>