1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
Description: Use packaged dependencies instead of ivy downloading them.
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,8 @@
<property name="project.name" value="${ant.project.name}"/>
+ <property name="deblib" value="/usr/share/java"/>
+
<!--
This file is not checked into svn, so you can create it and put any
property definitions that you want to override those below.
@@ -46,7 +48,7 @@
<property name="project.jar" value="${dist}/${project.name}.jar"/>
<!-- Third party libraries -->
- <property name="xpp.jar" location="${lib}/compile/xpp3-1.1.4c.jar"/>
+ <property name="xpp.jar" location="${deblib}/xpp3.jar"/>
<!-- the project's build timestamp -->
<tstamp>
@@ -71,13 +73,23 @@
<!-- Classpaths -->
<path id="classpath">
<pathelement location="${build.classes}"/>
- <fileset dir="${ivy.lib.dir}/compile" />
+ <fileset dir="${deblib}/">
+ <include name="fastutil.jar"/>
+ <include name="protobuf.jar"/>
+ <include name="osmpbf.jar"/>
+ <include name="xpp3.jar"/>
+ </fileset>
</path>
<path id="test.classpath">
<path refid="classpath"/>
<pathelement location="${build.test-classes}"/>
- <fileset dir="${ivy.lib.dir}/test" includes="*.jar"/>
+ <fileset dir="${deblib}/">
+ <include name="testng.jar"/>
+ <include name="bsh.jar"/>
+ <include name="jcommander.jar"/>
+ <include name="junit4.jar"/>
+ </fileset>
</path>
<!-- targets for downloading and registering ivy -->
@@ -212,14 +224,14 @@
</propertyfile>
</target>
- <target name="compile" depends="prepare, resolve-compile" description="main compilation">
+ <target name="compile" depends="prepare" description="main compilation">
<javac srcdir="${src}" destdir="${build.classes}" debug="yes" includeantruntime="false">
<include name="**/*.java"/>
<classpath refid="classpath"/>
</javac>
</target>
- <target name="compile.tests" depends="prepare, resolve-test" description="test compilation">
+ <target name="compile.tests" depends="prepare" description="test compilation">
<javac srcdir="${test}" destdir="${build.test-classes}" debug="yes" includeantruntime="false">
<include name="**/*.java"/>
<classpath refid="test.classpath"/>
@@ -271,7 +283,7 @@
</copy>
<copy todir="${dist}/lib">
- <fileset dir="${lib}/compile"/>
+ <path refid="classpath" />
</copy>
<!-- misc -->
|
