X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=47a0188b92d751b087c2b71ebae681b5bc92e8c6;hb=e1d776602ceedd69cae590bcf85836d7b32c5993;hp=d843c00feff6460d01b2628a77953672988817ba;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git

diff --git a/build.xml b/build.xml
index d843c00..47a0188 100755
--- a/build.xml
+++ b/build.xml
@@ -88,8 +88,11 @@
 		<!-- 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+"/>
+<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
+		<property name="j2sev" value="1.7+"/>
 		<!-- build directory configuration -->
 		<property name="libDir" value="lib" />
 		<property name="resourceDir" value="resources" />
@@ -101,7 +104,8 @@
 		<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="varnaJar" value="VARNAv3-9-dev.jar" />
 		<property name="jalviewLiteJar" value="jalviewApplet.jar" />
 		<!-- switch to indicate if we should obfuscate jalviewLite -->
 		<!--<property name="donotobfuscate" value="true"/> -->
@@ -131,6 +135,7 @@
 				<!-- the JmolApplet includes the JmolApplet console and the application javac seems to always try and build all packages 
 				-->
 				<include name="${jmolJar}" />
+				<include name="${varnaJar}" />
 			</fileset>
 
 		</path>
@@ -232,6 +237,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" -->
@@ -243,8 +254,8 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="logo_big.gif" />
-				<offline_allowed />
+				<icon href="${WebStartImage}" />
+				<offline_allowed/>
 			</information>
 			<resources>
 				<j2se version="${j2sev}" initial_heap_size="10M"  />
@@ -271,7 +282,7 @@
 				<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 />
 			</information>
 			<resources>
@@ -299,7 +310,7 @@
 				<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 />
 			</information>
 			<resources>
@@ -338,7 +349,8 @@
         <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="stk"/>
+        <association mime-type="application-x/ext-file" extensions="jar"/>-->
 	
 	</target>