From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?Q?G=C3=A1bor?= Boskovits <boskovits@gmail.com>
Subject: bug#30665: [PATCH,
	STAGING] guix: ant-build-system: Use manifest task to create manifest.
Date: Mon, 18 Jun 2018 10:31:30 +0200
Message-ID: <20180618083130.3500-1-boskovits@gmail.com>
References: <idjo9k73d73.fsf@bimsb-sys02.mdc-berlin.net>
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58350)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fUpa1-0004R1-UJ
	for bug-guix@gnu.org; Mon, 18 Jun 2018 04:32:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fUpZy-0005Um-Q5
	for bug-guix@gnu.org; Mon, 18 Jun 2018 04:32:05 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:46452)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1fUpZy-0005Ui-Li
	for bug-guix@gnu.org; Mon, 18 Jun 2018 04:32:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1fUpZy-0007VE-Cp
	for bug-guix@gnu.org; Mon, 18 Jun 2018 04:32:02 -0400
In-Reply-To: <idjo9k73d73.fsf@bimsb-sys02.mdc-berlin.net>
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.30665.B30665.152931070328815@debbugs.gnu.org>
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix/>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: 30665@debbugs.gnu.org

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