guix-build: Add `--verbosity'.

* guix-build.in (%default-options): Add `verbosity'.
  (%options): Add `--verbosity'.
  (guix-build): Pass it to `set-build-options'.
  (show-help): Update accordingly.
* doc/guix.texi (Invoking guix-build): Document `--verbosity'.
This commit is contained in:
Ludovic Courtès 2012-12-15 15:21:38 +01:00
parent da30f55582
commit 07ab4bf1fc
2 changed files with 18 additions and 3 deletions

View File

@ -532,6 +532,12 @@ value @code{0} means to use as many CPU cores as available.
@itemx -r @var{file}
Make @var{file} a symlink to the result, and register it as a garbage
collector root.
@item --verbosity=@var{level}
Use the given verbosity level. @var{level} must be an integer between 0
and 5; higher means more verbose output. Setting a level of 4 or more
may be helpful when debugging setup issues with the build daemon.
@end table
Behind the scenes, @command{guix-build} is essentially an interface to

View File

@ -71,7 +71,8 @@ When SOURCE? is true, return the derivations of the package sources."
(define %default-options
;; Alist of default option values.
`((system . ,(%current-system))
(substitutes? . #t)))
(substitutes? . #t)
(verbosity . 0)))
(define (show-help)
(display (_ "Usage: guix-build [OPTION]... PACKAGE-OR-DERIVATION...
@ -95,6 +96,8 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
(display (_ "
-r, --root=FILE make FILE a symlink to the result, and register it
as a garbage collector root"))
(display (_ "
--verbosity=LEVEL use the given verbosity LEVEL"))
(newline)
(display (_ "
-h, --help display this help and exit"))
@ -147,7 +150,12 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
(alist-delete 'substitutes? result))))
(option '(#\r "root") #t #f
(lambda (opt name arg result)
(alist-cons 'gc-root arg result)))))
(alist-cons 'gc-root arg result)))
(option '("verbosity") #t #f
(lambda (opt name arg result)
(let ((level (string->number arg)))
(alist-cons 'verbosity level
(alist-delete 'verbosity result)))))))
;;;
@ -244,7 +252,8 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
(set-build-options (%store)
#:keep-failed? (assoc-ref opts 'keep-failed?)
#:build-cores (or (assoc-ref opts 'cores) 0)
#:use-substitutes? (assoc-ref opts 'substitutes?))
#:use-substitutes? (assoc-ref opts 'substitutes?)
#:verbosity (assoc-ref opts 'verbosity))
(if (assoc-ref opts 'derivations-only?)
(format #t "~{~a~%~}" drv)