summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2020-05-17 17:57:41 +0200
committerJulien Lepiller <julien@lepiller.eu>2020-07-17 04:13:51 +0200
commitb8d977b1545a957523eb00cbd475c8a1944f8ac4 (patch)
treeaccfbf1aadbe695ce4672ef25af4f0dbdf19ad4e
parentaabaac7d85971a4e6b8826f6412b7cd40d42bbcc (diff)
downloadguix-b8d977b1545a957523eb00cbd475c8a1944f8ac4.tar.gz
gnu: java-bsh: Unbundle third-party libraries.
* gnu/packages/java.scm (java-bsh)[source]: Remove bundled jar files.
-rw-r--r--gnu/packages/java.scm21
1 files changed, 20 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f3c8abe99b..884c10a0a4 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -9422,19 +9422,38 @@ annotations.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw"))))
+                "0kz3f0xjack6c9syssi4qjw1rbd3q5963sk5pmr143hiibxa9csw"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Delete bundled third-party jar archives.
+                  (for-each delete-file (find-files "." ".*.jar$"))
+                  (for-each (lambda (file) (chmod file #o644))
+                            (find-files "." "."))
+                  #t))))
     (build-system ant-build-system)
     (arguments
      `(#:build-target "jarall"
        #:test-target "junit-tests-all"
        #:phases
        (modify-phases %standard-phases
+         (add-before 'install 'fix-pom
+           (lambda _
+             (substitute* "pom.xml"
+               (("org.apache-extras.beanshell") "org.beanshell"))
+             #t))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((share (string-append (assoc-ref outputs "out") "/share/java")))
                (mkdir-p share)
                (copy-file "dist/bsh-2.0b6.jar" (string-append share "/bsh-2.0b6.jar"))
                #t))))))
+    (inputs
+     `(("java-classpathx-servletapi" ,java-classpathx-servletapi)
+       ("java-commons-bsf" ,java-commons-bsf)))
+    (native-inputs
+     `(("java-junit" ,java-junit)
+       ("javacc" ,javacc-3)))
     (home-page "http://beanshell.org/")
     (synopsis "Lightweight Scripting for Java")
     (description "BeanShell is a small, free, embeddable Java source