[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: guix: ant-build-system: Use ant-task "jar" instead of executing "
From: |
guix-commits |
Subject: |
01/02: guix: ant-build-system: Use ant-task "jar" instead of executing "jar". |
Date: |
Thu, 25 Jul 2019 04:24:02 -0400 (EDT) |
htgoebel pushed a commit to branch staging
in repository guix.
commit a3316239312b2dfd43c51f283860352e5652ea06
Author: Hartmut Goebel <address@hidden>
Date: Thu Apr 20 16:43:35 2017 +0200
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 d79a2d5..a0dd6f0 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}"))