X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=b73c9101b64220354d3739b47c2d26e64e15fe61;hb=32f58e16773440070c4b7978df9d3727581c2c84;hp=5ab232fd3c09a99fff038a5192611e8961f43996;hpb=f09cca440e3025194f509ca47233bcb5c6e43bdd;p=jalview.git

diff --git a/build.xml b/build.xml
index 5ab232f..b73c910 100755
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0"?>
+<!--
+   * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+   * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+   * 
+   * This file is part of Jalview.
+   * 
+   * Jalview is free software: you can redistribute it and/or
+   * modify it under the terms of the GNU General Public License 
+   * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+   * 
+   * Jalview is distributed in the hope that it will be useful, but 
+   * WITHOUT ANY WARRANTY; without even the implied warranty 
+   * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+   * PURPOSE.  See the GNU General Public License for more details.
+   * 
+   * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <project name="jalviewX" default="usage" basedir=".">
 	<!-- we use jalopy to format our sources -->
 	<taskdef name="jalopy"
@@ -24,6 +41,7 @@
 		<echo message="makeApplet - compiles, then packages and obfuscates the Applet"/>
 		<echo message="See docs/building.html and the comments in build file for other targets."/>
 	    <echo message="note: compile and makeApplet require the property java118.home to be set to point to a java 1.1.8 jdk."/>
+	    <echo message="Useful -D flags: -Ddonotobfuscate will prevent applet obfuscation"/>
 	</target>
 
 
@@ -57,6 +75,16 @@
     <property name="JALVIEW_VERSION" value="DEVELOPMENT"/> <!-- 2.4 (VAMSAS)" -->
 		<!-- Include debugging information in javac true or false -->
 		<property name="javac.debug" value="true"/>
+		
+		<!-- JarSigner Key Store for Webstart Distribution -->
+		<property name="jalview.keystore" value="./keys/.keystore"/>
+		<!-- Keystore Password -->
+		<property name="jalview.keystore.pass" value="alignmentisfun"/>
+		<!-- Key Name -->
+		<property name="jalview.key" value="jalview"/>
+		<!-- Key Password -->
+		<property name="jalview.key.pass" value="alignmentisfun"/>
+						
 		<!-- Don't change anything below here unless you know what you are doing! -->
 		<!-- Url path for WebStart in JNLP file -->
 		<property name="WebStartLocation" value="http://www.jalview.org/webstart"/>
@@ -191,10 +219,10 @@
 	<target name="makefulldist" depends="makedist">
 		<!-- the default keystore details might need to be edited here -->
 		<signjar
-      storepass="alignmentisfun"
-      keypass="alignmentisfun"
-      keystore="keys/.keystore"
-      alias="jalview"
+      storepass="${jalview.keystore.pass}"
+      keypass="${jalview.key.pass}"
+      keystore="${jalview.keystore}"
+      alias="${jalview.key}"
       lazy="false"
       verbose="false"
       >
@@ -236,6 +264,7 @@
 				</fileset>
 				<fileset dir="${packageDir}">
 					<include name="*.jar"/>
+					<include name="*_*.jar"/>
 					<exclude name="jalview.jar"/>
 				</fileset>
 				<property name="jalview.version" value="${JALVIEW_VERSION}"/>