* [bug#31992] [PATCH] gnu: java-jarjar: Unbundle asm.
@ 2018-06-28 7:37 Gábor Boskovits
[not found] ` <handler.31992.B.153017146521741.ack@debbugs.gnu.org>
0 siblings, 1 reply; 2+ messages in thread
From: Gábor Boskovits @ 2018-06-28 7:37 UTC (permalink / raw)
To: 31992; +Cc: Gábor Boskovits
* 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#31992: Acknowledgement ([PATCH] gnu: java-jarjar: Unbundle asm.)
[not found] ` <handler.31992.B.153017146521741.ack@debbugs.gnu.org>
@ 2018-06-28 15:44 ` Gábor Boskovits
0 siblings, 0 replies; 2+ messages in thread
From: Gábor Boskovits @ 2018-06-28 15:44 UTC (permalink / raw)
To: 31992-done
[-- Attachment #1: Type: text/plain, Size: 62 bytes --]
Pushed to master as 88aa75e922477def84643738f519ce3fbc84dc51.
[-- Attachment #2: Type: text/html, Size: 85 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-28 15:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-28 7:37 [bug#31992] [PATCH] gnu: java-jarjar: Unbundle asm Gábor Boskovits
[not found] ` <handler.31992.B.153017146521741.ack@debbugs.gnu.org>
2018-06-28 15:44 ` bug#31992: Acknowledgement ([PATCH] gnu: java-jarjar: Unbundle asm.) Gábor Boskovits
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.