Depend on libasm4-java instead of libasm3-java
Emmanuel Bourg
9 years ago
|
0 |
jardiff (0.2-4) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* Team upload.
|
|
3 |
* Depend on libasm4-java instead of libasm3-java
|
|
4 |
|
|
5 |
-- Emmanuel Bourg <ebourg@apache.org> Mon, 15 Sep 2014 23:32:43 +0200
|
|
6 |
|
| 0 | 7 |
jardiff (0.2-3) unstable; urgency=low
|
| 1 | 8 |
|
| 2 | 9 |
* Team upload.
|
| 3 | 3 |
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
|
| 4 | 4 |
Uploaders: Damien Raude-Morvan <drazzib@debian.org>
|
| 5 | 5 |
Build-Depends: cdbs, debhelper (>= 5), default-jdk, ant
|
| 6 | |
Build-Depends-Indep: libasm3-java, libcommons-cli-java
|
|
6 |
Build-Depends-Indep: libasm4-java, libcommons-cli-java
|
| 7 | 7 |
Standards-Version: 3.8.4
|
| 8 | 8 |
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jardiff/
|
| 9 | 9 |
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jardiff/
|
|
| 11 | 11 |
|
| 12 | 12 |
Package: jardiff
|
| 13 | 13 |
Architecture: all
|
| 14 | |
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libasm3-java, libcommons-cli-java, java-wrappers
|
|
14 |
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libasm4-java, libcommons-cli-java, java-wrappers
|
| 15 | 15 |
Description: tool to visualise API differences between two JAR files
|
| 16 | 16 |
Jardiff is a tool to help visualise API differences between two different
|
| 17 | 17 |
versions of a project.
|
| 6 | 6 |
find_java_runtime all
|
| 7 | 7 |
|
| 8 | 8 |
# Define our classpath
|
| 9 | |
find_jars jardiff commons-cli asm3 asm3-commons
|
|
9 |
find_jars jardiff commons-cli asm4 asm4-commons
|
| 10 | 10 |
|
| 11 | 11 |
# Run JarDiff
|
| 12 | 12 |
run_java org.osjava.jardiff.Main $extra_args "$@"
|
|
0 |
--- a/src/java/org/osjava/jardiff/ClassInfoVisitor.java
|
|
1 |
+++ b/src/java/org/osjava/jardiff/ClassInfoVisitor.java
|
|
2 |
@@ -40,9 +40,10 @@
|
|
3 |
import java.util.HashMap;
|
|
4 |
import java.util.Map;
|
|
5 |
|
|
6 |
+import org.objectweb.asm.ClassVisitor;
|
|
7 |
import org.objectweb.asm.FieldVisitor;
|
|
8 |
import org.objectweb.asm.MethodVisitor;
|
|
9 |
-import org.objectweb.asm.commons.EmptyVisitor;
|
|
10 |
+import org.objectweb.asm.Opcodes;
|
|
11 |
|
|
12 |
/**
|
|
13 |
* A reusable class which uses the ASM to build up ClassInfo about a
|
|
14 |
@@ -50,7 +51,7 @@
|
|
15 |
*
|
|
16 |
* @author <a href="mailto:antony@cyberiantiger.org">Antony Riley</a>
|
|
17 |
*/
|
|
18 |
-public class ClassInfoVisitor extends EmptyVisitor
|
|
19 |
+public class ClassInfoVisitor extends ClassVisitor
|
|
20 |
{
|
|
21 |
/**
|
|
22 |
* The class file version.
|
|
23 |
@@ -92,6 +93,10 @@
|
|
24 |
* A map of field signature to a FieldInfo describing the field.
|
|
25 |
*/
|
|
26 |
private Map fieldMap;
|
|
27 |
+
|
|
28 |
+ public ClassInfoVisitor() {
|
|
29 |
+ super(Opcodes.ASM5);
|
|
30 |
+ }
|
|
31 |
|
|
32 |
/**
|
|
33 |
* Reset this ClassInfoVisitor so that it can be used to visit another
|
|
34 |
@@ -141,6 +146,6 @@
|
|
35 |
String signature, Object value) {
|
|
36 |
fieldMap.put(name,
|
|
37 |
new FieldInfo(access, name, desc, signature, value));
|
|
38 |
- return this;
|
|
39 |
+ return null;
|
|
40 |
}
|
|
41 |
}
|
| 0 | 0 |
01_fix_build_with_asm3.diff
|
|
1 |
02_fix_build_with_asm4.diff
|
| 8 | 8 |
JAVA_HOME := /usr/lib/jvm/default-java
|
| 9 | 9 |
ANT_HOME := /usr/share/ant
|
| 10 | 10 |
|
| 11 | |
DEB_JARS := commons-cli asm3 asm3-commons
|
|
11 |
DEB_JARS := commons-cli asm4 asm4-commons
|
| 12 | 12 |
|
| 13 | 13 |
DEB_ANT_BUILD_TARGET := jar
|
| 14 | 14 |
DEB_ANT_CLEAN_TARGET := clean
|