branch: scratch/evil
commit 81271842897c800d1b06f2b9c522d2624adca911
Author: Stefan Monnier <[email protected]>
Commit: Stefan Monnier <[email protected]>
evil-pkg.el: Remove file
This file is auto-generated from headers in `evil.el` anyway.
* evil.el: Synchronize metadata with what was in `evil-pkg.el`.
* .gitignore: Add `evil-pkg.el`.
* Makefile (VERSION): Fetch the info from `evil.el`.
(elpa-pkg.el): New rule to (re)generate the file.
(elpa): Use it.
---
.gitignore | 3 ++-
Makefile | 10 ++++++++--
evil-pkg.el | 7 -------
evil.el | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 02299d9b1b..ed3918e244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,8 @@
*.pg
*.tp
.depend
-evil-autoloads.el
+/evil-autoloads.el
+/evil-pkg.el
test-results.txt
typescript
diff --git a/Makefile b/Makefile
index 2144a921b1..fc8a1a6aa6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL = /bin/sh
EMACS ?= emacs
SED ?= sed
FILES = $(filter-out evil-test-helpers.el evil-tests.el evil-pkg.el,$(wildcard
evil*.el))
-VERSION := $(shell $(SED) -ne '/define-package/,$$p' evil-pkg.el | $(SED) -ne
'/^\s*"[[:digit:]]\+\(\.[[:digit:]]\+\)*"\s*$$/ s/^.*"\(.*\)".*$$/\1/p')
+VERSION := $(shell $(SED) -ne 's/;; Version: *\(.*\)/\1/p' evil.el)
ELPAPKG = evil-$(VERSION)
PROFILER =
DOC = doc
@@ -102,8 +102,14 @@ indent: clean
(replace-match \"\\n\\n\")) \
(when (buffer-modified-p) (save-buffer 0))))"
+evil-pkg.el: evil.el
+ $(EMACS) --batch -l package evil.el \
+ --eval "(package-generate-description-file \
+ (package-buffer-info) \
+ \"$@\")"
+
# Create an ELPA package.
-elpa:
+elpa: evil-pkg.el
@echo "Creating ELPA package $(ELPAPKG).tar"
@rm -rf ${ELPAPKG}
@mkdir ${ELPAPKG}
diff --git a/evil-pkg.el b/evil-pkg.el
deleted file mode 100644
index 0ab78cb335..0000000000
--- a/evil-pkg.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(define-package
- "evil"
- "1.15.0"
- "Extensible Vi layer for Emacs."
- '((emacs "24.1")
- (goto-chg "1.6")
- (cl-lib "0.5")))
diff --git a/evil.el b/evil.el
index e5d7e45991..009b25f9eb 100644
--- a/evil.el
+++ b/evil.el
@@ -1,4 +1,4 @@
-;;; evil.el --- Extensible vi layer -*- lexical-binding: t; -*-
+;;; evil.el --- Extensible Vi layer for Emacs -*- lexical-binding: t; -*-
;; The following list of authors was kept up to date until the beginning of
;; 2017, when evil moved under new maintainers. For authors since then, please
