X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fbuild.xml;h=149257050d11985c72261f788c3568434b1c4370;hb=83a8b55648437acc36f0e82ec065db173304f97c;hp=6213ab127d1ac255cffabad477ab5266571c9ec6;hpb=c66de2e416c78e67ad90bb4ba7cadb46c91018c8;p=jalview.git

diff --git a/forester/java/build.xml b/forester/java/build.xml
index 6213ab1..1492570 100644
--- a/forester/java/build.xml
+++ b/forester/java/build.xml
@@ -4,8 +4,8 @@
 	<property name="src.dir" value="src" />
 	<property name="classes.dir" value="classes" />
 	<property name="jars.dir" value="resources" />
-	<property name="itextjar" value="${jars.dir}/iText-2.1.7.jar" />
-	<!--<property name="fluorite_jar" value="${jars.dir}/fluorite.jar"/>-->
+	<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" />
 
@@ -20,6 +20,9 @@
         <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">
@@ -31,7 +34,7 @@
 
 	<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.5" target="1.5" debug="false" srcdir="${src.dir}" destdir="${classes.dir}" optimize="on" verbose="false" classpath="${itextjar};${commonscodecjar}">
 			<compilerarg value="-Xlint:deprecation" />
 		</javac> 
 	</target>
@@ -45,12 +48,6 @@
                 <exclude name="**/*Test*.class" />
             </patternset>
         </unjar>
-		<!--<unjar src="${fluorite_jar}" 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" />
@@ -59,8 +56,17 @@
 	</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" />
+            <include name="**/*.afm" />
+            <include name="**/*.txt" />
+            <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/**
 			          org/forester/go/**
 			          org/forester/go/etc/**
 			          org/forester/pccx/**