JAL-1159 patch for building menard branch on cruisecontrol
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 31 Aug 2012 16:01:39 +0000 (17:01 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 31 Aug 2012 16:01:39 +0000 (17:01 +0100)
build.xml

index 6e3a2f2..ba0738e 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -89,7 +89,8 @@
                <!-- Url path for WebStart in JNLP file -->
                <property name="WebStartLocation" value="http://www.jalview.org/webstart" />
                <!-- 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" />
                <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"/> -->
                                <!-- 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>