From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: [PATCH 03/12] guix: Add java-utils. Date: Fri, 9 Sep 2016 16:51:03 +0200 Message-ID: <1473432672-21007-4-git-send-email-h.goebel@crazy-compilers.com> References: <1473432672-21007-1-git-send-email-h.goebel@crazy-compilers.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biN9H-00076U-TD for guix-devel@gnu.org; Fri, 09 Sep 2016 10:51:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1biN9F-0002wC-Ht for guix-devel@gnu.org; Fri, 09 Sep 2016 10:51:22 -0400 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:41942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biN9F-0002w6-6t for guix-devel@gnu.org; Fri, 09 Sep 2016 10:51:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3sW0Wr4kY3z3hkLl for ; Fri, 9 Sep 2016 16:51:20 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3sW0Wr4dKRzvlQ9 for ; Fri, 9 Sep 2016 16:51:20 +0200 (CEST) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id Lb6XUHPouy6K for ; Fri, 9 Sep 2016 16:51:19 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-128-63.dynamic.mnet-online.de [188.174.128.63]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Fri, 9 Sep 2016 16:51:19 +0200 (CEST) Received: from thisbe.goebel-consult.de.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id F2C9D60DB0 for ; Fri, 9 Sep 2016 16:51:14 +0200 (CEST) In-Reply-To: <1473432672-21007-1-git-send-email-h.goebel@crazy-compilers.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * guix/build/java-utils.scm: New file. * guix/build-system/ant.scm: Use it. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/build-system/ant.scm | 2 ++ guix/build/java-utils.scm | 52 +++++++++++++++++++++++++++++++++++++++++= ++++++ 3 files changed, 55 insertions(+) create mode 100644 guix/build/java-utils.scm diff --git a/Makefile.am b/Makefile.am index 1a34e0d..c711e48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,7 @@ MODULES =3D \ guix/build/emacs-build-system.scm \ guix/build/git.scm \ guix/build/hg.scm \ + guix/build/java-utils.scm \ guix/build/glib-or-gtk-build-system.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index cd544ad..b98a651 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)) =20 @@ -107,6 +108,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 0000000..1ca5b3d --- /dev/null +++ b/guix/build/java-utils.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2016 Hartmut Goebel +;;; +;;; 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 (a= t +;;; 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)) + +(define (package-name-version store-dir) + ; copied from haskell-build-system.scm - seeking for a more general so= lution + "Given a store directory STORE-DIR return 'name-version' of the packag= e." + (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 jars-dir) + "Helper for the 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 jars-dir "\\.jar$"))))) + +(define* (install-javadoc apidocs-dir) + "Helper to install the javadocs." + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (docs (string-append (assoc-ref outputs "doc") + "/share/doc/" (package-name-version out)= "/"))) + (mkdir-p docs) + (copy-recursively apidocs-dir docs)))) --=20 2.7.4