Skip to content

Commit

Permalink
No longer build Compat and Borg out of order
Browse files Browse the repository at this point in the history
That used to be necessary for Compat, but that is no longer the
case.  For Borg we only did it because we had to do it for Compat.
  • Loading branch information
tarsius committed Dec 18, 2023
1 parent a706ba1 commit 46335f7
Showing 1 changed file with 12 additions and 24 deletions.
36 changes: 12 additions & 24 deletions borg.el
Original file line number Diff line number Diff line change
Expand Up @@ -524,31 +524,19 @@ otherwise."
;; not being so.
(let ((default-directory (borg-worktree "org")))
(shell-command "make autoloads")))
;; Building `borg' first isn't strictly necessary, but since we have
;; to build compat out of order, we might as well do it for borg too.
(message "\n--- [borg] ---\n")
(borg-build "borg")
;; `compat' has to be build before the first package that depends on
;; it is loaded. Otherwise we would get errors about the fact that
;; lib/<package(sic)>/compat-24.el does not exist, which is expected
;; and correct, but also fatal.
(when (borg-dronep "compat")
(message "\n--- [compat] ---\n")
(borg-build "compat"))
(borg-do-drones (drone)
(unless (member drone '("borg" "compat"))
(message "\n--- [%s] ---\n" drone)
(cond
((borg--drone-disabled-p drone)
(message "Skipped (Disabled)"))
((let ((min (cdr (assoc drone borg-minimal-emacs-alist))))
(and min (version< emacs-version min)
(message "Skipped (Requires Emacs >= %s)" min))))
((not (file-exists-p (borg-worktree drone)))
(message "Skipped (Missing)"))
((and quick (borg-get-all drone "build-step"))
(message "Skipped (Expensive to build)"))
((borg-build drone nil native)))))
(message "\n--- [%s] ---\n" drone)
(cond
((borg--drone-disabled-p drone)
(message "Skipped (Disabled)"))
((let ((min (cdr (assoc drone borg-minimal-emacs-alist))))
(and min (version< emacs-version min)
(message "Skipped (Requires Emacs >= %s)" min))))
((not (file-exists-p (borg-worktree drone)))
(message "Skipped (Missing)"))
((and quick (borg-get-all drone "build-step"))
(message "Skipped (Expensive to build)"))
((borg-build drone nil native))))
(borg-batch-rebuild-init))

(defun borg-batch-rebuild-init ()
Expand Down

0 comments on commit 46335f7

Please sign in to comment.