From 34a1783fc1498d7150210da22dd7804d288438b3 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 26 Oct 2015 18:09:28 -0400
Subject: scripts: build: Add --file option.

* guix/scripts/build.scm (show-help): Add help text for --file option.
  (%options): Add --file option.
  (options/resolve-packages): Handle 'file' options.
* tests/guix-build.sh: Add tests.
* doc/guix.texi ("invoking guix build"): Add doc.
---
 guix/scripts/build.scm | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'guix/scripts/build.scm')

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index a357cf8aa4..ee7e5b958c 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -290,6 +290,9 @@ (define (show-help)
   (display (_ "
   -e, --expression=EXPR  build the package or derivation EXPR evaluates to"))
   (display (_ "
+  -f, --file=FILE        build the package or derivation that the code within
+                         FILE evaluates to"))
+  (display (_ "
   -S, --source           build the packages' source derivations"))
   (display (_ "
       --sources[=TYPE]   build source derivations; TYPE may optionally be one
@@ -359,6 +362,9 @@ (define %options
          (option '(#\e "expression") #t #f
                  (lambda (opt name arg result)
                    (alist-cons 'expression arg result)))
+         (option '(#\f "file") #t #f
+                 (lambda (opt name arg result)
+                   (alist-cons 'file arg result)))
          (option '(#\n "dry-run") #f #f
                  (lambda (opt name arg result)
                    (alist-cons 'dry-run? #t result)))
@@ -422,29 +428,34 @@ (define (options/resolve-packages store opts)
   (define system
     (or (assoc-ref opts 'system) (%current-system)))
 
+  (define (object->argument obj)
+    (match obj
+      ((? package? p)
+       `(argument . ,p))
+      ((? procedure? proc)
+       (let ((drv (run-with-store store
+                    (mbegin %store-monad
+                      (set-guile-for-build (default-guile))
+                      (proc))
+                    #:system system)))
+         `(argument . ,drv)))
+      ((? gexp? gexp)
+       (let ((drv (run-with-store store
+                    (mbegin %store-monad
+                      (set-guile-for-build (default-guile))
+                      (gexp->derivation "gexp" gexp
+                                        #:system system)))))
+         `(argument . ,drv)))))
+
   (map (match-lambda
         (('argument . (? string? spec))
          (if (store-path? spec)
              `(argument . ,spec)
              `(argument . ,(specification->package spec))))
+        (('file . file)
+         (object->argument (load* file (make-user-module '()))))
         (('expression . str)
-         (match (read/eval str)
-           ((? package? p)
-            `(argument . ,p))
-           ((? procedure? proc)
-            (let ((drv (run-with-store store
-                         (mbegin %store-monad
-                           (set-guile-for-build (default-guile))
-                           (proc))
-                         #:system system)))
-              `(argument . ,drv)))
-           ((? gexp? gexp)
-            (let ((drv (run-with-store store
-                         (mbegin %store-monad
-                           (set-guile-for-build (default-guile))
-                           (gexp->derivation "gexp" gexp
-                                             #:system system)))))
-              `(argument . ,drv)))))
+         (object->argument (read/eval str)))
         (opt opt))
        opts))
 
-- 
cgit v1.2.3