[tor-commits] [metrics-db/master] Fix build errors on Debian systems

[karsten at torproject.org]

commit 12cdab447ab65fb0044ecc1818d37b2523187708
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Aug 22 16:04:42 2013 +0200

    Fix build errors on Debian systems
    
    This ports commit 3e60ccdaaba598cabb7281d45f9a415299b8e3e3 from
    metrics-lib over, originally written by Jens-Michael Hoffmann
    <jmho at jmho.de>, with minor tweaks by Karsten Loesing.
    
    The local lib directory is not used anymore and respective references
    were removed. The java dependencies are now specified in the build.xml
    and taken from their installed locations.
    
    In addition to git, openjdk-6-jdk and ant the following java packages
    have to be installed:
     - libcommons-codec-java
     - libcommons-compress-java
    
    Slighty tweaked by Sebastian Hahn to remove references to unused junit.
---
 build.xml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index afdc195..4b5c2ff 100644
--- a/build.xml
+++ b/build.xml
@@ -5,10 +5,10 @@
   <property name="name" value="ERNIE"/>
   <path id="classpath">
     <pathelement path="${classes}"/>
-    <pathelement location="lib/commons-codec-1.4.jar"/>
-    <pathelement location="lib/commons-compress-1.3.jar"/>
-    <pathelement location="lib/junit-4.8.2.jar"/>
-    <pathelement location="lib/descriptor.jar"/>
+    <fileset dir="/usr/share/java">
+      <include name="commons-codec.jar"/>
+      <include name="commons-compress.jar"/>
+    </fileset>
   </path>
   <target name="init">
     <mkdir dir="${classes}"/>