JAL-2080 mark jalview.jar as main jar resource

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 326eb57..bb9f247 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
  * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
@@ -421,13 +421,11 @@
         </information>
         <resources>
           <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
+          <jar main="true" href="jalview.jar"/>
           <fileset dir="${packageDir}">
-            <include name="jalview.jar" />
-          </fileset>
-          <fileset dir="${packageDir}">
+            <exclude name="jalview.jar" />
             <include name="*.jar" />
             <include name="*_*.jar" />
-            <exclude name="jalview.jar" />
             <exclude name="*jnilib.jar" />
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}" />
@@ -723,23 +721,7 @@
       <attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}" />
     </manifest>
   </jar>
-</target>
-<target name="-signexdirsnotsa" depends="prepubapplet_1" unless="timestamp">
-  <signjar sigalg="SHA1WithRSA" storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
-    <fileset dir="${packageDir}/examples">
-      <include name="*.jar" />
-    </fileset>
-  </signjar>
-</target>
-<target name="-signexdirstsa" depends="prepubapplet_1" if="timestamp">
-  <signjar sigalg="SHA1WithRSA" storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false" tsaproxyhost="${proxyHost}" tsaproxyport="${proxyPort}" tsaurl="${jalview.tsaurl}">
-    <fileset dir="${packageDir}/examples">
-      <include name="*.jar" />
-    </fileset>
-  </signjar>
-</target>
 
-<target name="prepubapplet_2" depends="-signexdirsnotsa,-signexdirstsa">
   <presetdef name="ap_applet.jar">
     <!-- build a signed applet with 'all-permissions' - 
                          Needs 'param name="permissions' value="all-permissions"' in applet tag
@@ -841,7 +823,7 @@
   <!-- todo - write examples/downloads for alternate versions of the applet 
     probably don't need to do this now since we don't have alternate versions anymore !-->
 </target>
-<target name="-signapplet" depends="prepubapplet_2">
+<target name="-signapplet" depends="prepubapplet_1">
   <fileset id="signappletjarset" dir="${packageDir}/examples">
     <exclude name="u_*.jar" />
     <include name="${jalviewLiteJar}" />