[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/22: guix: Add java-utils.
From: |
Ricardo Wurmus |
Subject: |
03/22: guix: Add java-utils. |
Date: |
Wed, 10 May 2017 11:59:38 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 59135f0d7e52657bff8bc9f8b0a9133ee671f777
Author: Hartmut Goebel <address@hidden>
Date: Fri Sep 9 16:51:03 2016 +0200
guix: Add java-utils.
* guix/build/java-utils.scm: New file.
* guix/build-system/ant.scm: Use it.
* Makefile.am (MODULES): Add it.
Co-authored-by: Ricardo Wurmus <address@hidden>
---
Makefile.am | 1 +
guix/build-system/ant.scm | 2 ++
guix/build/java-utils.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 3d91617..d85b671 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 bf2f3b4..228b4e6 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 0000000..402d377
--- /dev/null
+++ b/guix/build/java-utils.scm
@@ -0,0 +1,55 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Hartmut Goebel <address@hidden>
+;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
+;;;
+;;; 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))
+
+;; 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
+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)))
- 05/22: gnu: Add java-plexus-interpolation., (continued)
- 05/22: gnu: Add java-plexus-interpolation., Ricardo Wurmus, 2017/05/10
- 02/22: ant-build-system: Add default "check" target., Ricardo Wurmus, 2017/05/10
- 13/22: gnu: Add java-jmh., Ricardo Wurmus, 2017/05/10
- 15/22: gnu: Add java-commons-io., Ricardo Wurmus, 2017/05/10
- 16/22: gnu: Add java-commons-lang., Ricardo Wurmus, 2017/05/10
- 19/22: gnu: Add java-commons-codec., Ricardo Wurmus, 2017/05/10
- 09/22: gnu: Add java-easymock., Ricardo Wurmus, 2017/05/10
- 11/22: gnu: java-hamcrest-core: Install all jars without version suffix., Ricardo Wurmus, 2017/05/10
- 18/22: gnu: Add java-commons-cli., Ricardo Wurmus, 2017/05/10
- 14/22: gnu: Add java-commons-collections4., Ricardo Wurmus, 2017/05/10
- 03/22: guix: Add java-utils.,
Ricardo Wurmus <=
- 22/22: gnu: java-hamcrest-core: Declare test target., Ricardo Wurmus, 2017/05/10
- 17/22: gnu: Add java-commons-lang3., Ricardo Wurmus, 2017/05/10