From a3316239312b2dfd43c51f283860352e5652ea06 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Thu, 20 Apr 2017 16:43:35 +0200 Subject: [PATCH] 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". --- guix/build/ant-build-system.scm | 7 +++---- 1 file 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 @@ (define* (default-build.xml jar-name prefix #:optional (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}"))