X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=cc512f6d02aabf5eaa243cdeee52a0c9af88578a;hb=ca384c307f32631d32ffd450d69a49abeff4f5df;hp=9ea9566792cc6a447a686780e9225ae323a3dea8;hpb=39ecf58a89bc3aa48d39caf3d512c12d2c8fdcac;p=jalview.git

diff --git a/build.xml b/build.xml
index 9ea9566..cc512f6 100755
--- a/build.xml
+++ b/build.xml
@@ -57,6 +57,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"/>
@@ -70,8 +80,12 @@
 		<property name="outputDir" value="classes" />
 		<property name="packageDir" value="dist" />
 		<property name="outputJar" value="jalview.jar" />
-                <!-- Jalview Applet JMol Jar Dependency -->
-                <property name="jmolJar" value="Jmol-11.0.2.jar" />
+	  <!-- Jalview Applet JMol Jar Dependency -->
+    <property name="jmolJar" value="Jmol-11.0.2.jar" />
+		<property name="jalviewLiteJar" value="jalviewApplet.jar"/>
+		<!-- switch to indicate if we should obfuscate jalviewLite -->
+		<!--<property name="donotobfuscate" value="true"/> -->
+				
 		<!-- Jalview Web Service Clients - see the comments in 'buildextclients' for details -->
 		<property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
 		<property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
@@ -92,7 +106,7 @@
 			</fileset>
 			
 		</path>
-		<property name="source.dist.name" value="jalview-src.tar.gz"/>
+		<property name="source.dist.name" value="${basedir}/jalview-src.tar.gz"/>
 		<!-- The Location of the java 1.1.8 jdk -->
 		<property name="java118.home" value="C:\Sun\jdk1.1.8" />
 		<property name="applet.jre.tools" value="${java118.home}/lib/classes.zip"/>
@@ -187,10 +201,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"
       >
@@ -202,7 +216,8 @@
 		<taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties"/>
 
 		<!--    codebase="http://www.jalview.org/jalview/webstart" -->
-		<jnlp toFile="${packageDir}/jalview.jnlp" href="jalview.jnlp"
+		<!-- href="jalview.jnlp" prevent hard-wired pickup of jnlp in certain javaws versions -->
+		<jnlp toFile="${packageDir}/jalview.jnlp" 
       codebase="${WebStartLocation}">
 			<information>
 				<title>Jalview</title>
@@ -221,6 +236,7 @@
         <association mime-type="application-x/ext-file" extensions="pfam"/>
         <association mime-type="application-x/ext-file" extensions="aln"/>
         <association mime-type="application-x/ext-file" extensions="pir"/>
+        <association mime-type="application-x/ext-file" extensions="amsa"/>
 	-->
 			</information>
 			<resources>
@@ -357,6 +373,7 @@
     target="1.1"
     srcdir="${sourceDir}" 
     destdir="${outputDir}"
+   	debug="${javac.debug}"
     classpath="lib/${jmolJar}"
        includes="jalview/appletgui/**"
        excludes="ext/**,MCview/**,org/**,vamsas/**"
@@ -380,16 +397,23 @@
         </fileset>
       </jar>
   </target>
-
-  <target name="obfuscate" depends="packageApplet">
-    <path id="obfuscateDeps.path">
+  <target name="obfuscate" depends="-obfuscatefake,-obfuscatereally" description="construct the final jalviewLite applet jar with or without obfuscation">
+  </target>
+	<target name="-obfuscatefake" depends="packageApplet" if="donotobfuscate">    
+  	<copy file="in.jar" tofile="${jalviewLiteJar}" />    	
+    <delete file="in.jar"/>
+  </target>
+	<target name="-obfuscatereally" unless="donotobfuscate">
+    
+  	<path id="obfuscateDeps.path">
     <pathelement location="${applet.jre.tools}"/>
     <pathelement location="lib/${jmolJar}"/>
     </path>
     <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
+  	
     <proguard>
       <injar file="in.jar"/>
-      <outjar file="jalviewApplet.jar"/>
+      <outjar file="${jalviewLiteJar}"/>
       <libraryjar refid="obfuscateDeps.path"/>
       <keep access="public" type="class"
       name="jalview.bin.JalviewLite">
@@ -401,9 +425,8 @@
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
-       { public * ; }
-       -->
-    </proguard>
+       { public * ; } -->
+      </proguard>
     <delete file="in.jar"/>
   </target>
 
@@ -491,8 +514,15 @@
 				<include name="${libDir}/**/*"/>						
 				<include name="${resourceDir}/**/*"/>						
 				<include name="${helpDir}/**/*"/>						
-				<include name="utils/**/*"/>						
+				<exclude name="**/*locales"/>
+				<exclude name="*locales/**"/>
+				<exclude name="utils/InstallAnywhere/**Build.iap_xml"/>
+				<exclude name="utils/InstallAnywhere/**Build*/**"/>
+				<exclude name="utils/InstallAnywhere/**Build*/**"/>
+				<exclude name="utils/InstallAnywhere/**locale*"/>
+				<exclude name="utils/InstallAnywhere/**locale*/**"/>
 				<include name="${schemaDir}/**/*"/>						
+				<include name="utils/**/*"/>
 				<include name="${docDir}/**/*"/>						
 			</tarfileset>
 		</tar>