X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=8e4d44da92b2e21f0e94daa948b6725fa28b288e;hb=28b416f0fdb491114107ef88f7b60baaca1d00d7;hp=b2a39c6144e15b66423ce2d0ff07733d65316a1d;hpb=d784cd9ba115825b38ae35af510bf435a5fb3a56;p=jalview.git

diff --git a/build.xml b/build.xml
index b2a39c6..8e4d44d 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" />
@@ -102,6 +105,7 @@
 		<property name="outputJar" value="jalview.jar" />
 		<!-- Jalview Applet JMol Jar Dependency -->
 		<property name="jmolJar" value="JmolApplet-12.2.4.jar" />
+		<property name="varnaJar" value="VARNAv3-9.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>
@@ -152,6 +157,8 @@
 				<include name="plugin.jar"/>
 			</fileset>
 			<pathelement location="appletlib/${jmolJar}" />
+      <pathelement location="lib/${varnaJar}" />
+
 		</path>
     <!-- default location for outputting javadoc -->
     <property name="javadocDir" value="${packageDir}/javadoc"/>
@@ -234,7 +241,7 @@
 		</signjar>
 		<copy todir="${packageDir}">
 			<fileset dir="${resourceDir}/images">
-				<include name="JalviewLogo_big.png"/>
+				<include name="${WebStartImage}"/>
 			</fileset>
 					</copy>
 		
@@ -249,7 +256,7 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="JalviewLogo_big.png" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed/>
 			</information>
 			<resources>
@@ -277,7 +284,7 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="JalviewLogo_big.png" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed />
 			</information>
 			<resources>
@@ -305,7 +312,7 @@
 				<homepage href="http://www.jalview.org" />
 				<description>Jalview Multiple Alignment Editor</description>
 				<description kind="short">Jalview</description>
-				<icon href="JalviewLogo_big.png" />
+				<icon href="${WebStartImage}" />
 				<offline_allowed />
 			</information>
 			<resources>
@@ -452,7 +459,7 @@
 		<mkdir dir="${outputDir}" />
 		<javac source="1.5" target="1.5" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" 
 			classpathref="jalviewlite.deps" includes="jalview/appletgui/**"
-			excludes="ext/**,MCview/**,org/**,vamsas/**" />
+			excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/ext/paradise/**" />
 	</target>
 
 	<target name="packageApplet" depends="compileApplet, buildPropertiesFile">