From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: guix-devel@gnu.org
Subject: [PATCH 03/12] guix: Add java-utils.
Date: Fri, 9 Sep 2016 16:51:03 +0200 [thread overview]
Message-ID: <1473432672-21007-4-git-send-email-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <1473432672-21007-1-git-send-email-h.goebel@crazy-compilers.com>
* 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 = \
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))
@@ -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 © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+
+(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 solution
+ "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 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))))
--
2.7.4
next prev parent reply other threads:[~2016-09-09 14:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 14:51 [PATCH 00/12] Java build-system and some packages Hartmut Goebel
2016-09-09 14:51 ` [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory Hartmut Goebel
2016-09-09 14:51 ` [PATCH 02/12] guix: ant-build-system: use abs path as basedir Hartmut Goebel
2016-09-09 14:51 ` Hartmut Goebel [this message]
2016-09-09 14:51 ` [PATCH 04/12] gnu: Add java-plexus-utils Hartmut Goebel
2016-09-09 14:51 ` [PATCH 05/12] gnu: Add java-plexus-interpolation Hartmut Goebel
2016-09-09 14:51 ` [PATCH 06/12] gnu: Add java-commons-cli Hartmut Goebel
2016-09-09 14:51 ` [PATCH 07/12] gnu: Add java-commons-codec Hartmut Goebel
2016-09-09 14:51 ` [PATCH 08/12] gnu: Add java-commons-daemon Hartmut Goebel
2016-09-09 14:51 ` [PATCH 09/12] gnu: Add java-commons-io Hartmut Goebel
2016-09-09 14:51 ` [PATCH 10/12] gnu: Add java-commons-lang Hartmut Goebel
2016-09-09 14:51 ` [PATCH 11/12] gnu: Add java-commons-lang3 Hartmut Goebel
2016-09-09 14:51 ` [PATCH 12/12] gnu: Add java-commons-bcel Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473432672-21007-4-git-send-email-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.