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

refactor(cli): use more reliable means to assemble paths

Browse source 
Use filesystem to build or check paths, rather than regexps and string
concatenation.
This commit is contained in:
Henrik Lissner 2022-08-10 14:02:47 +02:00
parent 25ac752de2
commit 8191607093
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lisp/cli/packages.el
View file

@ -2,6 +2,8 @@
;;; Commentary: ;;; Commentary:
;;; Code: ;;; Code:
(require 'comp nil t)
;; ;;
;;; Variables ;;; Variables
@ -157,31 +159,29 @@ list remains lean."
(defun doom-packages--eln-file-name (file) (defun doom-packages--eln-file-name (file)
"Return the short .eln file name corresponding to `file'." "Return the short .eln file name corresponding to `file'."
(concat comp-native-version-dir "/" (file-name-concat
(file-name-nondirectory comp-native-version-dir
(comp-el-to-eln-filename file)))) (file-name-nondirectory
(comp-el-to-eln-filename file))))
(defun doom-packages--eln-output-file (eln-name) (defun doom-packages--eln-output-file (eln-name)
"Return the expected .eln file corresponding to `eln-name'." "Return the expected .eln file corresponding to `eln-name'."
(concat doom-packages--eln-output-path eln-name)) (file-name-concat doom-packages--eln-output-path eln-name))
(defun doom-packages--eln-error-file (eln-name) (defun doom-packages--eln-error-file (eln-name)
"Return the expected .error file corresponding to `eln-name'." "Return the expected .error file corresponding to `eln-name'."
(concat doom-packages--eln-output-path eln-name ".error")) (file-name-concat doom-packages--eln-output-path eln-name ".error"))
(defun doom-packages--find-eln-file (eln-name) (defun doom-packages--find-eln-file (eln-name)
"Find `eln-name' on the `native-comp-eln-load-path'." "Find `eln-name' on the `native-comp-eln-load-path'."
(cl-some (lambda (eln-path) (cl-some (fn! (file-exists-p! eln-name %))
(let ((file (concat eln-path eln-name)))
(when (file-exists-p file)
file)))
native-comp-eln-load-path)) native-comp-eln-load-path))
(defun doom-packages--elc-file-outdated-p (file) (defun doom-packages--elc-file-outdated-p (file)
"Check whether the corresponding .elc for `file' is outdated." "Check whether the corresponding .elc for `file' is outdated."
(let ((elc-file (byte-compile-dest-file file))) (let ((elc-file (byte-compile-dest-file file)))
;; NOTE Ignore missing elc files, they could be missing due to ;; NOTE Ignore missing elc files, they could be missing due to
;; `no-byte-compile'. Rebuilding unnecessarily is expensive. ;; `no-byte-compile'. Rebuilding unnecessarily is expensive.
(when (and (file-exists-p elc-file) (when (and (file-exists-p elc-file)
(file-newer-than-file-p file elc-file)) (file-newer-than-file-p file elc-file))
(doom-log "%s is newer than %s" file elc-file) (doom-log "%s is newer than %s" file elc-file)
@ -215,19 +215,12 @@ list remains lean."
(write-region "" nil error-file) (write-region "" nil error-file)
(doom-log "Wrote %s" error-file))))) (doom-log "Wrote %s" error-file)))))
(defun doom-packages--native-compile-jobs ()
"How many async native compilation jobs are queued or in-progress."
(if (featurep 'comp)
(+ (length comp-files-queue)
(comp-async-runnings))
0))
(defun doom-packages--wait-for-native-compile-jobs () (defun doom-packages--wait-for-native-compile-jobs ()
"Wait for all pending async native compilation jobs." "Wait for all pending async native compilation jobs."
(cl-loop with previous = 0 (cl-loop with previous = 0
with timeout = 30 with timeout = 30
with timer = 0 with timer = 0
for pending = (doom-packages--native-compile-jobs) for pending = (+ (length comp-files-queue) (comp-async-runnings))
while (not (zerop pending)) while (not (zerop pending))
if (/= previous pending) do if (/= previous pending) do
(print! (start "\033[KNatively compiling %d files...\033[1A" pending)) (print! (start "\033[KNatively compiling %d files...\033[1A" pending))
@ -263,13 +256,12 @@ list remains lean."
"Queue async compilation for all non-doom Elisp files." "Queue async compilation for all non-doom Elisp files."
(when NATIVECOMP (when NATIVECOMP
(cl-loop with paths = (cl-loop for path in load-path (cl-loop with paths = (cl-loop for path in load-path
unless (string-prefix-p doom-local-dir path) unless (file-in-directory-p path doom-local-dir)
collect path) collect path)
for file in (doom-files-in paths :match "\\.el\\(?:\\.gz\\)?$") for file in (doom-files-in paths :match "\\.el\\(?:\\.gz\\)?$")
if (and (file-exists-p (byte-compile-dest-file file)) if (and (file-exists-p (byte-compile-dest-file file))
(not (doom-packages--find-eln-file (doom-packages--eln-file-name file))) (not (doom-packages--find-eln-file (doom-packages--eln-file-name file)))
(not (cl-some (lambda (re) (not (cl-some (fn! (string-match-p % file))
(string-match-p re file))
native-comp-deferred-compilation-deny-list))) do native-comp-deferred-compilation-deny-list))) do
(doom-log "Compiling %s" file) (doom-log "Compiling %s" file)
(native-compile-async file)))) (native-compile-async file))))