diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-14 17:21:46 +0200 |
| commit | 61b1df6f2791a2afa291b56708d73a5264ca70eb (patch) | |
| tree | 314ddb96391b25e83e9a31637be0f1a7f52cc249 /guix/build-system/ant.scm | |
| parent | bdb8267680f14ee5d3df9d029f23279c1457c211 (diff) | |
| parent | 4be014128e1c422f37b56f9a6b3420b4e85c4302 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/build-system/ant.scm')
| -rw-r--r-- | guix/build-system/ant.scm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 550f92bc7f..228b4e60d2 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)) @@ -93,11 +94,13 @@ (define* (ant-build store name inputs #:key (tests? #t) - (test-target "tests") + (test-target "check") (configure-flags ''()) (make-flags ''()) (build-target "jar") (jar-name #f) + (source-dir "src") + (test-dir "src/test") (phases '(@ (guix build ant-build-system) %standard-phases)) (outputs '("out")) @@ -106,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 @@ -126,6 +130,8 @@ #:test-target ,test-target #:build-target ,build-target #:jar-name ,jar-name + #:source-dir ,source-dir + #:test-dir ,test-dir #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp |