guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#36695] [PATCH 1/3] guix: ant-build-system: Use ant-task "jar" inste


From: Hartmut Goebel
Subject: [bug#36695] [PATCH 1/3] guix: ant-build-system: Use ant-task "jar" instead of executing "jar".
Date: Tue, 16 Jul 2019 22:10:18 +0200

* 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 @@
                  (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}"))
-- 
2.21.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]