Merge branch 'JAL-1286' into develop

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 2673e9b..ce9b550 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.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>
@@ -154,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"/>
@@ -458,12 +463,14 @@
                <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">
                <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif" />
                <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif" />
+               <copy todir="${outputDir}/lang">
+                       <fileset dir="${resourceDir}/lang"><include name="**.*"/></fileset></copy>
                <jar destfile="in.jar" index="true">
                        <manifest>
                                <attribute name="Main-Class" value="jalview.bin.JalviewLite" />
@@ -479,6 +486,7 @@
                                <include name=".build_properties" />
                                <include name="images/idwidth.gif" />
                                <include name="images/link.gif" />
+                               <include name="lang/**" />
                        </fileset>
                </jar>
        </target>