nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

java-utils: Use 'strip-store-file-name'. 

See the discussion at
<https://lists.gnu.org/archive/html/guix-devel/2018-10/msg00250.html>.

* guix/build/java-utils.scm (package-name-version): Remove it.
(install-javadoc): Use 'strip-store-file-name' instead of
'package-name-version'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Alex Vong 2018-10-18 03:08:31 +08:00 committed by Ludovic Courtès
parent 58352f269e
commit 418f1b2414
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build/java-utils.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -23,12 +24,6 @@
install-jars install-jars
install-javadoc)) install-javadoc))
;; Copied from haskell-build-system.scm
(define (package-name-version store-dir)
"Given a store directory STORE-DIR return 'name-version' of the package."
(let* ((base (basename store-dir)))
(string-drop base (+ 1 (string-index base #\-)))))
(define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) (define* (ant-build-javadoc #:key (target "javadoc") (make-flags '())
#:allow-other-keys) #:allow-other-keys)
(apply invoke `("ant" ,target ,@make-flags))) (apply invoke `("ant" ,target ,@make-flags)))
@ -48,8 +43,9 @@ is used in case the build.xml does not include an install target."
install javadocs when this is not done by the install target." install javadocs when this is not done by the install target."
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(name-version (strip-store-file-name out))
(docs (string-append (or (assoc-ref outputs "doc") out) (docs (string-append (or (assoc-ref outputs "doc") out)
"/share/doc/" (package-name-version out) "/"))) "/share/doc/" name-version "/")))
(mkdir-p docs) (mkdir-p docs)
(copy-recursively apidoc-directory docs) (copy-recursively apidoc-directory docs)
#t))) #t)))