X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=4a04f60b95afc274ce84c644cebb95c81cf3187d;hb=refs%2Fheads%2Fdevelop;hp=6c7b389f555d97f942b45d6cd07507520e93f3a3;hpb=8c3557ddfef376a427b969c746c8a698e3931218;p=jabaws.git

diff --git a/build.xml b/build.xml
index 6c7b389..4a04f60 100644
--- a/build.xml
+++ b/build.xml
@@ -83,7 +83,10 @@
 		<!-- Engines -->
 		<include name="compbio/engine/**"/>
 		<!-- Runners -->
+		<include name="compbio/runner/**"/>
+		<!-- Runners -->
 		<include name="compbio/stat/collector/**"/>
+		<include name="compbio/ws/client/**"/>
 		<!-- Logging configuration -->
 	</fileset>
 
@@ -134,22 +137,22 @@
 		<!-- copy files to class path-->
 		<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
 		<!-- Complile the datamodel first -->
-		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the engines -->
-		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the runners -->
-		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the webservices -->
-		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
 			<compilerarg value="-Xlint:unchecked"/>
 			<classpath refid="project.classpath" />
 		</javac>
@@ -176,23 +179,23 @@
 		<!-- copy files to class path-->
 		<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
 		<!-- Complile the datamodel first -->
-		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the engines -->
-		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/engine" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:all" />
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the runners -->
-		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/runner" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
 		<!-- Complile the webservices -->
-		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+		<javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.6" source="1.6" includeantruntime="false" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
 			<compilerarg value="-Xlint:-unchecked" />
 			<classpath refid="project.classpath" />
 		</javac>
@@ -343,14 +346,18 @@
 	<target name="stat-updater" depends="compile" description="Prepare executable jar for stat updater">
 		<echo>Jar file: StatUpdater jar</echo>
 		<delete file="${basedir}/${stat-updater}"></delete>
+		<copy file="${basedir}/log/log4j.properties.updater" tofile="${basedir}/log4j.properties"/>
 		<jar jarfile="${basedir}/${stat-updater}">
+			<fileset dir="${basedir}">
+				<include name="log4j.properties"/>
+			</fileset>
 			<fileset refid="statupdater"/>
 			<zipgroupfileset excludes="META-INF/*" dir="" includes="WEB-INF/lib/log4j-1.2.15.jar" />
+			<zipgroupfileset excludes="META-INF/*" dir="" includes="WEB-INF/lib/derby-10.8.2.2.jar" />
 			<zipgroupfileset excludes="META-INF/*" dir="" includes="lib/jcommander-1.30.jar" />
 			<zipgroupfileset excludes="META-INF/*.SF" dir="${web.lib.path}" >
 				<include name="${compbio-util}"/>
-			</zipgroupfileset>
-			<manifest>
+			</zipgroupfileset>			<manifest>
 				<attribute name="Built-By" value="${author}" />
 				<attribute name="Main-Class" value="compbio.stat.collector.ExecutionStatUpdater" />
 				<attribute name="Class-Path" value="." />
@@ -359,6 +366,7 @@
 				<attribute name="Implementation-URL" value="${project.url}" />
 			</manifest>
 		</jar>
+		<delete file="${basedir}/log4j.properties"/>
 	</target>
 	
 	<target name="full-jabaws-client-jar" depends="compile" description="Pack datamodel, engine and runners">