diff options
| author | Alex Vong <alexvong1995@gmail.com> | 2018-10-18 03:08:31 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-10-19 23:11:07 +0200 |
| commit | 418f1b241486ef7f98fdce1e6f8e53f2e7863fd9 (patch) | |
| tree | 35185e0c634c1a60f74cc4dcfed3d21ae3039ef0 /guix/build | |
| parent | 58352f269e46942c34d7ee4e29f91144576ca661 (diff) | |
| download | gnu-guix-418f1b241486ef7f98fdce1e6f8e53f2e7863fd9.tar gnu-guix-418f1b241486ef7f98fdce1e6f8e53f2e7863fd9.tar.gz | |
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>
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/java-utils.scm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm index 128be1edeb..8200638bee 100644 --- a/guix/build/java-utils.scm +++ b/guix/build/java-utils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,12 +24,6 @@ install-jars 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 '()) #:allow-other-keys) (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." (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) + (name-version (strip-store-file-name out)) (docs (string-append (or (assoc-ref outputs "doc") out) - "/share/doc/" (package-name-version out) "/"))) + "/share/doc/" name-version "/"))) (mkdir-p docs) (copy-recursively apidoc-directory docs) #t))) |