GNU bug report logs - #30665
ant-build-system: use manifest task

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30665 in the body.
You can then email your comments to 30665 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <ricardo.wurmus <at> mdc-berlin.de>
To: <bug-guix <at> gnu.org>
Subject: ant-build-system: use manifest task
Date: Thu, 1 Mar 2018 18:42:08 +0100

Hi Guix,

instead of using a custom target that uses the “echo” task to write the
manifest, the ant-build-system should use the “manifest” task directly.

It is documented here:

    https://ant.apache.org/manual/Tasks/manifest.html

-- 
Ricardo

Message #8 received at 30665 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 30665 <at> debbugs.gnu.org
Cc: Gábor Boskovits <boskovits <at> gmail.com>
Subject: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create
 manifest.
Date: Mon, 18 Jun 2018 10:31:30 +0200

---
 guix/build/ant-build-system.scm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index 3ed12b9f4..87c782d85 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -68,14 +68,11 @@
 
                  (target (@ (name "manifest"))
                          (mkdir (@ (dir "${manifest.dir}")))
-                         (echo (@ (file "${manifest.file}")
-                                  (message ,(string-append
-                                              (if main-class
-                                                (string-append
-                                                  "Main-Class: " main-class
-                                                  "${line.separator}")
-                                                "")
-                                              "")))))
+                         (manifest (@ (file "${manifest.file}"))
+                                   ,(if main-class
+                                       `(attribute (@ (name "Main-Class")
+                                                      (value ,main-class)))
+                                       "")))
 
                  (target (@ (name "compile"))
                          (mkdir (@ (dir "${classes.dir}")))
-- 
2.17.1

Message #11 received at 30665 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Gábor Boskovits <boskovits <at> gmail.com>,
 30665 <at> debbugs.gnu.org
Subject: Re: bug#30665: [PATCH,
 STAGING] guix: ant-build-system: Use manifest task to create manifest.
Date: Mon, 18 Jun 2018 15:49:52 +0200

[Message part 1 (text/plain, inline)]

Gábor Boskovits <boskovits <at> gmail.com> writes:

> ---
>  guix/build/ant-build-system.scm | 13 +++++--------
>  1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
> index 3ed12b9f4..87c782d85 100644
> --- a/guix/build/ant-build-system.scm
> +++ b/guix/build/ant-build-system.scm
> @@ -68,14 +68,11 @@
>  
>                   (target (@ (name "manifest"))
>                           (mkdir (@ (dir "${manifest.dir}")))
> -                         (echo (@ (file "${manifest.file}")
> -                                  (message ,(string-append
> -                                              (if main-class
> -                                                (string-append
> -                                                  "Main-Class: " main-class
> -                                                  "${line.separator}")
> -                                                "")
> -                                              "")))))
> +                         (manifest (@ (file "${manifest.file}"))
> +                                   ,(if main-class
> +                                       `(attribute (@ (name "Main-Class")
> +                                                      (value ,main-class)))
> +                                       "")))

LGTM.  I was about to push it and start the 'staging' jobset on Hydra,
but I'm not sure what to write in the commit message.  Are you able to
push it soonish?

I'll start Hydra once the current 'master' evaluation finishes.

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 30665-done <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 30665-done <at> debbugs.gnu.org
Subject: ant-build-system: use-manifest-task
Date: Mon, 18 Jun 2018 17:18:14 +0200

[Message part 1 (text/plain, inline)]

Fixed on staging, commit:
90ea1006a86518e523c510eee1214fd81e71da74.

[Message part 2 (text/html, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.