JAL-1791 add jalview.tsaurl for specifying timestamp server when signing jars

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 73c494d..ce473a5 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -82,7 +82,9 @@
     <property name="jalview.key" value="jalview" />
     <!-- Key Password -->
     <property name="jalview.key.pass" value="alignmentisfun" />
-
+       <!-- time stamp server URL -->
+    <property name="jalview.tsaurl" value="" />
+         
     <property name="testng-groups" value="Functional" />
 
     <!-- Don't change anything below here unless you know what you are doing! -->
@@ -268,7 +270,7 @@
     <delete dir="${testOutputDir}" includes="*,**/*" />
   </target>
 
-  <target name="prepareTests" depends="init,clean">
+  <target name="prepareTests" depends="init,testclean">
     <mkdir dir="${testOutputDir}" />
   </target>
 
@@ -280,7 +282,8 @@
   <taskdef resource="testngtasks" classpath="utils/testnglibs/testng.jar" />
 
   <target name="testng" depends="buildTests">
-    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng">
+    <testng outputDir="${reportDir}" haltOnFailure="false" groups="${testng-groups}" mode="testng"
+      verbose="2">
       <classpath>
         <pathelement location="${testOutputDir}" />
         <path refid="test.classpath" />
@@ -365,10 +368,12 @@
         <association mime-type="application-x/ext-file" extensions="jar"/>-->
     <!-- and sign the jars -->
     <!-- the default keystore details might need to be edited here -->
-    <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" sigalg="SHA1withRSA">
+    <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}">
         <include name="*.jar" />
       </fileset>
+      
     </signjar>
   </target>