guix-commits
[Top][All Lists]
Advanced

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

23/28: gnu: java-stringtemplate-3: Use return value in build phase.


From: Ricardo Wurmus
Subject: 23/28: gnu: java-stringtemplate-3: Use return value in build phase.
Date: Tue, 16 May 2017 09:24:36 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit b101b4e8c1a5c9719b645708dfa0f7dda4b77f2d
Author: Ricardo Wurmus <address@hidden>
Date:   Tue May 16 12:52:59 2017 +0200

    gnu: java-stringtemplate-3: Use return value in build phase.
    
    * gnu/packages/java.scm (java-stringtemplate-3)[arguments]: Let
    build phase "generate-grammar" return success or failure.
---
 gnu/packages/java.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8fe005b..123c49c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3165,6 +3165,9 @@ tree walking, and translation.")
     (arguments
      `(#:jar-name (string-append ,name "-" ,version ".jar")
        #:test-dir "test"
+       #:modules ((guix build ant-build-system)
+                  (guix build utils)
+                  (srfi srfi-1))
        #:phases
        (modify-phases %standard-phases
          (add-before 'check 'fix-tests
@@ -3175,13 +3178,12 @@ tree walking, and translation.")
              #t))
          (add-before 'build 'generate-grammar
            (lambda _
-             (let ((dir "src/org/antlr/stringtemplate/language/"))
-               (for-each (lambda (file)
-                           (display file)
-                           (newline)
-                           (system* "antlr" "-o" dir (string-append dir file)))
-                         '("template.g" "angle.bracket.template.g" "action.g"
-                           "eval.g" "group.g" "interface.g"))))))))
+             (with-directory-excursion "src/org/antlr/stringtemplate/language/"
+               (every (lambda (file)
+                        (format #t "~a\n" file)
+                        (zero? (system* "antlr" file)))
+                      '("template.g" "angle.bracket.template.g" "action.g"
+                        "eval.g" "group.g" "interface.g"))))))))
     (native-inputs
      `(("antlr" ,antlr2)
        ("java-junit" ,java-junit)))



reply via email to

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