[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2.1+dfsg-3-12-ge2e666e
Daigo Moriwaki
daigo at debian.org
Sun Sep 25 07:16:18 UTC 2011
The following commit has been merged in the master branch:
commit 4835fac03b9397b7b2258b4491b4844f35c8fe0d
Author: Daigo Moriwaki <daigo at debian.org>
Date: Sun Sep 25 14:15:42 2011 +0900
Updated org.objectweb.asm replacement.
diff --git a/debian/patches/01-replace-asm b/debian/patches/01-replace-asm
index 63f6f7c..033127e 100644
--- a/debian/patches/01-replace-asm
+++ b/debian/patches/01-replace-asm
@@ -1,8 +1,8 @@
Index: pkg-clojure/build.xml
===================================================================
---- pkg-clojure.orig/build.xml 2011-06-14 18:44:29.447220034 +0900
-+++ pkg-clojure/build.xml 2011-06-14 18:44:57.235013081 +0900
-@@ -87,13 +87,14 @@
+--- pkg-clojure.orig/build.xml 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/build.xml 2011-09-25 13:51:59.000000000 +0900
+@@ -36,13 +36,14 @@
<target name="compile-java" depends="init"
description="Compile Java sources.">
<javac srcdir="${jsrc}" destdir="${build}" includeJavaRuntime="yes"
@@ -10,33 +10,33 @@ Index: pkg-clojure/build.xml
debug="true" target="1.5"/>
</target>
- <target name="compile-clojure" depends="compile-java"
+ <target name="compile-clojure"
description="Compile Clojure sources.">
<java classname="clojure.lang.Compile"
- classpath="${build}:${cljsrc}"
+ classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${build}:${cljsrc}"
- failonerror="true">
+ failonerror="true"
+ fork="true">
<sysproperty key="clojure.compile.path" value="${build}"/>
- <!-- <sysproperty key="clojure.compile.warn-on-reflection" value="true"/> -->
-@@ -126,7 +127,7 @@
- <delete dir="${test-classes}"/>
- <mkdir dir="${test-classes}"/>
+@@ -81,7 +82,7 @@
+ <!-- <javac srcdir="${jtestsrc}" destdir="${test-classes}" includeJavaRuntime="yes" -->
+ <!-- debug="true" target="1.5" includeantruntime="no"/> -->
<java classname="clojure.lang.Compile"
- classpath="${test-classes}:${test}:${build}:${cljsrc}"
+ classpath="/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:${test-classes}:${test}:${build}:${cljsrc}"
- failonerror="true">
+ failonerror="true"
+ fork="true">
<sysproperty key="clojure.compile.path" value="${test-classes}"/>
- <arg value="clojure.test-clojure.protocols.examples"/>
-@@ -138,6 +139,8 @@
- description="Run clojure tests without recompiling first">
- <java classname="clojure.main" failonerror="true">
+@@ -96,6 +97,8 @@
+ unless="maven.test.skip">
+ <java classname="clojure.main" failonerror="true" fork="true">
<classpath>
+ <path location="/usr/share/java/asm3.jar"/>
-+ <path location=":/usr/share/java/asm3-commons.jar"/>
++ <path location="/usr/share/java/asm3-commons.jar"/>
<path location="${test-classes}"/>
<path location="${test}"/>
<path location="${build}"/>
-@@ -162,7 +165,7 @@
+@@ -117,7 +120,7 @@
</fileset>
<manifest>
<attribute name="Main-Class" value="clojure.main"/>
@@ -44,29 +44,12 @@ Index: pkg-clojure/build.xml
+ <attribute name="Class-Path" value="/usr/share/java/asm3.jar /usr/share/java/asm3-commons.jar"/>
</manifest>
</jar>
- <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
-@@ -171,7 +174,6 @@
- <target name="clojure-jar-slim" depends="test"
- description="Create clojure-slim jar file (omits compiled Clojure code)">
- <jar jarfile="${slim_jar}">
-- <fileset dir="${build}" includes="clojure/asm/**"/>
- <fileset dir="${build}" includes="clojure/lang/**"/>
- <fileset dir="${build}" includes="clojure/main.class"/>
- <fileset dir="${cljsrc}">
-@@ -180,7 +182,7 @@
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="clojure.main"/>
-- <attribute name="Class-Path" value="."/>
-+ <attribute name="Class-Path" value="/usr/share/java/asm3.jar /usr/share/java/asm3-commons.jar"/>
- </manifest>
- </jar>
- <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />
+ <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}"/>
Index: pkg-clojure/src/clj/clojure/core.clj
===================================================================
---- pkg-clojure.orig/src/clj/clojure/core.clj 2011-06-14 18:44:29.411349438 +0900
-+++ pkg-clojure/src/clj/clojure/core.clj 2011-06-14 18:44:40.247125627 +0900
-@@ -4299,10 +4299,10 @@
+--- pkg-clojure.orig/src/clj/clojure/core.clj 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/src/clj/clojure/core.clj 2011-09-25 13:51:45.000000000 +0900
+@@ -4759,10 +4759,10 @@
(.getAnnotation c java.lang.annotation.Retention)]
(= (.value r) java.lang.annotation.RetentionPolicy/RUNTIME)))))
@@ -79,7 +62,7 @@ Index: pkg-clojure/src/clj/clojure/core.clj
(cond
(vector? v) (let [avec (.visitArray av name)]
(doseq [vval v]
-@@ -4312,7 +4312,7 @@
+@@ -4772,7 +4772,7 @@
(cond
(instance? java.lang.Enum ev)
(.visitEnum av name (descriptor (class ev)) (str ev))
@@ -90,8 +73,8 @@ Index: pkg-clojure/src/clj/clojure/core.clj
(seq? v) (let [[nested nv] v
Index: pkg-clojure/src/clj/clojure/core_proxy.clj
===================================================================
---- pkg-clojure.orig/src/clj/clojure/core_proxy.clj 2011-06-14 18:44:29.435199626 +0900
-+++ pkg-clojure/src/clj/clojure/core_proxy.clj 2011-06-14 18:44:40.247125627 +0900
+--- pkg-clojure.orig/src/clj/clojure/core_proxy.clj 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/src/clj/clojure/core_proxy.clj 2011-09-25 13:51:45.000000000 +0900
@@ -11,9 +11,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;; proxy ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -106,8 +89,8 @@ Index: pkg-clojure/src/clj/clojure/core_proxy.clj
(defn method-sig [^java.lang.reflect.Method meth]
Index: pkg-clojure/src/clj/clojure/genclass.clj
===================================================================
---- pkg-clojure.orig/src/clj/clojure/genclass.clj 2011-06-14 18:44:29.423466929 +0900
-+++ pkg-clojure/src/clj/clojure/genclass.clj 2011-06-14 18:44:40.247125627 +0900
+--- pkg-clojure.orig/src/clj/clojure/genclass.clj 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/src/clj/clojure/genclass.clj 2011-09-25 13:51:45.000000000 +0900
@@ -9,8 +9,8 @@
(in-ns 'clojure.core)
@@ -121,9 +104,9 @@ Index: pkg-clojure/src/clj/clojure/genclass.clj
;(defn method-sig [^java.lang.reflect.Method meth]
Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
===================================================================
---- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java 2011-06-14 18:44:29.403372045 +0900
-+++ pkg-clojure/src/jvm/clojure/lang/Compiler.java 2011-06-14 18:44:40.247125627 +0900
-@@ -12,17 +12,18 @@
+--- pkg-clojure.orig/src/jvm/clojure/lang/Compiler.java 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/src/jvm/clojure/lang/Compiler.java 2011-09-25 13:51:45.000000000 +0900
+@@ -12,12 +12,14 @@
package clojure.lang;
@@ -131,11 +114,20 @@ Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
+/*
import clojure.asm.*;
- import clojure.asm.commons.Method;
import clojure.asm.commons.GeneratorAdapter;
+ import clojure.asm.commons.Method;
+
++*/
++
+ import java.io.*;
+ import java.lang.reflect.Constructor;
+ import java.lang.reflect.Modifier;
+@@ -25,14 +27,15 @@
+ import java.util.regex.Pattern;
+
//*/
-/*
-+//*
++///*
import org.objectweb.asm.*;
import org.objectweb.asm.commons.Method;
@@ -143,4 +135,47 @@ Index: pkg-clojure/src/jvm/clojure/lang/Compiler.java
+/*
import org.objectweb.asm.util.TraceClassVisitor;
import org.objectweb.asm.util.CheckClassAdapter;
- //*/
+-//*/
++*/
+
+ public class Compiler implements Opcodes{
+
+Index: pkg-clojure/src/jvm/clojure/lang/Intrinsics.java
+===================================================================
+--- pkg-clojure.orig/src/jvm/clojure/lang/Intrinsics.java 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/src/jvm/clojure/lang/Intrinsics.java 2011-09-25 13:51:45.000000000 +0900
+@@ -12,7 +12,7 @@
+
+ package clojure.lang;
+
+-import clojure.asm.Opcodes;
++import org.objectweb.asm.Opcodes;
+
+ public class Intrinsics implements Opcodes{
+ private static Object[] oa(Object... arr){
+Index: pkg-clojure/src/clj/clojure/reflect/java.clj
+===================================================================
+--- pkg-clojure.orig/src/clj/clojure/reflect/java.clj 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/src/clj/clojure/reflect/java.clj 2011-09-25 13:51:45.000000000 +0900
+@@ -11,7 +11,7 @@
+
+ (require '[clojure.set :as set]
+ '[clojure.string :as str])
+-(import '[clojure.asm ClassReader ClassVisitor Type]
++(import '[org.objectweb.asm ClassReader ClassVisitor Type]
+ '[java.lang.reflect Modifier]
+ java.io.InputStream)
+
+Index: pkg-clojure/test/clojure/test_clojure/reflect.clj
+===================================================================
+--- pkg-clojure.orig/test/clojure/test_clojure/reflect.clj 2011-09-25 13:51:38.000000000 +0900
++++ pkg-clojure/test/clojure/test_clojure/reflect.clj 2011-09-25 13:51:45.000000000 +0900
+@@ -24,7 +24,7 @@
+
+ (deftest field-descriptor->class-symbol-test
+ (are [s d] (= s (@#'reflect/field-descriptor->class-symbol d))
+- 'clojure.asm.Type<><> "[[Lclojure/asm/Type;"
++ 'org.objectweb.asm.Type<><> "[[Lorg.objectweb/asm/Type;"
+ 'int "I"
+ 'java.lang.Object "Ljava.lang.Object;"))
+
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list