diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2017-04-20 16:43:35 +0200 |
|---|---|---|
| committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-07-25 10:21:44 +0200 |
| commit | a3316239312b2dfd43c51f283860352e5652ea06 (patch) | |
| tree | 4914da10f74a2d4bd8cdd89f4a4b967f6e6d0ede | |
| parent | 7c0411879b3a393e4a2b082571fc23d4134b182f (diff) | |
| download | guix-a3316239312b2dfd43c51f283860352e5652ea06.tar guix-a3316239312b2dfd43c51f283860352e5652ea06.tar.gz | |
guix: ant-build-system: Use ant-task "jar" instead of executing "jar".
* guix/build/ant-build-system.scm (default-build.xml): Change XML for
target "jar" to use ant-task "jar" instead of "exec".
| -rw-r--r-- | guix/build/ant-build-system.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index d79a2d55ed..a0dd6f0fb4 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -118,10 +118,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}")) |