From 6e511206c98a210590bf30eadbcaf34005248127 Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Mon, 2 Dec 2013 09:28:23 +0100
Subject: [PATCH] minor build file additions
---
build.xml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index 9a76e23..489e940 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="Worker" default="build-all" basedir=".">
- <property name="src.dir" value="src"/>
<property name="common-monitoring.dir" value="../common-monitoring"/>
+
+ <property name="src.dir" value="src"/>
<property name="build.dir" value="build"/>
<property name="jar.dir" value="dist"/>
@@ -38,16 +39,17 @@
</jar>
</target>
- <target name="compile">
- <mkdir dir="${build.dir}"/>
-
+ <target name="compile" depends="copy-from-common">
+ <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="classpath" includeantruntime="false" />
+ </target>
+
+ <target name="copy-from-common">
<ant antfile="${common-monitoring.dir}/build.xml" dir="${common-monitoring.dir}" />
+ <mkdir dir="${build.dir}"/>
<copy todir="${build.dir}">
<fileset dir="${common-monitoring.dir}/dist"/>
</copy>
-
- <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="classpath" debug="true"/>
</target>
<path id="classpath">
@@ -85,6 +87,9 @@
<path id="testclasspath">
<pathelement path="${build.dir}" />
- <fileset dir="lib" includes="*.jar" />
+ <fileset dir=".">
+ <include name="build/*.jar"/>
+ <include name="lib/*.jar"/>
+ </fileset>
</path>
</project>
\ No newline at end of file
--
GitLab