<?xml version="1.0"?>
<!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
- *
- * This file is part of Jalview.
- *
- * Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * Jalview is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.
-->
<project name="jalviewX" default="usage" basedir=".">
<!-- we use jalopy to format our sources -->
<property name="packageDir" value="dist" />
<property name="outputJar" value="jalview.jar" />
<!-- Jalview Applet JMol Jar Dependency -->
- <property name="jmolJar" value="JmolApplet-12.1.11_dev.jar" />
+ <property name="jmolJar" value="JmolApplet-12.1.13.jar" />
<property name="jalviewLiteJar" value="jalviewApplet.jar" />
<!-- switch to indicate if we should obfuscate jalviewLite -->
<!--<property name="donotobfuscate" value="true"/> -->
<include name="*.jar" />
<include name="**/*.jar" />
</fileset>
+ <fileset dir="${java.home}/lib">
+ <include name="plugin.jar"/>
+ </fileset>
<fileset dir="appletlib">
<!-- the JmolApplet includes the JmolApplet console and the application javac seems to always try and build all packages
-->
<property name="source.dist.name" value="${basedir}/jalview-src.tar.gz" />
<!-- The Location of the java 1.1.8 jdk -->
<property name="java118.home" value="C:\Sun\jdk1.1.8" />
- <property name="applet.jre.tools" value="${java118.home}/lib/classes.zip" />
- <!-- jre for 1.4 version
+ <!--<property name="applet.jre.tools" value="${java118.home}/lib/classes.zip" />
+ --><!-- jre for 1.4 version -->
<property name="applet.jre.tools" value="${java.home}/lib/rt.jar"/>
- -->
+
<!-- the classpath for building the 1.1 applet -->
<path id="jalviewlite.deps">
<fileset dir="${java118.home}">
<include name="lib/classes.zip" />
</fileset>
+ <fileset dir="${java.home}/lib">
+ <include name="plugin.jar"/>
+ </fileset>
<pathelement location="appletlib/${jmolJar}" />
</path>
</target>
<target name="compileApplet" depends="init,clean">
<mkdir dir="${outputDir}" />
- <javac source="1.5" target="1.5" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpath="appletlib/${jmolJar}" includes="jalview/appletgui/**" excludes="ext/**,MCview/**,org/**,vamsas/**" />
+ <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/**" />
</target>
<target name="packageApplet" depends="compileApplet, buildPropertiesFile">