[debbugs-tracker] bug#31992: closed ([PATCH] gnu: java-jarjar: Unbundle asm.)

[GNU bug Tracking System]

Your message dated Thu, 28 Jun 2018 17:44:31 +0200
with message-id <address@hidden>
and subject line Re: bug#31992: Acknowledgement ([PATCH] gnu: java-jarjar: 
Unbundle asm.)
has caused the debbugs.gnu.org bug report #31992,
regarding [PATCH] gnu: java-jarjar: Unbundle asm.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
31992: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31992
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: java-jarjar: Unbundle asm.
>
>
>
>
> Date: 
>
> Thu, 28 Jun 2018 09:37:27 +0200
>
>
>
>
> * gnu/packages/java.scm (java-jarjar)[inputs]: Add java-asm-bootstrap.
> [source]: Add snippet to delete bundled asm and junit.
> [arguments]: Add phase 'do-not-use-bundled-asm to patch build.xml to
> use system asm.
> ---
>  gnu/packages/java.scm | 28 +++++++++++++++++++++++++++-
>  1 file changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 003107986..e4b4eddf8 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -2629,7 +2629,16 @@ documentation tools.")
>                      "code.google.com/jarjar/jarjar-src-" version ".zip"))
>                (sha256
>                 (base32
> -                "1v8irhni9cndcw1l1wxqgry013s2kpj0qqn57lj2ji28xjq8ndjl"))))
> +                "1v8irhni9cndcw1l1wxqgry013s2kpj0qqn57lj2ji28xjq8ndjl"))
> +              (modules '((guix build utils)))
> +              (snippet
> +               '(begin
> +                  ;; Delete bundled thirds-party jar archives.
> +                  ;; TODO: unbundle maven-plugin-api.
> +                  (delete-file "lib/asm-4.0.jar")
> +                  (delete-file "lib/asm-commons-4.0.jar")
> +                  (delete-file "lib/junit-4.8.1.jar")
> +                  #t))))
>      (build-system ant-build-system)
>      (arguments
>       `(;; Tests require junit, which ultimately depends on this package.
> @@ -2637,6 +2646,21 @@ documentation tools.")
>         #:build-target "jar"
>         #:phases
>         (modify-phases %standard-phases
> +         (add-before 'build 'do-not-use-bundled-asm
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "build.xml"
> +               (("<path id=\"path.build\">")
> +                (string-append "<path id=\"path.build\"><fileset dir=\"" 
> (assoc-ref inputs "java-asm-bootstrap") "/share/java\" 
> includes=\"**/*.jar\"/>"))
> +               (("<zipfileset src=\"lib/asm-4.0.jar\"/>") "")
> +               (("lib/asm-commons-4.0.jar")
> +                (string-append (assoc-ref inputs "java-asm-bootstrap")
> +                               "/share/java/asm-6.0.jar"))
> +               (("<include 
> name=\"org/objectweb/asm/commons/Remap\\*\\.class\"/>")
> +                (string-append "<include 
> name=\"org/objectweb/asm/commons/Remap*.class\"/>"
> +                               "<include name=\"org/objectweb/asm/*.class\"/>"
> +                               "<include 
> name=\"org/objectweb/asm/signature/*.class\"/>"
> +                               "<include 
> name=\"org/objectweb/asm/commons/SignatureRemapper.class\"/>")))
> +             #t))
>           (replace 'install
>             (lambda* (#:key outputs #:allow-other-keys)
>               (let ((target (string-append (assoc-ref outputs "out")
> @@ -2644,6 +2668,8 @@ documentation tools.")
>                 (install-file (string-append "dist/jarjar-" ,version ".jar")
>                               target))
>               #t)))))
> +    (inputs
> +     `(("java-asm-bootstrap" ,java-asm-bootstrap)))
>      (native-inputs
>       `(("unzip" ,unzip)))
>      (home-page "https://code.google.com/archive/p/jarjar/";)
> -- 
> 2.18.0
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: bug#31992: Acknowledgement ([PATCH] gnu: java-jarjar: Unbundle asm.) Date: Thu, 28 Jun 2018 17:44:31 +0200

Pushed to master as 88aa75e922477def84643738f519ce3fbc84dc51.

--- End Message ---