Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
* fix(install): Package installed calculation (a479d5355dfc832286288b790338652e174d606d)
* fix(install-file): Get correct install package name (#318)
* feat: Add `:try` for `depends-on` DSL (#319)
* fix: Warning missing `lexical-binding` cookie in Eask-file (#320)

## 0.11.x
> Released Apr 03, 2025
Expand Down
2 changes: 2 additions & 0 deletions Easkfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "cli"
"0.11.2"
"A set of command-line tools to build Emacs packages")
Expand Down
7 changes: 7 additions & 0 deletions lisp/_prepare.el
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@ If nil, never time out."
(const :tag "Never time out" nil))
:group 'eask)

;; This is used to avoid the error:
;;
;; Ignoring unknown mode `eask-mode'.
;;
(unless (fboundp 'eask-mode)
(define-derived-mode eask-mode emacs-lisp-mode "Eask"))

;;
;;; Execution

Expand Down
4 changes: 3 additions & 1 deletion lisp/core/init.el
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ Press ^C at any time to quit.")
(split-string keywords "[ \t\n]+" t "[ ]+")))
(keywords (mapconcat (lambda (s) (format "%S" s)) keywords " "))
(content (format
"(package \"%s\"
";; -*- mode: eask; lexical-binding: t -*-

(package \"%s\"
\"%s\"
\"%s\")

Expand Down
2 changes: 1 addition & 1 deletion lisp/format/elisp-autofmt.el
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
(kill-buffer))))

(eask-start
(eask-command-check "28.1")
(eask-command-check "29.1")

;; Preparation
(eask-archive-install-packages '("gnu" "melpa")
Expand Down
4 changes: 3 additions & 1 deletion lisp/init/cask.el
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ Optional argument CONTENTS is used for nested directives. e.g. development."
(keywords (split-string keywords "[, ]"))
(keywords (string-join keywords "\" \""))
(content (format
"(package \"%s\"
";; -*- mode: eask; lexical-binding: t -*-

(package \"%s\"
\"%s\"
\"%s\")

Expand Down
4 changes: 3 additions & 1 deletion lisp/init/eldev.el
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
(keywords (split-string keywords "[, ]"))
(keywords (string-join keywords "\" \""))
(content (format
"(package \"%s\"
";; -*- mode: eask; lexical-binding: t -*-

(package \"%s\"
\"%s\"
\"%s\")

Expand Down
4 changes: 3 additions & 1 deletion lisp/init/keg.el
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ If no found the Keg file, returns nil."
(keywords (split-string keywords "[, ]"))
(keywords (string-join keywords "\" \""))
(content (format
"(package \"%s\"
";; -*- mode: eask; lexical-binding: t -*-

(package \"%s\"
\"%s\"
\"%s\")

Expand Down
4 changes: 3 additions & 1 deletion lisp/init/source.el
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
(keywords (string-join keywords "\" \""))
(reqs (package-desc-reqs pkg-desc))
(content (format
"(package \"%s\"
";; -*- mode: eask; lexical-binding: t -*-

(package \"%s\"
\"%s\"
%s)

Expand Down
2 changes: 2 additions & 0 deletions test/color/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "color"
"0.0.1"
"Test to print color on the terminal")
Expand Down
2 changes: 2 additions & 0 deletions test/error/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "error"
"0.0.1"
"Test (trigger) error on GitHub Actions")
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/home/.emacs.d/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package ".emacs.d"
"0.0.1"
"Minimal test configuration")
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/home/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "home"
"0.0.1"
"Minimal test for global config")
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/mini.pkg.1/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "mini.pkg.1"
"0.0.1"
"Minimal test package")
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/mini.pkg.2/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "mini.pkg.2"
"0.0.1"
"Minimal test package")
Expand Down
36 changes: 18 additions & 18 deletions test/jest/__snapshots__/analyze.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
exports[`analyze in ./dsl matches snapshot 1`] = `
{
"stderr": "
~/Eask:7:18 Error: Multiple definition of \`package'
~/Eask:10:55 Error: Multiple definition of \`website-url'
~/Eask:12:16 Error: Multiple definition of \`keywords'
~/Eask:15:15 Warning: Warning regarding duplicate author name, name
~/Eask:18:17 Warning: Warning regarding duplicate license name, GPLv3
~/Eask:21:29 Error: Multiple definition of \`package-file'
~/Eask:23:35 Warning: Pkg-file seems to be missing \`check-pkg.el'
~/Eask:24:35 Error: Multiple definition of \`package-descriptor'
~/Eask:28:61 Error: Run-script with the same key name is not allowed: \`test\`
~/Eask:31:13 Error: Multiple definition of source \`gnu'
~/Eask:33:24 Error: Unknown package archive \`magic-archive'
~/Eask:35:15 Error: Invalid archive name \`local'
~/Eask:35:15 Error: Unknown package archive \`local'
~/Eask:38:20 Error: Define dependencies with the same name \`emacs'
~/Eask:41:19 Error: Define dependencies with the same name \`dash'
~/Eask:42:27 Error: Define dependencies with the same name \`dash' with different version
~/Eask:48:2 Error: Define dependencies with the same name \`f'
~/Eask:48:2 Error: Define dependencies with the same name \`f' with different version
~/Eask:9:18 Error: Multiple definition of \`package'
~/Eask:12:55 Error: Multiple definition of \`website-url'
~/Eask:14:16 Error: Multiple definition of \`keywords'
~/Eask:17:15 Warning: Warning regarding duplicate author name, name
~/Eask:20:17 Warning: Warning regarding duplicate license name, GPLv3
~/Eask:23:29 Error: Multiple definition of \`package-file'
~/Eask:25:35 Warning: Pkg-file seems to be missing \`check-pkg.el'
~/Eask:26:35 Error: Multiple definition of \`package-descriptor'
~/Eask:30:61 Error: Run-script with the same key name is not allowed: \`test\`
~/Eask:33:13 Error: Multiple definition of source \`gnu'
~/Eask:35:24 Error: Unknown package archive \`magic-archive'
~/Eask:37:15 Error: Invalid archive name \`local'
~/Eask:37:15 Error: Unknown package archive \`local'
~/Eask:40:20 Error: Define dependencies with the same name \`emacs'
~/Eask:43:19 Error: Define dependencies with the same name \`dash'
~/Eask:44:27 Error: Define dependencies with the same name \`dash' with different version
~/Eask:50:2 Error: Define dependencies with the same name \`f'
~/Eask:50:2 Error: Define dependencies with the same name \`f' with different version
",
"stdout": "",
}
Expand Down
2 changes: 2 additions & 0 deletions test/jest/buttercup/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "buttercup"
"0.0.1"
"Test project for command `buttercup'")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/docker/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "mini.pkg.1"
"0.0.1"
"Minimal test package")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/dsl/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

;;
Expand Down
2 changes: 2 additions & 0 deletions test/jest/ecukes/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "ecukes"
"0.0.1"
"Test project for command `ecukes'")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/ert-runner/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "ert-runner"
"0.0.1"
"Test project for command `ert-runner'")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/ert/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "ert"
"0.0.1"
"Test project for command `ert'")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/exec/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "exec"
"0.0.1"
"Test project for command exec")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/global/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "home"
"0.0.1"
"Minimal test for global config")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/install/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "mini.pkg.1"
"0.0.1"
"Minimal test package")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/install/foo-mode/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "foo"
"0.0.1"
"")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/install/foo-no-pkg/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "foo"
"0.0.1"
"")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/link/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "link"
"1.0.0"
"")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/link/link-fail/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "mini.pkg.1"
"0.0.1"
"Minimal test package")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/link/link-to/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "link-to"
"1.0.0"
"simple package to link")
Expand Down
2 changes: 1 addition & 1 deletion test/jest/local.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ describe("local", () => {
describe("Formatting", () => {
// installs elisp-autofmt
it("format elisp-autofmt", async () => {
if ((await emacsVersion()) >= "28.1") {
if ((await emacsVersion()) >= "29.1") {
await ctx.runEask("format elisp-autofmt");
}
});
Expand Down
2 changes: 2 additions & 0 deletions test/jest/local/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "mini.pkg.1"
"0.0.1"
"Minimal test package")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/metadata/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

;;
Expand Down
2 changes: 2 additions & 0 deletions test/jest/options/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "options"
"0.0.0"
"Test all options flag")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/outdated-upgrade/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "outdated-upgrade"
"0.0.1"
"Test project for command outdated and upgrade")
Expand Down
2 changes: 2 additions & 0 deletions test/jest/search/Eask
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;; -*- mode: eask; lexical-binding: t -*-

(package "search"
"0.0.1"
"Test project for command `search'")
Expand Down
Loading