<?xml version="1.0"?>
<!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
<!-- 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 -->
</fileset>
<pathelement location="appletlib/${jmolJar}" />
<pathelement location="lib/${varnaJar}" />
+ <pathelement location="lib/${jsoup}" />
+ <pathelement location="lib/${jsonSimple}" />
+ <pathelement location="lib/${javaJson}" />
+
</path>
<!-- default location for outputting javadoc -->
<property name="javadocDir" value="${packageDir}/javadoc"/>
<tstamp prefix="build">
<format property="date" pattern="dd MMMM yyyy" />
</tstamp>
+ <exec executable="/usr/bin/git" outputproperty="git.commit" failifexecutionfails="false">
+ <arg value="rev-parse"/>
+ <arg value="--short"/>
+ <arg value="HEAD"/>
+ </exec>
+ <exec executable="/usr/bin/git" outputproperty="git.branch" failifexecutionfails="false">
+ <arg value="rev-parse"/>
+ <arg value="--abbrev-ref"/>
+ <arg value="HEAD"/>
+ </exec>
<properties file="${outputDir}/.build_properties">
<header>
---Jalview Build Details---
</header>
<property name="VERSION" value="${JALVIEW_VERSION}" />
- <property name="INSTALLATION" value="${INSTALLATION}" />
+ <property name="INSTALLATION" value="${INSTALLATION} git-commit:${git.commit} [${git.branch}]" />
<property name="BUILD_DATE" value="${build.date}" />
</properties>
</target>
<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">
<path id="obfuscateDeps.path">
<pathelement location="${applet.jre.tools}" />
<pathelement location="appletlib/${jmolJar}" />
+ <pathelement location="appletlib/${jsonSimple}" />
+ <pathelement location="appletlib/${javaJson}" />
</path>
<taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
</fileset>
</copy>
<jar update="true" index="true" jarfile="${packageDir}/examples/${jalviewLiteJar}"/>
+ <jar update="true" index="true" jarfile="${packageDir}/examples/${javaJson}"/>
+ <jar update="true" index="true" jarfile="${packageDir}/examples/${jsonSimple}"/>
<jar update="true" index="true" jarfile="${packageDir}/examples/${jmolJar}">
<manifest>
<attribute name="Application-Name" value="Jmol (bundled with JalviewLite)"/>
<!-- create differently privileged artefacts -->
<copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/u_${jalviewLiteJar}" />
<copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true"/>
+ <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/u_${javaJson}" overwrite="true"/>
+ <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/u_${jsonSimple}" overwrite="true"/>
<copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/ap_${jalviewLiteJar}" />
<copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/ap_${jmolJar}"/>
+ <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/ap_${javaJson}"/>
+ <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/ap_${jsonSimple}"/>
<ap_applet.jar jarfile="${packageDir}/examples/ap_${jalviewLiteJar}" />
<ap_applet.jar jarfile="${packageDir}/examples/ap_${jmolJar}" />
+ <ap_applet.jar jarfile="${packageDir}/examples/ap_${javaJson}" />
+ <ap_applet.jar jarfile="${packageDir}/examples/ap_${jsonSimple}" />
<copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/tl_${jalviewLiteJar}" />
<copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/tl_${jmolJar}" />
+ <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/tl_${javaJson}" />
+ <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/tl_${jsonSimple}" />
<tl_applet.jar jarfile="${packageDir}/examples/tl_${jalviewLiteJar}" />
<tl_applet.jar jarfile="${packageDir}/examples/tl_${jmolJar}" />
+ <tl_applet.jar jarfile="${packageDir}/examples/tl_${javaJson}" />
+ <tl_applet.jar jarfile="${packageDir}/examples/tl_${jsonSimple}" />
<copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/to_${jalviewLiteJar}" />
<copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/to_${jmolJar}" />
+ <copy file="${packageDir}/examples/${javaJson}" tofile="${packageDir}/examples/to_${javaJson}" />
+ <copy file="${packageDir}/examples/${jsonSimple}" tofile="${packageDir}/examples/to_${jsonSimple}" />
<to_applet.jar jarfile="${packageDir}/examples/to_${jalviewLiteJar}" />
<to_applet.jar jarfile="${packageDir}/examples/to_${jmolJar}" />
+ <to_applet.jar jarfile="${packageDir}/examples/to_${javaJson}" />
+ <to_applet.jar jarfile="${packageDir}/examples/to_${jsonSimple}" />
<!-- finally, create manifest for original jars -->
<applet.jar jarfile="${packageDir}/examples/${jalviewLiteJar}" />
<applet.jar jarfile="${packageDir}/examples/${jmolJar}" />
+ <applet.jar jarfile="${packageDir}/examples/${javaJson}" />
+ <applet.jar jarfile="${packageDir}/examples/${jsonSimple}" />
<!-- todo - write examples/downloads for alternate versions of the applet -->
<signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
<exclude name="u_*.jar"/>
<include name="${jalviewLiteJar}" />
<include name="${jmolJar}" />
+ <include name="${javaJson}" />
+ <include name="${jsonSimple}" />
<include name="to_${jalviewLiteJar}" />
<include name="to_${jmolJar}" />
+ <include name="to_${javaJson}" />
+ <include name="to_${jsonSimple}" />
<include name="tl_${jalviewLiteJar}" />
<include name="tl_${jmolJar}" />
+ <include name="tl_${javaJson}" />
+ <include name="tl_${jsonSimple}" />
<include name="ap_${jalviewLiteJar}" />
<include name="ap_${jmolJar}" />
+ <include name="ap_${javaJson}" />
+ <include name="ap_${jsonSimple}" />
</fileset>
</signjar>
<!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
<copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
+ <!-- finally, replace any launchApp servlet tags with a version specification -->
+ <replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}"">
+ <replacetoken><![CDATA[http://www.jalview.org/services/launchApp"]]></replacetoken>
+ <fileset dir="${packageDir}/examples">
+ <include name="**/*.html"/>
+ </fileset>
+ </replace>
+ <replace value="http://www.jalview.org/services/launchApp?version=${JALVIEW_VERSION}'">
+ <replacetoken><![CDATA[http://www.jalview.org/services/launchApp']]></replacetoken>
+ <fileset dir="${packageDir}/examples">
+ <include name="**/*.html"/>
+ </fileset>
+ </replace>
+
</target>
<target name="sourcedoc" description="Create jalview source documentation pages" depends="init">
<javadoc destdir="${javadocDir}">