guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/22: gnu: java-hamcrest-core: Install all jars without version suffix.


From: Ricardo Wurmus
Subject: 11/22: gnu: java-hamcrest-core: Install all jars without version suffix.
Date: Wed, 10 May 2017 11:59:40 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit a8d3cb62abb2f9760d2144412ef557ea3b1ebfc8
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Mar 2 15:32:41 2017 +0100

    gnu: java-hamcrest-core: Install all jars without version suffix.
    
    * gnu/packages/java.scm (java-hamcrest-core)[arguments]: Install all three
    jars and strip the version suffix.
---
 gnu/packages/java.scm | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index feb1d99..eae1c85 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1082,6 +1082,9 @@ an Ant task that extends the built-in @code{jar} task.")
     (build-system ant-build-system)
     (arguments
      `(#:tests? #f ; Tests require junit
+       #:modules ((guix build ant-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
        #:make-flags (list (string-append "-Dversion=" ,version))
        #:build-target "core"
        #:phases
@@ -1133,10 +1136,23 @@ private Method[] allMethods = getSortedMethods();")))))
              #t))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
-             (install-file (string-append "build/hamcrest-core-"
-                                          ,version ".jar")
-                           (string-append (assoc-ref outputs "out")
-                                          "/share/java")))))))
+             (let* ((target (string-append (assoc-ref outputs "out")
+                                           "/share/java/"))
+                    (version-suffix ,(string-append "-" version ".jar"))
+                    (install-without-version-suffix
+                     (lambda (jar)
+                       (copy-file jar
+                                  (string-append target
+                                                 (basename jar version-suffix)
+                                                 ".jar")))))
+               (mkdir-p target)
+               (for-each
+                install-without-version-suffix
+                (find-files "build"
+                            (lambda (name _)
+                              (and (string-suffix? ".jar" name)
+                                   (not (string-suffix? "-sources.jar" 
name)))))))
+             #t)))))
     (native-inputs
      `(("java-qdox-1.12" ,java-qdox-1.12)
        ("java-jarjar" ,java-jarjar)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]