From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d76N4-0007Bl-48 for guix-patches@gnu.org; Sat, 06 May 2017 16:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d76N0-0001Hy-40 for guix-patches@gnu.org; Sat, 06 May 2017 16:32:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d76N0-0001Ht-0n for guix-patches@gnu.org; Sat, 06 May 2017 16:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d76Mz-0001Pn-RQ for guix-patches@gnu.org; Sat, 06 May 2017 16:32:01 -0400 Subject: bug#26803: [PATCH 03/36] guix: Add java-utils. Resent-Message-ID: References: <20170506153617.3074-1-rekado@elephly.net> <20170506153617.3074-3-rekado@elephly.net> From: Roel Janssen In-reply-to: <20170506153617.3074-3-rekado@elephly.net> Date: Sat, 06 May 2017 22:31:02 +0200 Message-ID: <87poflk9rt.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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: Ricardo Wurmus Cc: Hartmut Goebel , 26803@debbugs.gnu.org Ricardo Wurmus writes: > From: Hartmut Goebel > > * guix/build/java-utils.scm: New file. > * guix/build-system/ant.scm: Use it. > * Makefile.am (MODULES): Add it. > > Co-authored-by: Ricardo Wurmus > --- > Makefile.am | 1 + > guix/build-system/ant.scm | 2 ++ > guix/build/java-utils.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 58 insertions(+) > create mode 100644 guix/build/java-utils.scm > > diff --git a/Makefile.am b/Makefile.am > index 8fe9e350c..b09180ba2 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -124,6 +124,7 @@ MODULES = \ > guix/build/syscalls.scm \ > guix/build/gremlin.scm \ > guix/build/emacs-utils.scm \ > + guix/build/java-utils.scm \ > guix/build/lisp-utils.scm \ > guix/build/graft.scm \ > guix/build/bournish.scm \ > diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm > index bf2f3b411..228b4e60d 100644 > --- a/guix/build-system/ant.scm > +++ b/guix/build-system/ant.scm > @@ -39,6 +39,7 @@ > (define %ant-build-system-modules > ;; Build-side modules imported by default. > `((guix build ant-build-system) > + (guix build java-utils) > (guix build syscalls) > ,@%gnu-build-system-modules)) > > @@ -108,6 +109,7 @@ > (guile #f) > (imported-modules %ant-build-system-modules) > (modules '((guix build ant-build-system) > + (guix build java-utils) > (guix build utils)))) > "Build SOURCE with INPUTS." > (define builder > diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm > new file mode 100644 > index 000000000..402d377bf > --- /dev/null > +++ b/guix/build/java-utils.scm > @@ -0,0 +1,55 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright © 2016 Hartmut Goebel > +;;; Copyright © 2016 Ricardo Wurmus > +;;; > +;;; This file is part of GNU Guix. > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify it > +;;; under the terms of the GNU General Public License as published by > +;;; the Free Software Foundation; either version 3 of the License, or (at > +;;; your option) any later version. > +;;; > +;;; GNU Guix is distributed in the hope that it will be useful, but > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +;;; GNU General Public License for more details. > +;;; > +;;; You should have received a copy of the GNU General Public License > +;;; along with GNU Guix. If not, see . > + > +(define-module (guix build java-utils) > + #:use-module (guix build utils) > + #:export (ant-build-javadoc > + 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) > + (zero? (apply system* `("ant" ,target ,@make-flags)))) > + > +(define* (install-jars jar-directory) > + "Install jar files from JAR-DIRECTORY to the default target directory. This (nitpick "jar" or "JAR") > +is used in case the build.xml does not include an install target." > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((share (string-append (assoc-ref outputs "out") > + "/share/java"))) > + (for-each (lambda (f) (install-file f share)) > + (find-files jar-directory "\\.jar$")) > + #t))) > + > +(define* (install-javadoc apidoc-directory) > + "Install the APIDOC-DIRECTORY to the target directory. This is used to > +install javadocs when this is not done by the install target." > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (docs (string-append (or (assoc-ref outputs "doc") out) > + "/share/doc/" (package-name-version out) "/"))) > + (mkdir-p docs) > + (copy-recursively apidoc-directory docs) > + #t))) (nitpick "javadocs" or "Javadocs") Either way, LGTM! Kind regards, Roel Janssen