bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest.

[Marius Bakke]

Gábor Boskovits <address@hidden> 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
Description: PGP signature