JAL-1791 fix ant target dependencies
authorJim Procter <jprocter@issues.jalview.org>
Thu, 15 Oct 2015 13:52:24 +0000 (14:52 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 15 Oct 2015 13:52:24 +0000 (14:52 +0100)
build.xml

index ed888d6..2004335 100755 (executable)
--- a/build.xml
+++ b/build.xml
         <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}">
       </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" />
     </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>