emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

doom//byte-compile: better error handling (revert on error)

Browse source
This commit is contained in:
Henrik Lissner 2017-12-22 17:05:01 -05:00
parent 1873a48e71
commit 3bbb78f779
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

63
core/core-packages.el
View file

@ -634,33 +634,42 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
(error "No targets to compile")) (error "No targets to compile"))
(let ((use-package-expand-minimally t)) (let ((use-package-expand-minimally t))
(push (expand-file-name "init.el" doom-emacs-dir) compile-targets) (push (expand-file-name "init.el" doom-emacs-dir) compile-targets)
(dolist (target compile-targets) (condition-case ex
(when (or (not recompile-p) (progn
(let ((elc-file (byte-compile-dest-file target))) (dolist (target compile-targets)
(and (file-exists-p elc-file) (when (or (not recompile-p)
(file-newer-than-file-p file elc-file)))) (let ((elc-file (byte-compile-dest-file target)))
(let ((result (if (doom-packages--read-if-cookies target) (and (file-exists-p elc-file)
(byte-compile-file target) (file-newer-than-file-p file elc-file))))
'no-byte-compile)) (let ((result (if (doom-packages--read-if-cookies target)
(short-name (file-relative-name target doom-emacs-dir))) (byte-compile-file target)
(cl-incf 'no-byte-compile))
(cond ((eq result 'no-byte-compile) (short-name (file-relative-name target doom-emacs-dir)))
(message! (dark (white "⚠ Ignored %s" short-name))) (cl-incf
total-noop) (cond ((eq result 'no-byte-compile)
((null result) (message! (dark (white "⚠ Ignored %s" short-name)))
(message! (red "✕ Failed to compile %s" short-name)) total-noop)
total-fail) ((null result)
(t (message! (red "✕ Failed to compile %s" short-name))
(message! (green "✓ Compiled %s" short-name)) total-fail)
(quiet! (load target t t)) (t
total-ok)))))) (message! (green "✓ Compiled %s" short-name))
(message! (quiet! (load target t t))
(bold total-ok))))))
(color (if (= total-fail 0) 'green 'red) (message!
"%s %s file(s) %s" (bold
(if recompile-p "Recompiled" "Compiled") (color (if (= total-fail 0) 'green 'red)
(format "%d/%d" total-ok (- (length compile-targets) total-noop)) "%s %s file(s) %s"
(format "(%s ignored)" total-noop))))))))) (if recompile-p "Recompiled" "Compiled")
(format "%d/%d" total-ok (- (length compile-targets) total-noop))
(format "(%s ignored)" total-noop)))))
(error
(message! (red "\n%%s\n\n%%s\n\n%%s")
"There were breaking errors."
(error-message-string ex)
"Reverting changes...")
(doom//clean-byte-compiled-files)
(message! (green "Finished (nothing was byte-compiled)")))))))))
(defun doom//byte-compile-core (&optional recompile-p) (defun doom//byte-compile-core (&optional recompile-p)
"Byte compile the core Doom files. "Byte compile the core Doom files.