guix: ant-build-system: Use ant-task "jar" instead of executing "jar".
authorHartmut Goebel <h.goebel@crazy-compilers.com>
Thu, 20 Apr 2017 14:43:35 +0000 (16:43 +0200)
committerHartmut Goebel <h.goebel@crazy-compilers.com>
Thu, 25 Jul 2019 08:21:44 +0000 (10:21 +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

index d79a2d5..a0dd6f0 100644 (file)
                  (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}"))