X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fbuild.xml;h=bd299e223b5955fda8feff681d52f264d3112620;hb=ad896f6e18663a95f887e00ea9c24f73f3d387e6;hp=7b16b83682832325fc6ceb221785bb2686338d50;hpb=7beaa707720e2b059be6d5324905d5f68deafdac;p=jalview.git

diff --git a/forester/java/build.xml b/forester/java/build.xml
index 7b16b83..bd299e2 100644
--- a/forester/java/build.xml
+++ b/forester/java/build.xml
@@ -5,13 +5,14 @@
 	<property name="classes.dir" value="classes" />
 	<property name="jars.dir" value="resources" />
 	<property name="itextjar" value="${jars.dir}/itextpdf-5.1.0.jar" />
+	<property name="commonscodecjar" value="${jars.dir}/commons-codec-1.5.jar" />
 	<property name="forester_jar" value="forester.jar" />
 	<property name="archaeopteryx_applets_jar" value="archaeopteryx_applets.jar" />
 
 	<target name="clean" description="Delete all generated files">
-		<delete dir="${classes.dir}" failonerror="false" />
-		<delete file="${forester_jar}" />
-		<delete file="${archaeopteryx_applets_jar}" />
+	    <delete dir="${classes.dir}" failonerror="false" />
+	    <delete file="${forester_jar}" />
+	    <delete file="${archaeopteryx_applets_jar}" />
 	</target>
 
     <target name="copy_resources" description="Copies resources">
@@ -19,18 +20,21 @@
         <copy verbose="true"
           file="../resources/phyloxml_schema/1.10/phyloxml.xsd"
           todir="${classes.dir}/resources"/>
+        <copy verbose="true"
+          file="../resources/synth_laf/synth_look_and_feel_1.xml"
+          todir="${classes.dir}/resources"/>
     </target>
 
 	<target name="compile" description="Compiles the Task" depends="clean">
 		<mkdir dir="${classes.dir}" />
-		<javac source="1.5" target="1.5" debug="true" debuglevel="lines,source" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar}">
+		<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}">
 			<compilerarg value="-Xlint:deprecation" />
 		</javac> 
 	</target>
 
 	<target name="compile_applets_only" description="Compiles the Task" depends="clean">
 		<mkdir dir="${classes.dir}" />
-		<javac source="1.5" target="1.5" debug="false" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar}">
+		<javac source="1.6" target="1.6" debug="false" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar};${commonscodecjar}">
 			<compilerarg value="-Xlint:deprecation" />
 		</javac> 
 	</target>
@@ -44,6 +48,12 @@
                 <exclude name="**/*Test*.class" />
             </patternset>
         </unjar>
+        <unjar src="${commonscodecjar}" dest="${classes.dir}">
+            <patternset>
+                <include name="**/*.class" />
+                <exclude name="**/*Test*.class" />
+            </patternset>
+        </unjar>
 		<jar level="9" destfile="${forester_jar}" basedir="${classes.dir}" excludes="**/Test.class" duplicate="fail" index="true">
 			<manifest>
 				<attribute name="Main-Class" value="org.forester.archaeopteryx.Archaeopteryx" />
@@ -52,6 +62,12 @@
 	</target>
 
 	<target name="jar_applets_only" description="JARs the classes files" depends="compile_applets_only,copy_resources">
+		<unjar src="${commonscodecjar}" dest="${classes.dir}">
+            <patternset>
+                <include name="**/*.class" />
+                <exclude name="**/*Test*.class" />
+            </patternset>
+        </unjar>
 		<jar level="9" destfile="${archaeopteryx_applets_jar}" basedir="${classes.dir}" excludes="org/forester/application/** 
 			          org/forester/development/**
 			          org/forester/evoinference/**
@@ -60,8 +76,8 @@
 			          org/forester/pccx/**
 			          org/forester/surfacing/**
 			          org/forester/test/**
-			          org/forester/tools/**
-			          " duplicate="fail" index="true">
+			          org/forester/tools/**"
+			          duplicate="fail" index="true">
 		</jar>
 	</target>