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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
diff --git a/build.xml b/build.xml
index 1c89493..67e68a3 100644
--- a/build.xml
+++ b/build.xml
@@ -80,13 +80,13 @@
<target name="compile-java" depends="init"
description="Compile Java sources.">
<javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
- debug="true" target="1.5"/>
+ debug="true" target="1.5" includes="clojure/lang/**"/>
</target>
<target name="compile-clojure" depends="compile-java"
description="Compile Clojure sources.">
<java classname="clojure.lang.Compile"
- classpath="${build}:${cljsrc}"
+ classpath="${build}:${cljsrc}:${java.class.path}"
failonerror="true">
<sysproperty key="clojure.compile.path" value="${build}"/>
<!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
@@ -114,7 +114,7 @@
</fileset>
<manifest>
<attribute name="Main-Class" value="clojure.main"/>
- <attribute name="Class-Path" value="."/>
+ <attribute name="Class-Path" value="asm3.jar asm3-commons.jar"/>
</manifest>
</jar>
<copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
diff --git a/pom-template.xml b/pom-template.xml
index b76b4d1..76a8252 100644
--- a/pom-template.xml
+++ b/pom-template.xml
@@ -20,4 +20,17 @@
</license>
</licenses>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.x</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.x</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/src/clj/clojure/core_proxy.clj b/src/clj/clojure/core_proxy.clj
index c24b69d..c511586 100644
--- a/src/clj/clojure/core_proxy.clj
+++ b/src/clj/clojure/core_proxy.clj
@@ -11,9 +11,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(import
- '(clojure.asm ClassWriter ClassVisitor Opcodes Type)
+ '(org.objectweb.asm ClassWriter ClassVisitor Opcodes Type)
'(java.lang.reflect Modifier Constructor)
- '(clojure.asm.commons Method GeneratorAdapter)
+ '(org.objectweb.asm.commons Method GeneratorAdapter)
'(clojure.lang IProxy Reflector DynamicClassLoader IPersistentMap PersistentHashMap RT))
(defn method-sig [#^java.lang.reflect.Method meth]
diff --git a/src/clj/clojure/genclass.clj b/src/clj/clojure/genclass.clj
index b1c1a78..aace25a 100644
--- a/src/clj/clojure/genclass.clj
+++ b/src/clj/clojure/genclass.clj
@@ -9,8 +9,8 @@
(in-ns 'clojure.core)
(import '(java.lang.reflect Modifier Constructor)
- '(clojure.asm ClassWriter ClassVisitor Opcodes Type)
- '(clojure.asm.commons Method GeneratorAdapter)
+ '(org.objectweb.asm ClassWriter ClassVisitor Opcodes Type)
+ '(org.objectweb.asm.commons Method GeneratorAdapter)
'(clojure.lang IPersistentMap))
;(defn method-sig [#^java.lang.reflect.Method meth]
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index d70380d..d5fa766 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -14,9 +14,9 @@ package clojure.lang;
//*
-import clojure.asm.*;
-import clojure.asm.commons.Method;
-import clojure.asm.commons.GeneratorAdapter;
+import org.objectweb.asm.*;
+import org.objectweb.asm.commons.Method;
+import org.objectweb.asm.commons.GeneratorAdapter;
//*/
/*
|
