Skip to content

Commit

Permalink
revert build legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
jcs090218 committed Dec 29, 2023
1 parent 1efabea commit d997f14
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/exec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
emacs-version:
- 26.3
- 27.2
- 28.2
- 29.1
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/link.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
emacs-version:
- 26.3
- 27.2
- 28.2
- 29.1
Expand Down
17 changes: 8 additions & 9 deletions lisp/_prepare.el
Original file line number Diff line number Diff line change
Expand Up @@ -483,18 +483,20 @@ Arguments FNC and ARGS are used for advice `:around'."
;;
;;; Package

(defun eask-use-legacy-package-build ()
"Return t if using the legacy `package-build' package."
(version< emacs-version "27.1"))

(defun eask-load-legacy-package-build ()
"Load the legacy `package-build' package."
(eask-with-progress
(let ((name (ansi-green"package-build"))
(version (ansi-yellow (eask-2str emacs-major-version))))
(format " - %sInstalling legacy %s (%s)... " eask--action-prefix name version))
(when (eask-use-legacy-package-build)
(add-to-list 'load-path
(format "%sextern/package-build/%s/"
eask-lisp-root
emacs-major-version)
t)
"done ✓"))
t)))

(eask-load-legacy-package-build)

(defun eask--update-exec-path ()
"Add all bin directory to the variable `exec-path'."
Expand Down Expand Up @@ -646,9 +648,6 @@ Argument BODY are forms for execution."
(eask-defvc< 27 (eask-pkg-init)) ; XXX: remove this after we drop 26.x
(eask--pkg-process pkg
(cond
((and (equal (eask-2str pkg) "package-build")
(version< emacs-version "27.1"))
(eask-load-legacy-package-build))
((package-installed-p pkg)
(eask-msg " - %sSkipping %s (%s)... already installed ✗"
eask--action-prefix
Expand Down

0 comments on commit d997f14

Please sign in to comment.