in progress

[jalview.git] / forester / java / build.xml

diff --git a/forester/java/build.xml b/forester/java/build.xml
index 63e3e21..2cbdd38 100644 (file)
--- a/forester/java/build.xml
+++ b/forester/java/build.xml
@@ -28,15 +28,17 @@
 
        <target name="compile" description="Compiles the Task" depends="clean">
                <mkdir dir="${classes.dir}" />
-               <javac source="1.6" target="1.6" debug="true" debuglevel="lines,source" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar};${commonscodecjar};${openchartjar}">
+               <javac source="1.8" target="1.8" debug="true" debuglevel="lines,source" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar};${commonscodecjar};${openchartjar}">
                        <compilerarg value="-Xlint:deprecation" />
+                       <compilerarg value="-Xlint:unchecked" />
                </javac> 
        </target>
 
        <target name="compile_applets_only" description="Compiles the Task" depends="clean">
                <mkdir dir="${classes.dir}" />
-               <javac source="1.6" target="1.6" debug="false" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar};${commonscodecjar}">
+               <javac source="1.8" target="1.8" debug="true" debuglevel="lines,source" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar};${commonscodecjar};${openchartjar}">
                        <compilerarg value="-Xlint:deprecation" />
+                       <compilerarg value="-Xlint:unchecked" />
                </javac> 
        </target>
 
@@ -69,6 +71,14 @@
        </target>
 
        <target name="jar_applets_only" description="JARs the classes files" depends="compile_applets_only,copy_resources">
+               <unjar src="${itextjar}" dest="${classes.dir}">
+                   <patternset>
+                       <include name="**/*.class" />
+                       <include name="**/*.afm" />
+                       <include name="**/*.txt" />
+                       <exclude name="**/*Test*.class" />
+                   </patternset>
+                </unjar>
                <unjar src="${commonscodecjar}" dest="${classes.dir}">
             <patternset>
                 <include name="**/*.class" />
@@ -80,6 +90,7 @@
                                  org/forester/evoinference/**
                                  org/forester/go/**
                                  org/forester/go/etc/**
+                                 org/forester/msa_compactor/**
                                  org/forester/pccx/**
                                  org/forester/surfacing/**
                                  org/forester/test/**