X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=e7f05bc982b9e5930fd6308f05f3011b2b5f42aa;hb=141cec63537015cf40c91a9487a44605082a5a29;hp=e9528fc47d3d770d788b3ae5f4de94bfe7cc46af;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git

diff --git a/build.xml b/build.xml
index e9528fc..e7f05bc 100755
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -85,9 +85,21 @@
 		<!-- 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" />
+		<!-- Webstart Image - looked for in resources/images -->
+		<property name="WebStartImage" value="JalviewLogo_big.png"/>
+		<!-- J2SE version needed for webstart launch -->
+		<property name="j2sev" value="1.6+"/>
+
+    <!-- Permissions for running Java applets and applications. Defaults are those suitable for deploying jalview webstart/jalviewLite at www.jalview.org -->
+    <property name="application.codebase" value="*.jalview.org"/>
+    <property name="applet.codebase" value="*"/>
+    <property name="applet.caller-codebase" value="${applet.codebase}"/>
+
 		<!-- build directory configuration -->
 		<property name="libDir" value="lib" />
 		<property name="resourceDir" value="resources" />
@@ -99,7 +111,7 @@
 		<property name="packageDir" value="dist" />
 		<property name="outputJar" value="jalview.jar" />
 		<!-- Jalview Applet JMol Jar Dependency -->
-		<property name="jmolJar" value="JmolApplet-12.1.13.jar" />
+		<property name="jmolJar" value="JmolApplet-12.2.4.jar" />
 		<property name="jalviewLiteJar" value="jalviewApplet.jar" />
 		<!-- switch to indicate if we should obfuscate jalviewLite -->
 		<!--<property name="donotobfuscate" value="true"/> -->
@@ -224,12 +236,18 @@
 
 	<target name="makefulldist" depends="makedist">
 		<!-- 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">
+		<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" />
 			</fileset>
 		</signjar>
+		<copy todir="${packageDir}">
+			<fileset dir="${resourceDir}/images">
+				<include name="${WebStartImage}"/>
+			</fileset>
+					</copy>
+		
 		<taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties" />
 
 		<!--    codebase="http://www.jalview.org/jalview/webstart" -->
@@ -241,22 +259,11 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="logo_big.gif" />
-				<offline_allowed />
-				<!--
-	<association mime-type="application-x/ext-file" extensions="fa"/>
-        <association mime-type="application-x/ext-file" extensions="fasta"/>
-        <association mime-type="application-x/ext-file" extensions="fastq"/>
-        <association mime-type="application-x/ext-file" extensions="blc"/>
-        <association mime-type="application-x/ext-file" extensions="msf"/>
-        <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"/>
-	-->
+				<icon href="${WebStartImage}" />
+				<offline_allowed/>
 			</information>
 			<resources>
-				<j2se version="1.5+" initial_heap_size="10M" />
+				<j2se version="${j2sev}" initial_heap_size="10M"  />
 				<fileset dir="${packageDir}">
 					<include name="jalview.jar" />
 				</fileset>
@@ -272,8 +279,7 @@
 			<security>
 				<all_permissions />
 			</security>
-		</jnlp>
-		<!-- the rest of these jnlp tasks are copy and pastes of the above but with different Vm args -->
+		</jnlp>		
 		<jnlp toFile="${packageDir}/jalview_1G.jnlp" codebase="${WebStartLocation}">
 			<information>
 				<title>Jalview</title>
@@ -281,22 +287,11 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="logo_big.gif" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed />
-				<!--
-		<association mime-type="application-x/ext-file" extensions="fa"/>
-	        <association mime-type="application-x/ext-file" extensions="fasta"/>
-	        <association mime-type="application-x/ext-file" extensions="fastq"/>
-	        <association mime-type="application-x/ext-file" extensions="blc"/>
-	        <association mime-type="application-x/ext-file" extensions="msf"/>
-	        <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>
-				<j2se version="1.5+" initial_heap_size="64M" max_heap_size="512M" />
+				<j2se version="${j2sev}" initial_heap_size="128M" max_heap_size="512M" />
 				<fileset dir="${packageDir}">
 					<include name="jalview.jar" />
 				</fileset>
@@ -320,22 +315,11 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="logo_big.gif" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed />
-				<!--
-			<association mime-type="application-x/ext-file" extensions="fa"/>
-		        <association mime-type="application-x/ext-file" extensions="fasta"/>
-		        <association mime-type="application-x/ext-file" extensions="fastq"/>
-		        <association mime-type="application-x/ext-file" extensions="blc"/>
-		        <association mime-type="application-x/ext-file" extensions="msf"/>
-		        <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>
-				<j2se version="1.5+" initial_heap_size="256M" max_heap_size="1024M" />
+				<j2se version="${j2sev}" initial_heap_size="256M" max_heap_size="1024M" />
 				<fileset dir="${packageDir}">
 					<include name="jalview.jar" />
 				</fileset>
@@ -352,7 +336,27 @@
 				<all_permissions />
 			</security>
 		</jnlp>
-
+			<!-- finally, need to postprocess to add in associations at end of 'information' element 
+			
+			<xslt in="${packageDir}/jalview_noa_1G.jnlp" out="${packageDir}/jalview_1G.jnlp">
+		
+		</xslt>
+			
+			
+			-->
+					<!--
+				<association mime-type="application-x/ext-file" extensions="fa"/>
+        <association mime-type="application-x/ext-file" extensions="fasta"/>
+        <association mime-type="application-x/ext-file" extensions="fastq"/>
+        <association mime-type="application-x/ext-file" extensions="blc"/>
+        <association mime-type="application-x/ext-file" extensions="msf"/>
+        <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"/>
+        <association mime-type="application-x/ext-file" extensions="stk"/>
+        <association mime-type="application-x/ext-file" extensions="jar"/>-->
+	
 	</target>
 
 	<target name="runenv" depends="init">
@@ -416,9 +420,12 @@
 				<include name="*.jar"/>
 			</fileset>
 		</delete>
-		<jar destfile="${packageDir}/${outputJar}">
+		<jar destfile="${packageDir}/${outputJar}" index="true">
 			<manifest>
 				<attribute name="Main-Class" value="jalview.bin.Jalview" />
+        <attribute name="Permissions" value="all-permissions" />
+        <attribute name="Application-Name" value="Jalview Desktop"/>
+        <attribute name="Codebase" value="${application.codebase}"/>
 			</manifest>
 			<fileset dir="${outputDir}/">
 				<exclude name="cache*/**" />
@@ -464,9 +471,12 @@
 	<target name="packageApplet" depends="compileApplet, buildPropertiesFile">
 		<copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif" />
 		<copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif" />
-		<jar destfile="in.jar">
+		<jar destfile="in.jar" index="true">
 			<manifest>
 				<attribute name="Main-Class" value="jalview.bin.JalviewLite" />
+				<attribute name="Application-Name" value="JalviewLite"/>
+        			<attribute name="Permissions" value="all-permissions" />
+				<attribute name="Codebase" value="${applet.codebase}"/>
 			</manifest>
 			<fileset dir="${outputDir}">
 				<include name="com/**" />
@@ -496,11 +506,17 @@
 			<injar file="in.jar" />
 			<outjar file="${jalviewLiteJar}" />
 			<libraryjar refid="obfuscateDeps.path" />
+			<dontwarn/>
 			<keep access="public" type="class" name="jalview.bin.JalviewLite">
 				<field access="public" />
 				<method access="public" />
 				<constructor access="public" />
 			</keep>
+			<keep access="public" type="class" name="jalview.appletgui.AlignFrame">
+				<field access="public" />
+				<method access="public" />
+				<constructor access="public" />
+			</keep>
 			<!--      -libraryjars "${obfuscateDeps}"
       -injars      in.jar
       -outjars     jalviewApplet.jar
@@ -577,13 +593,54 @@
       <include name="jmol/*"/>
 	  </fileset>
 	  	<fileset dir=".">
-	  	<include name="jalviewApplet.jar"/>
+	  	<include name="${jalviewLiteJar}"/>
 	  		</fileset>
 	  	<fileset dir="appletlib">
 	  	      <include name="**/*"/>
 	  	        </fileset>
 	  </copy>
-	  		
+	  <presetdef name="applet.jar">
+	    <jar update="true" index="true">
+	    	<manifest>
+	        <attribute name="Application-Name" value="JalviewLite"/>
+     		<attribute name="Permissions" value="all-permissions"/>
+		<attribute name="Codebase" value="${applet.codebase}"/>
+		<attribute name="Caller-Allowable-Codebase" value="${applet.caller-codebase}"/>
+		<attribute name="Application-Library-Allowable-Codebase" value="${applet.codebase}"/>
+		<!--
+		<attribute name="Application-Library-Allowable-Codebase" value="${applet.codebase}"/>
+		-->
+<!--		<attribute name="Trusted-Only" value="true"/>
+-->
+<!-- 		<attribute name="Trusted-Library" value="true"/>
+-->
+		</manifest>
+	  </jar>
+	  </presetdef>
+	  <presetdef name="applet_tl.jar">
+	    <jar update="true" index="true" jarfile="@{jarfile}">
+	    	<manifest>
+	        <attribute name="Application-Name" value="JalviewLite"/>
+     		<attribute name="Permissions" value="all-permissions" />
+		<attribute name="Codebase" value="${applet.codebase}"/>
+		<attribute name="Trusted-Only" value="true"/>
+ 		<attribute name="Trusted-Library" value="true"/>
+		</manifest>
+	  </jar>
+
+	  </presetdef>
+	  <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/tl_${jalviewLiteJar}"/>
+	  <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/tl_${jmolJar}"/>
+	  <applet.jar jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
+	  <applet_tl.jar jarfile="${packageDir}/examples/tl_${jalviewLiteJar}"/>
+	  <applet.jar jarfile="${packageDir}/examples/${jmolJar}"/>
+	  <applet_tl.jar jarfile="${packageDir}/examples/tl_${jmolJar}"/>
+    <signjar 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="sourcedoc" description="Create jalview source documentation pages" depends="init">
 	 <javadoc destdir="${javadocDir}">