diff options
| author | Reily Siegel <mail@reilysiegel.com> | 2022-01-18 13:17:24 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-01-24 10:38:14 +0100 |
| commit | 0f2df54f8397560e6e8473e2982c66af01d9cd0a (patch) | |
| tree | 217b9c71b962095c96b33222834d0266682b07c8 /guix/build-system | |
| parent | 09b4d74bd352d40b45e081eaa094b086a42dad3d (diff) | |
| download | guix-patches-0f2df54f8397560e6e8473e2982c66af01d9cd0a.tar guix-patches-0f2df54f8397560e6e8473e2982c66af01d9cd0a.tar.gz | |
build-system/clojure: Support compiling Java.
* guix/build/clojure-build-system.scm (compile-java): New variable.
(build): Copy classes compiled from Java and optionally Java sources to
the final jar.
(%standard-phases): Add compile-java phase before build.
* guix/build/clojure-utils.scm (%java-source-dirs): New variable.
(%java-compile-dir): New variable.
* guix/build-system/clojure.scm (clojure-build): Include %java-source-dirs and
%java-compile-dir.
(builder): Include %java-source-dirs and %java-compile-dir.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/clojure.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 634854cf1b..2a0713d297 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -107,8 +107,10 @@ #:key source (source-dirs `',%source-dirs) + (java-source-dirs `',%java-source-dirs) (test-dirs `',%test-dirs) (compile-dir %compile-dir) + (java-compile-dir %java-compile-dir) (jar-names `',(package-name->jar-names name)) (main-class %main-class) @@ -142,9 +144,11 @@ #:source #+source #:source-dirs #$source-dirs + #:java-source-dirs #$java-source-dirs #:test-dirs #$test-dirs #:compile-dir #$compile-dir - + #:java-compile-dir #$java-compile-dir + #:jar-names #$jar-names #:main-class #$main-class #:omit-source? #$omit-source? |