From 3b2726c06b169a28b8c53a7cb9aaf3ba23c5bff9 Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Sun, 1 Dec 2013 23:50:22 +0100
Subject: [PATCH] fetching jar instead of own build from common-monitoring
---
build.xml | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index eaaf4a7..9a76e23 100644
--- a/build.xml
+++ b/build.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Worker" default="build-all-worker" basedir=".">
- <property name="src-common.dir" value="../common-monitoring/src"/>
-
+<project name="Worker" default="build-all" basedir=".">
<property name="src.dir" value="src"/>
+ <property name="common-monitoring.dir" value="../common-monitoring"/>
<property name="build.dir" value="build"/>
<property name="jar.dir" value="dist"/>
@@ -11,7 +10,7 @@
<!-- MAIN JOBS -->
- <target name="build-all-worker" depends="clean,jar" description="Compiles and packages the Worker Jar">
+ <target name="build-all" depends="clean,jar" description="Compiles and packages the Worker Jar">
</target>
<target name="clean" description="Removes artifacts from previous builds">
@@ -28,23 +27,32 @@
<attribute name="Class-Path" value="."/>
<attribute name="Can-Redefine-Classes" value="true"/>
</manifest>
- <fileset dir="${build.dir}"/>
+ <fileset dir="${build.dir}">
+ <exclude name="*common*.jar"/>
+ </fileset>
<fileset dir="lib">
- <include name="*.LICENSE"/>
+ <include name="*LICENSE*"/>
</fileset>
<zipfileset excludes="META-INF/*.SF" src="lib/disruptor-3.2.0.jar"/>
+ <zipfileset excludes="META-INF/*.SF" src="${build.dir}/explorviz-common.jar"/>
</jar>
</target>
-
+
<target name="compile">
<mkdir dir="${build.dir}"/>
- <javac srcdir="${src-common.dir}" destdir="${build.dir}" classpathref="classpath" debug="true"/>
+ <ant antfile="${common-monitoring.dir}/build.xml" dir="${common-monitoring.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">
<fileset dir=".">
+ <include name="build/*.jar"/>
<include name="lib/*.jar"/>
</fileset>
</path>
--
GitLab