Merge branch 'develop' into menard

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 0f81af7..47a0188 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -91,7 +91,8 @@
                <!-- 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" />
@@ -104,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-dev.jar" />
                <property name="jalviewLiteJar" value="jalviewApplet.jar" />
                <!-- switch to indicate if we should obfuscate jalviewLite -->
                <!--<property name="donotobfuscate" value="true"/> -->
@@ -133,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>