diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 18:51:12 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 18:51:12 +0200 |
| commit | 1b1b006afd31c5526f34d157baef492c7dde2e9c (patch) | |
| tree | e641460b7c8d1078a8d9769cae40acec0c65ff4c /guix | |
| parent | fc34abf8c1b966f2312ff7bef41ff0186b28d6ff (diff) | |
| parent | 5e5cdac0ae128f36c0cd62a671e7760aca3d9c6c (diff) | |
| download | guix-patches-1b1b006afd31c5526f34d157baef492c7dde2e9c.tar guix-patches-1b1b006afd31c5526f34d157baef492c7dde2e9c.tar.gz | |
Merge branch 'staging'
Diffstat (limited to 'guix')
| -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}")) |