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
77
78
79
80
81
|
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
Date: Tue, 25 Oct 2022 21:38:20 -0400
Subject: junit_path_for_tests
Use system-provided libraries instead of bundled jars.
Forwarded: not-needed
---
build.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Index: jffi/build.xml
===================================================================
--- jffi.orig/build.xml
+++ jffi/build.xml
@@ -2,8 +2,8 @@
<project name="jffi" default="jar" basedir=".">
<description>Builds, tests, and runs the project jffi.</description>
<path id="classpath.test">
- <pathelement location="lib/junit_4/junit-4.11.jar"/>
- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</path>
<target name="clean-java" depends="-init">
@@ -178,8 +178,8 @@
<classpath>
<pathelement location="${build.classes.dir}"/>
<pathelement location="${build.test.dir}/classes"/>
- <pathelement location="lib/junit_4/junit-4.11.jar"/>
- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</classpath>
<sysproperty key="java.library.path" value="${build.native.dir}"/>
@@ -198,8 +198,8 @@
<pathelement location="${build.classes.dir}"/>
<pathelement location="${build.test.dir}/classes"/>
<fileset dir="archive" includes="*.jar"/>
- <pathelement location="lib/junit_4/junit-4.11.jar"/>
- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</classpath>
<formatter type="plain" /> <!-- to file -->
@@ -217,8 +217,8 @@
<pathelement location="${build.classes.dir}"/>
<pathelement location="${build.test.dir}/classes"/>
<fileset dir="archive" includes="*.jar"/>
- <pathelement location="lib/junit_4/junit-4.11.jar"/>
- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</classpath>
<sysproperty key="jffi.extract.name" value=""/>
@@ -241,8 +241,8 @@
<classpath>
<pathelement location="${build.classes.dir}"/>
<pathelement location="${build.test.dir}/classes"/>
- <pathelement location="lib/junit_4/junit-4.11.jar"/>
- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</classpath>
<sysproperty key="java.library.path" value="${build.native.dir}"/>
<formatter type="plain" usefile="false"/>
@@ -263,8 +263,8 @@
<javac srcdir="${src.test.dir}" destdir="${build.test.dir}/classes" includeantruntime="false" classpathref="classpath.test">
<classpath>
<pathelement location="${build.classes.dir}"/>
- <pathelement location="lib/junit_4/junit-4.11.jar"/>
- <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</classpath>
</javac>
</target>
|
