guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: guix: ant-build-system: Use manifest task to create manifest.


From: Gábor Boskovits
Subject: 01/01: guix: ant-build-system: Use manifest task to create manifest.
Date: Mon, 18 Jun 2018 11:14:20 -0400 (EDT)

boskovits pushed a commit to branch staging
in repository guix.

commit 90ea1006a86518e523c510eee1214fd81e71da74
Author: Gábor Boskovits <address@hidden>
Date:   Tue Jun 12 13:52:40 2018 +0200

    guix: ant-build-system: Use manifest task to create manifest.
    
    * guix/build/ant-build-system.scm (default-build.xml): Use manifest task
    to create manifest file instead of a custom echo task.
---
 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 3ed12b9..87c782d 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}")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]