Show exit value and whether terminated with signal for subjobs.

Conflicts:

	scm/lily.scm

diff --git a/scm/lily.scm b/scm/lily.scm
index d5121fe32b3084701bce9d893972a3647029831c..045ac460d60913223c330d687c8d9fc239694f70 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -490,25 +490,32 @@ The syntax is the same as `define*-public'."
              (for-each
               (lambda (pid)
                 (let* ((stat (cdr (waitpid pid))))
-
+                  
                   (if (not (= stat 0))
-                      (set! errors (cons (list-element-index joblist pid) errors)))))
+                      (set! errors (acons (list-element-index joblist pid) stat errors)))))
               joblist)
 
              (for-each
               (lambda (x)
-                (let* ((logfile  (format "~a-~a.log"
-                                         (ly:get-option 'log-file) x))
+                (let* ((job (car x))
+                       (state (cdr x))
+                       (logfile  (format "~a-~a.log"
+                                         (ly:get-option 'log-file) job))
                        (log (ly:gulp-file logfile))
                        (len (string-length log))
                        (tail (substring  log (max 0 (- len 1024)))))
 
-                  (display (format "\n\nlogfile ~a:\n\n ~a" logfile tail))))
+                  (if (status:term-sig state)
+                      (ly:message "\n\n~a\n"
+                                  (format (_ "job ~a terminated with signal: ~a")
+                                          job
+                                          (status:term-sig state)))
+                      (ly:message (_ "logfile ~a (exit ~a):\n~a") logfile (status:exit-val state) tail))))
 
               errors)
 
              (if (pair? errors)
-                 (ly:error "Children ~a exited with errors." errors))
+                 (ly:error "Children ~a exited with errors." (map car errors)))
 
            (exit (if (null? errors) 0 1))))))
              
@@ -555,6 +562,7 @@ The syntax is the same as `define*-public'."
           (if (= (random 40) 1)
               (ly:reset-all-fonts))))
 
+
      files)
     failed))