diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:42:06 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:42:06 +0200 |
commit | 462ad9f56b9665b8d22960acee73ad91f1052c9c (patch) | |
tree | 814be463d6d0517e7db9b9e6f15dbc7516955674 /guix/build/ant-build-system.scm | |
parent | 7f5f61ae99321a7a6e08b0100cd428e11ce6a837 (diff) | |
parent | 1b1b006afd31c5526f34d157baef492c7dde2e9c (diff) | |
download | guix-patches-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar guix-patches-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build/ant-build-system.scm')
-rw-r--r-- | guix/build/ant-build-system.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79a2d55ed..49549c1b4b 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -43,7 +43,8 @@ (call-with-output-file "build.xml" (lambda (port) (sxml->xml - `(project (@ (basedir ".")) + `(project (@ (basedir ".") + (name ,jar-name)) (property (@ (name "classes.dir") (value "${basedir}/build/classes"))) (property (@ (name "manifest.dir") @@ -118,10 +119,9 @@ (target (@ (name "jar") (depends "compile, manifest")) (mkdir (@ (dir "${jar.dir}"))) - (exec (@ (executable "jar")) - (arg (@ (line ,(string-append "-cmf ${manifest.file} " - "${jar.dir}/" jar-name - " -C ${classes.dir} .")))))) + (jar (@ (destfile ,(string-append "${jar.dir}/" jar-name)) + (manifest "${manifest.file}") + (basedir "${classes.dir}")))) (target (@ (name "install")) (copy (@ (todir "${dist.dir}")) |