unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: "Gábor Boskovits" <boskovits@gmail.com>
To: 30665@debbugs.gnu.org
Subject: bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest.
Date: Mon, 18 Jun 2018 10:31:30 +0200	[thread overview]
Message-ID: <20180618083130.3500-1-boskovits@gmail.com> (raw)
In-Reply-To: <idjo9k73d73.fsf@bimsb-sys02.mdc-berlin.net>

---
 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

  reply	other threads:[~2018-06-18  8:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-01 17:42 bug#30665: ant-build-system: use manifest task Ricardo Wurmus
2018-06-18  8:31 ` Gábor Boskovits [this message]
2018-06-18 13:49   ` bug#30665: [PATCH, STAGING] guix: ant-build-system: Use manifest task to create manifest Marius Bakke
2018-06-18 15:18 ` bug#30665: ant-build-system: use-manifest-task Gábor Boskovits

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180618083130.3500-1-boskovits@gmail.com \
    --to=boskovits@gmail.com \
    --cc=30665@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).