<!-- J2SE version needed for webstart launch -->
<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
<property name="j2sev" value="1.7+"/>
-
+ <!-- Java Compilation settings - source and target javac version -->
+ <property name="javac.source" value="1.7"/>
+ <property name="javac.target" value="1.7"/>
+
<!-- Permissions for running Java applets and applications. -->
<!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
<property name="application.codebase" value="*.jalview.org" />
<property name="packageDir" value="dist" />
<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-91.jar" />
+ <property name="jmolJar" value="JmolApplet-14.2.14_2015.06.11.jar" />
+ <property name="varnaJar" value="VARNAv3-93.jar" />
<property name="jsoup" value="jsoup-1.8.1.jar" />
<property name="jsonSimple" value="json_simple-1.1.jar" />
<property name="javaJson" value="java-json.jar" />
<property name="jalviewLiteJar" value="jalviewApplet.jar" />
+ <property name="reportDir" value="test-reports" />
+ <property name="testDir" value="test" />
+ <property name="testOutputDir" value="tests" />
<!-- switch to indicate if we should obfuscate jalviewLite -->
<!-- <property name="donotobfuscate" value="true"/> -->
<!-- switch to exclude associations from generated jnlp files -->
<target name="build" depends="prepare">
<!-- not efficient yet. -->
- <javac source="1.5" target="1.5" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpathref="build.classpath">
+ <javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}" classpathref="build.classpath">
<exclude name="jalview/*applet*" />
<exclude name="jalview/appletgui/**" />
<exclude name="com/stevesoft/**" />
</javac>
</target>
+
+
+ <target name="testclean" depends="init">
+ <delete dir="${testOutputDir}" includes="*,**/*"/>
+ </target>
+
+ <target name="prepareTests" depends="init">
+ <mkdir dir="${testOutputDir}" />
+ <copy todir="${testOutputDir}">
+ <fileset dir=".">
+ <include name="${docDir}/**/*.*" />
+ <include name="${helpDir}/**/*.*" />
+ <include name="${libDir}/*.jar" />
+ </fileset>
+ <fileset dir="${resourceDir}">
+ <include name="**/*.*" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="buildTests" depends="prepareTests">
+ <javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${testOutputDir}"
+ debug="${javac.debug}" classpathref="build.classpath" includeantruntime="false" >
+ </javac>
+ <javac source="${javac.source}" target="${javac.target}" srcdir="${testDir}" destdir="${testOutputDir}"
+ debug="${javac.debug}" classpathref="build.classpath" includeantruntime="false" >
+ </javac>
+ </target>
+
+ <taskdef name="testng" classname="org.testng.TestNGAntTask" >
+ <classpath location="utils/testnglibs/testng.jar" />
+ </taskdef>
+
+ <target name="testng" depends="buildTests">
+ <testng classpathref="build.classpath" outputDir="${reportDir}"
+ haltOnFailure="false">
+ <classpath location="${testOutputDir}" />
+ <xmlfileset dir="utils" includes="jalview_testng.xml" />
+ </testng>
+ </target>
+
<target name="buildindices" depends="init, prepare" unless="help.uptodate">
<java classname="com.sun.java.help.search.Indexer" classpathref="build.classpath" fork="true" dir="${outputDir}/${helpDir}">
<arg line="html" />
<target name="compileApplet" depends="init,clean">
<mkdir dir="${outputDir}" />
- <javac source="1.5" target="1.5" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}"
+ <javac source="${javac.source}" target="${javac.target}" srcdir="${sourceDir}" destdir="${outputDir}" debug="${javac.debug}"
classpathref="jalviewlite.deps" includes="jalview/appletgui/**"
- excludes="ext/**,MCview/**,org/**,vamsas/**,jalview/ext/paradise/**" />
+ excludes="ext/**,gui/**,jbgui/**,MCview/**,org/**,vamsas/**,jalview/ext/rbvi/**,jalview/ext/paradise/**" />
</target>
<target name="packageApplet" depends="compileApplet, buildPropertiesFile">