[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/11: gnu: clojure: Use (guix build java-utils) to simplify build phase
From: |
Danny Milosavljevic |
Subject: |
04/11: gnu: clojure: Use (guix build java-utils) to simplify build phases. |
Date: |
Mon, 19 Nov 2018 07:52:40 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit d0ad97115abb548195b920e83ce2769b5020884d
Author: Alex Vong <address@hidden>
Date: Sun Oct 14 02:52:41 2018 +0800
gnu: clojure: Use (guix build java-utils) to simplify build phases.
* gnu/packages/lisp.scm (clojure)[arguments]: Use 'ant-build-javadoc',
'install-jars' and 'install-javadoc' in build phases.
---
gnu/packages/lisp.scm | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 24738f3..c33e418 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -614,10 +614,10 @@ interface.")
(build-system ant-build-system)
(arguments
`(#:modules ((guix build ant-build-system)
+ (guix build java-utils)
(guix build utils)
(ice-9 ftw)
(ice-9 regex)
- (srfi srfi-1)
(srfi srfi-26))
#:test-target "test"
#:phases
@@ -641,34 +641,22 @@ interface.")
(substitute* "build.xml"
(("<attribute name=\"Class-Path\" value=\".\"/>") ""))
#t))
- ;; The javadoc target is not built by default.
- (add-after 'build 'build-doc
- (lambda _
- (invoke "ant" "javadoc")))
- ;; Needed since no install target is provided.
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((java-dir (string-append (assoc-ref outputs "out")
- "/share/java/")))
- ;; Install versioned to avoid collisions.
- (install-file (string-append "clojure-" ,version ".jar")
- java-dir)
- #t)))
- ;; Needed since no install-doc target is provided.
+ (add-after 'build 'build-javadoc ant-build-javadoc)
+ (replace 'install (install-jars "./"))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let ((doc-dir (string-append (assoc-ref outputs "out")
"/share/doc/clojure-"
,version "/")))
(copy-recursively "doc/clojure" doc-dir)
- (copy-recursively "target/javadoc/"
- (string-append doc-dir "javadoc/"))
(for-each (cut install-file <> doc-dir)
(filter (cut string-match
".*\\.(html|markdown|md|txt)"
<>)
(scandir "./")))
- #t))))))
+ #t)))
+ (add-after 'install-doc 'install-javadoc
+ (install-javadoc "target/javadoc/")))))
(native-inputs libraries)
(home-page "https://clojure.org/")
(synopsis "Lisp dialect running on the JVM")
- branch master updated (f4ee41c -> 5497214), Danny Milosavljevic, 2018/11/19
- 02/11: gnu: clojure: Remove 'remove-archives' snippet., Danny Milosavljevic, 2018/11/19
- 03/11: gnu: clojure: Refactor to ensure there's a single list of libraries., Danny Milosavljevic, 2018/11/19
- 04/11: gnu: clojure: Use (guix build java-utils) to simplify build phases.,
Danny Milosavljevic <=
- 10/11: gnu: Add clojure-tools-macro., Danny Milosavljevic, 2018/11/19
- 08/11: gnu: Add clojure-core-match., Danny Milosavljevic, 2018/11/19
- 01/11: gnu: clojure: Move from java to lisp., Danny Milosavljevic, 2018/11/19
- 06/11: build-system: Add 'clojure-build-system'., Danny Milosavljevic, 2018/11/19
- 09/11: gnu: Add clojure-algo-generic., Danny Milosavljevic, 2018/11/19
- 05/11: guix: Add clojure-utils., Danny Milosavljevic, 2018/11/19
- 11/11: gnu: Add clojure-algo-monads., Danny Milosavljevic, 2018/11/19
- 07/11: gnu: Add clojure-instaparse., Danny Milosavljevic, 2018/11/19