Browse Source

guix: Add clojure-utils.

* guix/build/clojure-utils.scm: New file.
* gnu/packages/lisp.scm (clojure)[arguments]: Use it.
* Makefile.am (MODULES): Add it.
gn-latest-20200428
Alex Vong 3 years ago
committed by Danny Milosavljevic
parent
commit
53f316ab90
No known key found for this signature in database GPG Key ID: E71A35542C30BAA5
3 changed files with 75 additions and 15 deletions
  1. +2
    -0
      Makefile.am
  2. +8
    -15
      gnu/packages/lisp.scm
  3. +65
    -0
      guix/build/clojure-utils.scm

+ 2
- 0
Makefile.am View File

@ -12,6 +12,7 @@
# Copyright © 2018 Nils Gillmann <ng0@n0.is>
# Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
#
# This file is part of GNU Guix.
#
@ -172,6 +173,7 @@ MODULES = \
guix/build/syscalls.scm \
guix/build/gremlin.scm \
guix/build/debug-link.scm \
guix/build/clojure-utils.scm \
guix/build/emacs-utils.scm \
guix/build/java-utils.scm \
guix/build/lisp-utils.scm \


+ 8
- 15
gnu/packages/lisp.scm View File

@ -600,6 +600,7 @@ interface.")
(library-names (match libraries
(((library-name _) ...)
library-name))))
(package
(name "clojure")
(version "1.9.0")
@ -613,11 +614,13 @@ interface.")
(base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"))))
(build-system ant-build-system)
(arguments
`(#:modules ((guix build ant-build-system)
`(#:imported-modules ((guix build clojure-utils)
(guix build guile-build-system)
,@%ant-build-system-modules)
#:modules ((guix build ant-build-system)
(guix build clojure-utils)
(guix build java-utils)
(guix build utils)
(ice-9 ftw)
(ice-9 regex)
(srfi srfi-26))
#:test-target "test"
#:phases
@ -643,18 +646,8 @@ interface.")
#t))
(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)
(for-each (cut install-file <> doc-dir)
(filter (cut string-match
".*\\.(html|markdown|md|txt)"
<>)
(scandir "./")))
#t)))
(add-after 'install-license-files 'install-doc
(cut install-doc #:doc-dirs '("doc/clojure/") <...>))
(add-after 'install-doc 'install-javadoc
(install-javadoc "target/javadoc/")))))
(native-inputs libraries)


+ 65
- 0
guix/build/clojure-utils.scm View File

@ -0,0 +1,65 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.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 clojure-utils)
#:use-module (guix build utils)
#:use-module (ice-9 ftw)
#:use-module (ice-9 regex)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (%clojure-regex
define-with-docs
install-doc))
(define-syntax-rule (define-with-docs name docs val)
"Create top-level variable named NAME with doc string DOCS and value VAL."
(begin (define name val)
(set-object-property! name 'documentation docs)))
(define-with-docs %doc-regex
"Default regex for matching the base name of top-level documentation files."
(format #f
"(~a)|(\\.(html|markdown|md|txt)$)"
(@@ (guix build guile-build-system)
%documentation-file-regexp)))
(define* (install-doc #:key
doc-dirs
(doc-regex %doc-regex)
outputs
#:allow-other-keys)
"Install the following to the default documentation directory:
1. Top-level files with base name matching DOC-REGEX.
2. All files (recursively) inside DOC-DIRS.
DOC-REGEX can be compiled or uncompiled."
(let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(name-ver (strip-store-file-name out))
(dest-dir (string-append (or doc out) "/share/doc/" name-ver "/"))
(doc-regex* (if (string? doc-regex)
(make-regexp doc-regex)
doc-regex)))
(for-each (cut install-file <> dest-dir)
(remove (compose file-exists?
(cut string-append dest-dir <>))
(scandir "./" (cut regexp-exec doc-regex* <>))))
(for-each (cut copy-recursively <> dest-dir)
doc-dirs)
#t))

Loading…
Cancel
Save