nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pull: Add (guix build compile) to the mix. 

Fixes <https://bugs.gnu.org/28956>.
Reported by Leo Famulari <leo@famulari.name>.

* build-aux/build-self.scm (build): Add (guix build compile) to
 #:modules.
* guix/build/pull.scm (build-guix): Wrap 'compile-files' call in
'with-directory-excursion'.  Strip "./" from FILES when passing it to
'compile-files'.
master
Ludovic Courtès 2017-10-23 16:33:50 -07:00
parent 7a04dddd26
commit ce33c3af76
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-aux/build-self.scm
View File

@ -245,6 +245,7 @@ Please upgrade to an intermediate version first, for instance with:
(gexp->derivation "guix-latest" builder (gexp->derivation "guix-latest" builder
#:modules '((guix build pull) #:modules '((guix build pull)
(guix build utils) (guix build utils)
(guix build compile)
;; Closure of (guix modules). ;; Closure of (guix modules).
(guix modules) (guix modules)

51
guix/build/pull.scm
View File

@ -121,31 +121,40 @@ containing the source code. Write any debugging output to DEBUG-PORT."
;; Compile the .scm files. Filter out files depending on Guile-SSH when ;; Compile the .scm files. Filter out files depending on Guile-SSH when
;; Guile-SSH is missing. ;; Guile-SSH is missing.
(let ((files (filter has-all-its-dependencies? (with-directory-excursion out
(all-scheme-files out)))) (let ((files (filter has-all-its-dependencies?
(compile-files out out files (all-scheme-files "."))))
(compile-files out out
#:workers (parallel-job-count) ;; XXX: 'compile-files' except ready-to-use relative
;; file names.
(map (lambda (file)
(if (string-prefix? "./" file)
(string-drop file 2)
file))
files)
;; Disable warnings. #:workers (parallel-job-count)
#:warning-options '()
#:report-load ;; Disable warnings.
(lambda (file total completed) #:warning-options '()
(display #\cr log-port)
(format log-port
"loading...\t~5,1f% of ~d files" ;FIXME: i18n
(* 100. (/ completed total)) total)
(force-output log-port)
(format debug-port "~%loading '~a'...~%" file))
#:report-compilation #:report-load
(lambda (file total completed) (lambda (file total completed)
(display #\cr log-port) (display #\cr log-port)
(format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n (format log-port
(* 100. (/ completed total)) total) "loading...\t~5,1f% of ~d files" ;FIXME: i18n
(force-output log-port) (* 100. (/ completed total)) total)
(format debug-port "~%compiling '~a'...~%" file))))) (force-output log-port)
(format debug-port "~%loading '~a'...~%" file))
#:report-compilation
(lambda (file total completed)
(display #\cr log-port)
(format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n
(* 100. (/ completed total)) total)
(force-output log-port)
(format debug-port "~%compiling '~a'...~%" file))))))
(newline) (newline)
#t) #t)