From d997f140e120d9beee484cb65a7d4a420438fcb4 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Fri, 29 Dec 2023 03:05:58 -0800 Subject: [PATCH] revert build legacy --- .github/workflows/exec.yml | 1 + .github/workflows/link.yml | 1 + lisp/_prepare.el | 17 ++++++++--------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/exec.yml b/.github/workflows/exec.yml index 01b7739e..35e7b91e 100644 --- a/.github/workflows/exec.yml +++ b/.github/workflows/exec.yml @@ -31,6 +31,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] emacs-version: + - 26.3 - 27.2 - 28.2 - 29.1 diff --git a/.github/workflows/link.yml b/.github/workflows/link.yml index 04ab431b..dc1a2425 100644 --- a/.github/workflows/link.yml +++ b/.github/workflows/link.yml @@ -31,6 +31,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] emacs-version: + - 26.3 - 27.2 - 28.2 - 29.1 diff --git a/lisp/_prepare.el b/lisp/_prepare.el index 68d3ebcc..9aa4bb42 100644 --- a/lisp/_prepare.el +++ b/lisp/_prepare.el @@ -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'." @@ -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