From 3dbdc68093e90f0ef9b77b70490d8e0b1dcfbf8f Mon Sep 17 00:00:00 2001

From: Julien Lepiller <julien@lepiller.eu>

Date: Sun, 17 Sep 2017 21:08:45 +0200

Subject: [PATCH] Add ExceptionUtilsGenerator.java from previous versions

This is replaced by a gradle task, but gradle depends on groovy, so we

need so way to generate the file without gradle.

---

 .../codehaus/groovy/ExceptionUtilsGenerator.java   | 75 ++++++++++++++++++++++

 1 file changed, 75 insertions(+)

 create mode 100644 config/ant/src/org/codehaus/groovy/ExceptionUtilsGenerator.java

diff --git a/config/ant/src/org/codehaus/groovy/ExceptionUtilsGenerator.java b/config/ant/src/org/codehaus/groovy/ExceptionUtilsGenerator.java

new file mode 100644

index 0000000..41f006d

--- /dev/null

+++ b/config/ant/src/org/codehaus/groovy/ExceptionUtilsGenerator.java

@@ -0,0 +1,75 @@

+package org.codehaus.groovy;

+

+import org.objectweb.asm.*;

+

+import java.io.BufferedOutputStream;

+import java.io.File;

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.util.logging.Logger;

+

+public class ExceptionUtilsGenerator implements Opcodes {

+    private final static Logger LOGGER = Logger.getLogger(ExceptionUtilsGenerator.class.getName());

+

+	public static void main(String... args) {

+        if (args==null || args.length==0) {

+            throw new IllegalArgumentException("You must specify at least one file");

+        }

+

+		ClassWriter cw = new ClassWriter(0);

+        MethodVisitor mv;

+

+        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "org/codehaus/groovy/runtime/ExceptionUtils", null, "java/lang/Object", null);

+

+        cw.visitSource("ExceptionUtils.java", null);

+

+        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);

+        mv.visitCode();

+        Label l0 = new Label();

+        mv.visitLabel(l0);

+        mv.visitLineNumber(18, l0);

+        mv.visitVarInsn(ALOAD, 0);

+        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");

+        mv.visitInsn(RETURN);

+        Label l1 = new Label();

+        mv.visitLabel(l1);

+        mv.visitLocalVariable("this", "Lorg/codehaus/groovy/runtime/ExceptionUtils;", null, l0, l1, 0);

+        mv.visitMaxs(1, 1);

+        mv.visitEnd();

+

+        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "sneakyThrow", "(Ljava/lang/Throwable;)V", null, null);

+        mv.visitCode();

+        Label l2 = new Label();

+        mv.visitLabel(l2);

+        mv.visitLineNumber(20, l2);

+        mv.visitVarInsn(ALOAD, 0);

+        mv.visitInsn(ATHROW);

+        Label l3 = new Label();

+        mv.visitLabel(l3);

+        mv.visitLocalVariable("e", "Ljava/lang/Throwable;", null, l2, l3, 0);

+        mv.visitMaxs(1, 1);

+        mv.visitEnd();

+

+        cw.visitEnd();

+

+        LOGGER.info("Generating ExceptionUtils");

+        byte[] bytes = cw.toByteArray();

+        for (String classFilePath : args) {

+            File classFile = new File(classFilePath);

+            if (classFile.getParentFile().exists() || classFile.getParentFile().mkdirs()) {

+                try {

+                    if (classFile.exists()) {

+                        classFile.delete();

+                    }

+                    BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(classFile));

+                    bos.write(bytes);

+                    bos.close();

+                } catch (IOException e) {

+                    LOGGER.warning("Unable to write file "+classFile);

+                }

+            } else {

+                LOGGER.warning("Unable to create directory "+classFile.getParentFile());

+            }

+        }

+	}

+}

-- 

2.14.1

From 3b43b79da15be994348f13035474925ba592fe1f Mon Sep 17 00:00:00 2001

From: LEPILLER Julien <julien.lepiller@irisa.fr>

Date: Fri, 15 Sep 2017 10:06:42 +0200

Subject: [PATCH] Add standalone template generator

---

 tool/src/org/antlr/v4/unicode/UnicodeRenderer.java | 33 ++++++++++++++++++++++

 1 file changed, 33 insertions(+)

 create mode 100644 tool/src/org/antlr/v4/unicode/UnicodeRenderer.java

diff --git a/tool/src/org/antlr/v4/unicode/UnicodeRenderer.java b/tool/src/org/antlr/v4/unicode/UnicodeRenderer.java

new file mode 100644

index 0000000..9e53213

--- /dev/null

+++ b/tool/src/org/antlr/v4/unicode/UnicodeRenderer.java

@@ -0,0 +1,33 @@

+package org.antlr.v4.unicode;

+

+import org.stringtemplate.v4.*;

+import org.stringtemplate.v4.misc.ErrorBuffer;

+import org.antlr.v4.unicode.UnicodeDataTemplateController;

+

+import java.io.File;

+import java.io.FileWriter;

+import java.io.IOException;

+import java.util.Map;

+import java.util.Map.Entry;

+

+public class UnicodeRenderer extends UnicodeDataTemplateController {

+    public static void main(String[] arg)

+        throws IOException {

+        String inputdir =  arg[0];

+        String input =     arg[1];

+        String output =    arg[2];

+

+        FileWriter fileWriter = new FileWriter(new File(output));

+        ErrorBuffer listener = new ErrorBuffer();

+

+        STGroupDir group = new STGroupDir(inputdir);

+        ST st = group.getInstanceOf(input);

+

+        for(Entry<String, Object> entry : getProperties().entrySet())

+        	st.add(entry.getKey(), entry.getValue());

+

+        st.write(new AutoIndentWriter(fileWriter), listener);

+        fileWriter.flush();

+        fileWriter.close();

+    }

+}

-- 

2.13.5

Based on https://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java/debian/patches/03_bootclasspath.patch?revision=14509, adopted for guix

--- xerces-2_11_0/build.xml.orig	2010-11-26 21:42:11.000000000 +0100

+++ xerces-2_11_0/build.xml	2017-03-28 14:04:41.946606996 +0200

@@ -290,13 +290,14 @@

            destdir="${build.dest}"

            source="${javac.source}"

            target="${javac.target}"

-           classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"

+           classpath="${build.dir}/classes:${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"

            debug="${debug}" nowarn="true"

            debuglevel="${debuglevel}"

            deprecation="${deprecation}"

            optimize="${optimize}"

            includeAntRuntime="false"

-           includeJavaRuntime="false"

+           includeJavaRuntime="true"

+           bootclasspath="${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"

            excludes="org/xml/sax/** 

                 javax/xml/**

                 org/w3c/dom/*

@@ -1451,13 +1452,14 @@

                destdir="${build.dest}"

                source="${javac.source}"

                target="${javac.target}"

-               classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"

+               classpath="${build.dir}/classes:${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"

                debug="${debug}"

                debuglevel="${debuglevel}"

                deprecation="${deprecation}"

                optimize="${optimize}"

                includeAntRuntime="false"

-               includeJavaRuntime="false"

+               includeJavaRuntime="true"

+               bootclasspath="${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"

                excludes="org/xml/sax/** 

                     javax/xml/**

                     org/w3c/dom/*

Don't unzip the sources which were bundled originally. Guix strips them from

the source and uses pre-build packages.

Taken from https://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch?revision=14507

Index: b/build.xml

===================================================================

--- a/build.xml

+++ b/build.xml

@@ -247,7 +247,7 @@

     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"

       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>

-    <!-- now deal with API's:  -->

+    <!-- not needed for Debian

     <unzip src="${src.apis.zip}" dest="${build.src}">

         <patternset

             includes="org/xml/sax/** 

@@ -270,6 +270,7 @@

                 org/w3c/dom/xpath/**"

         />

     </unzip>

+    -->

     <!-- substitute tokens as needed -->

     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

@@ -1232,7 +1233,7 @@

     <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"

              token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>

-    <!-- now deal with API's:  -->

+    <!-- not needed for Debian

     <unzip src="${src.apis.zip}" dest="${build.src}">

         <patternset

             includes="org/xml/sax/** 

@@ -1255,7 +1256,7 @@

                 org/w3c/dom/xpath/**"

         />

     </unzip>

-

+    -->

     <!-- substitute tokens as needed -->

     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

Index: b/src/manifest.xerces

===================================================================

--- a/src/manifest.xerces

+++ b/src/manifest.xerces

@@ -1,5 +1,6 @@

 Manifest-Version: 1.0

 Created-By: @java.version@ (@java.vendor@)

+Class-Path: xml-apis-ext.jar xml-resolver.jar jaxp-1.4.jar

 Name: org/apache/xerces/impl/Version.class

 Comment: @impl.name@ 

This patch eliminates the need for providing "xjavac", which saves building a

package for the unmaintained "xerces-tools".

Taken from https://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch?revision=14507

Index: b/build.xml

===================================================================

--- a/build.xml

+++ b/build.xml

@@ -39,7 +39,7 @@

   <property name="tools.dir" value="./tools"/>

   <!-- enable compilation under JDK 1.4 and above -->

-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">

+  <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac">

     <classpath>

       <pathelement location="${tools.dir}/bin/xjavac.jar"/>

     </classpath>

@@ -291,7 +291,7 @@

            source="${javac.source}"

            target="${javac.target}"

            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"

-           debug="${debug}"

+           debug="${debug}" nowarn="true"

            debuglevel="${debuglevel}"

            deprecation="${deprecation}"

            optimize="${optimize}"

@@ -359,7 +359,7 @@

            source="${javac.source}"

            target="${javac.target}"

            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"

-           debug="${debug}"

+           debug="${debug}" nowarn="true"

            debuglevel="${debuglevel}"

            includeAntRuntime="false"

            includeJavaRuntime="true"/>

@@ -379,7 +379,7 @@

            source="${javac.source}"

            target="${javac.target}"

            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"

-           debug="${debug}"

+           debug="${debug}" nowarn="true"

            debuglevel="${debuglevel}"

            includeAntRuntime="false"

            includeJavaRuntime="true"/>

(define-public java-osgi-service-packageadmin

  (package

    (name "java-osgi-service-packageadmin")

    (version "1.2.0")

    (source (origin

              (method url-fetch)

              (uri (string-append "http://central.maven.org/maven2/org/osgi/"

                                  "org.osgi.service.packageadmin/"

                                  version "/org.osgi.service.packageadmin-"

                                  version "-sources.jar"))

              (sha256

               (base32

                "041mpxzi7g36wmcily6y4ccn3jx15akpdy8gmhyb7m98x7qfvn52"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "osgi-service-packageadmin.jar"

       #:tests? #f)); no tests

    (inputs

     `(("framework" ,java-osgi-framework)))

    (home-page "http://www.osgi.org")

    (synopsis "")

    (description

      "OSGi, for Open Services Gateway initiative framework, is a module system

and service platform for the Java programming language.  This package contains

the packageadmin service.")

    (license license:asl2.0)))

(define-public java-hawtjni

  (package

    (name "java-hawtjni")

    (version "1.15")

    (source (origin

              (method url-fetch)

              (uri (string-append "https://github.com/fusesource/hawtjni/archive/"

                                  "hawtjni-project-" version ".tar.gz"))

              (sha256

               (base32

                "1bqfd732rmh6svyx17fpw9175gc9gzkcbyps2yyrf50c3zzjas6g"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "hawtjni.jar"

       #:source-dir "hawtjni-generator/src/main/java:hawtjni-runtime/src/main/java"

       #:tests? #f; no tests

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'build-native

           (lambda* (#:key inputs #:allow-other-keys)

             (with-directory-excursion "hawtjni-generator/src/main/resources/"

               (system* "gcc" "-c" "hawtjni.c" "-o" "hawtjni.o"

                        "-fPIC" "-O2"

                        (string-append "-I" (assoc-ref inputs "jdk") "/include/linux"))

               (system* "gcc" "-c" "hawtjni-callback.c" "-o" "hawtjni-callback.o"

                        "-fPIC" "-O2"

                        (string-append "-I" (assoc-ref inputs "jdk") "/include/linux"))

               (zero? (system* "gcc" "-o" "libhawtjni.so" "-shared"

                               "hawtjni.o" "hawtjni-callback.o")))))

         (add-after 'install 'install-native

           (lambda* (#:key outputs #:allow-other-keys)

             (let* ((out (assoc-ref outputs "out"))

                    (lib (string-append out "/lib"))

                    (inc (string-append out "/include")))

               (mkdir-p lib)

               (mkdir-p inc)

               (with-directory-excursion "hawtjni-generator/src/main/resources/"

                 (copy-file "libhawtjni.so" (string-append lib "/libhawtjni.so"))

                 (copy-file "hawtjni.h" (string-append inc "/hawtjni.h")))))))))

    (inputs

     `(("cli" ,java-commons-cli)

       ("asm" ,java-asm)

       ("finder" ,java-geronimo-xbean-finder)))

    (home-page "https://fusesource.github.io/hawtjni/")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

(define-public java-jansi-native

  (package

    (name "java-jansi-native")

    (version "1.7")

    (source (origin

              (method url-fetch)

              (uri (string-append "https://github.com/fusesource/jansi-native/"

                                  "archive/jansi-native-" version ".tar.gz"))

              (sha256

               (base32

                "0j2ydlgxbzbgshqkwghbxxxnbnx1mmjgd6k5fw6xfvxw1z956yqf"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "jansi-native.jar"

       #:source-dir "src/main/java"

       #:tests? #f; no tests

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'build-native

           (lambda* (#:key inputs #:allow-other-keys)

             (substitute* "src/main/native-package/src/jansi_ttyname.c"

               (("#include \"jansi_.*") ""))

             ;; TODO: there are more required files for windows in windows/

             (with-directory-excursion "src/main/native-package/src"

               (system* "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o"

                        (string-append "-I" (assoc-ref inputs "hawtjni") "/include")

                        (string-append "-I" (assoc-ref inputs "jdk") "/include/linux")

                        "-fPIC" "-O2")

               (system* "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o"))

             ;; TODO: detect one of linux{32,64}, freebsd{32,64}, osx, windows{32,64}

             (mkdir-p "build/classes/META-INF/native/linux64")

             (copy-file "src/main/native-package/src/libjansi.so"

                        "build/classes/META-INF/native/linux64/libjansi.so")))

         (add-after 'install 'install-native

           (lambda* (#:key outputs #:allow-other-keys)

             (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))

             (copy-file "src/main/native-package/src/jansi.h"

                        (string-append (assoc-ref outputs "out")

                                       "/bin/jansi.h")))))))

    (inputs

     `(("hawtjni" ,java-hawtjni)))

    (home-page "https://fusesource.github.io/jansi/")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

(define-public java-jansi

  (package

    (name "java-jansi")

    (version "1.16")

    (source (origin

              (method url-fetch)

              (uri (string-append "https://github.com/fusesource/jansi/archive/"

                                  "jansi-project-" version ".tar.gz"))

              (sha256

               (base32

                "11kh3144i3fzp21dpy8zg52mjmsr214k7km9p8ly0rqk2px0qq2z"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "jansi.jar"

       #:source-dir "jansi/src/main/java"

       #:test-dir "jansi/src/test"))

    (inputs

     `(("jansi-native" ,java-jansi-native)))

    (native-inputs

     `(("junit" ,java-junit)

       ("hamcrest" ,java-hamcrest-core)))

    (home-page "https://fusesource.github.io/jansi/")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

(define-public java-jline

  (package

    (name "java-jline")

    (version "1.0")

    (source (origin

              (method url-fetch)

              (uri (string-append "https://github.com/jline/jline1/archive/jline-"

                                  version ".tar.gz"))

              (sha256

               (base32

                "0bi3p6vrh7a6v0fbpb6rx9plpmx5zk3lr352xzdbz2jcxg499wir"))))

    (build-system ant-build-system)

    (arguments

     `(#:jar-name "jline.jar"

       #:source-dir "src/main/java"

       #:test-dir "src/test"

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'copy-resources

           (lambda _

             (mkdir-p "build/classes/jline")

             (for-each (lambda (f) (copy-file (string-append "src/main/resources/jline/" f)

                                              (string-append "build/classes/jline/" f)))

               '("CandidateListCompletionHandler.properties"

                 "keybindings-mac.properties"

                 "keybindings.properties"

                 "windowsbindings.properties")))))))

    (native-inputs

     `(("junit" ,java-junit)))

    (home-page "https://jline.github.io")

    (synopsis "")

    (description "")

    (license license:asl2.0)))

                "15c9xmf7rhr5w4qk2jcb6swds336l4l5gyb51pcjay2ywnigk8sa"))

              (patches

                (search-patches

                  "groovy-Add-exceptionutilsgenerator.patch"))))

       #:source-dir "src/main:subprojects/groovy-test/src/main/java"

       #:tests? #f

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'generate-parser

           (lambda _

             (with-directory-excursion "src/main/org/codehaus/groovy/antlr/java"

               (zero? (system* "antlr" "java.g")))

             (with-directory-excursion "src/main/org/codehaus/groovy/antlr"

               (mkdir "parser")

               (with-directory-excursion "parser"

                 (zero? (system* "antlr" "../groovy.g"))))))

         (add-before 'build 'generate-exception-utils

           (lambda _

             (system* "javac" "-cp" (getenv "CLASSPATH")

                      "config/ant/src/org/codehaus/groovy/ExceptionUtilsGenerator.java")

             (zero? (system* "java" "-cp" (string-append (getenv "CLASSPATH")

                                                         ":config/ant/src")

                             "org.codehaus.groovy.ExceptionUtilsGenerator"

                             "build/classes/org/codehaus/groovy/runtime/ExceptionUtils.class")))))))

       ("xstream" ,java-xstream)

       ("jansi" ,java-jansi)

       ("jline" ,java-jline)))

(define-public java-geronimo-xbean-bundleutils

  (package

    (inherit java-geronimo-xbean-reflect)

    (name "java-geronimo-xbean-bundleutils")

    (arguments

     `(#:jar-name "geronimo-xbean-bundleutils.jar"

       #:source-dir "xbean-bundleutils/src/main/java"

       #:test-dir "xbean-bundleutils/src/test"

       #:phases

       (modify-phases %standard-phases

         (add-before 'build 'fix-java

           (lambda _

             (substitute* "xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java"

               (("import org.osgi.framework.ServiceRegistration;")

                (string-append "import org.osgi.framework.ServiceRegistration;\n"

                               "import org.osgi.framework.ServiceFactory;\n"

                               "import java.util.Collection;\n"

                               "import org.osgi.framework.ServiceObjects;"))

               (("public Bundle getBundle\\(\\)")

                (string-append "@Override\n"

                               "public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {\n"

                               " throw new UnsupportedOperationException();\n"

                               "}\n"

                               "@Override\n"

                               "public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {"

                               " throw new UnsupportedOperationException();\n"

                               "}\n"

                               "public Bundle getBundle()"))))))))

    (inputs

     `(("slf4j" ,java-slf4j-api)

       ("asm" ,java-asm)

       ("framework" ,java-osgi-framework)

       ("eclipse-osgi" ,java-eclipse-osgi)

       ("packageadmin" ,java-osgi-service-packageadmin)))))

(define-public java-geronimo-xbean-asm-util

  (package

    (inherit java-geronimo-xbean-reflect)

    (name "java-geronimo-xbean-asm-util")

    (arguments

     `(#:jar-name "geronimo-xbean-asm-util.jar"

       #:source-dir "xbean-asm-util/src/main/java"

       #:tests? #f)); no tests

    (inputs

     `(("asm" ,java-asm)))))

(define-public java-geronimo-xbean-finder

  (package

    (inherit java-geronimo-xbean-reflect)

    (name "java-geronimo-xbean-finder")

    (arguments

     `(#:jar-name "geronimo-xbean-finder.jar"

       #:source-dir "xbean-finder/src/main/java"

       #:test-dir "xbean-finder/src/test"))

    (inputs

     `(("slf4j" ,java-slf4j-api)

       ("asm" ,java-asm)

       ("bundleutils" ,java-geronimo-xbean-bundleutils)

       ("asm-util" ,java-geronimo-xbean-asm-util)

       ("packageadmin" ,java-osgi-service-packageadmin)

       ("framework" ,java-osgi-framework)))

    (native-inputs

     `(("junit" ,java-junit)

       ("hamcrest" ,java-hamcrest-core)))))