From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCrvI-0004rQ-Ms for guix-patches@gnu.org; Wed, 17 Oct 2018 15:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCrvG-0000Ax-0M for guix-patches@gnu.org; Wed, 17 Oct 2018 15:56:04 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51430) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCrvF-0000Ab-Ov for guix-patches@gnu.org; Wed, 17 Oct 2018 15:56:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gCrvF-0005hc-Mc for guix-patches@gnu.org; Wed, 17 Oct 2018 15:56:01 -0400 Subject: [bug#33077] [PATCH 2/2] java-utils: Use 'strip-store-file-name'. References: <87d0s8fk5p.fsf@gmail.com> In-Reply-To: <87d0s8fk5p.fsf@gmail.com> Resent-Message-ID: From: Alex Vong Date: Thu, 18 Oct 2018 03:55:19 +0800 Message-ID: <87murce4bc.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33077@debbugs.gnu.org Cc: alexvong1995@gmail.com --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0002-java-utils-Use-strip-store-file-name.patch Content-Transfer-Encoding: quoted-printable From=20bba65bca3f5f8b7031b300032205c2413606d6fb Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 18 Oct 2018 03:08:31 +0800 Subject: [PATCH 2/2] java-utils: Use 'strip-store-file-name'. See the discussion at . * guix/build/java-utils.scm (package-name-version): Remove it. (install-javadoc): Use 'strip-store-file-name' instead of 'package-name-version'. =2D-- guix/build/java-utils.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm index 128be1ede..8200638be 100644 =2D-- a/guix/build/java-utils.scm +++ b/guix/build/java-utils.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2016 Hartmut Goebel ;;; Copyright =C2=A9 2016 Ricardo Wurmus +;;; Copyright =C2=A9 2018 Alex Vong ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,12 +24,6 @@ install-jars install-javadoc)) =20 =2D;; Copied from haskell-build-system.scm =2D(define (package-name-version store-dir) =2D "Given a store directory STORE-DIR return 'name-version' of the packag= e." =2D (let* ((base (basename store-dir))) =2D (string-drop base (+ 1 (string-index base #\-))))) =2D (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) =2D "/share/doc/" (package-name-version out)= "/"))) + "/share/doc/" name-version "/"))) (mkdir-p docs) (copy-recursively apidoc-directory docs) #t))) =2D-=20 2.19.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSof2ZdXkE0FM5aU4XzrkvbI+zaGwUCW8eTpwAKCRDzrkvbI+za G9mXAQC4675ZvS9gU/9JuDUW1tx+ju9VUezSOeT0HFJbbLZRcAD/RglMGOfUPj8c T0/FTnSSX13N7BrUP7KtRLucQtqx6gg= =DxwQ -----END PGP SIGNATURE----- --==-=-=--