git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'JalScape/JAL-1332' of https://source.jalview.org/git/jalview into JalSc...
[jalview.git] / build.xml
diff --git a/build.xml b/build.xml
index e9528fc..0f81af7 100755 (executable)
--- 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.
  * 
@@ -88,6 +88,10 @@
                <!-- 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+"/>
                <!-- build directory configuration -->
                <property name="libDir" value="lib" />
                <property name="resourceDir" value="resources" />
@@ -99,7 +103,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"/> -->
@@ -230,6 +234,12 @@
                                <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 +251,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 +271,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 +279,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 +307,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 +328,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">