diff options
| author | David Bremner <david@tethera.net> | 2016-11-11 07:46:50 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-11-16 21:45:56 -0400 |
| commit | 297d27e9f9f0341e40bfd9442dde5fdd1ad969ff (patch) | |
| tree | dd30f09f0b5e8aa57f6b313df9b839475d346bbc | |
| parent | a3e712fa86a1f6df02a8be9f620f33ed9189069d (diff) | |
emacs: generate notmuch-pkg.el
This file contains metadata for the built in (as of emacs 24) packaging
system.
| -rw-r--r-- | Makefile.local | 3 | ||||
| -rw-r--r-- | emacs/.gitignore | 1 | ||||
| -rw-r--r-- | emacs/Makefile.local | 8 | ||||
| -rw-r--r-- | emacs/notmuch-pkg.el.tmpl | 6 |
4 files changed, 17 insertions, 1 deletions
diff --git a/Makefile.local b/Makefile.local index d1b0585f..0a122ab0 100644 --- a/Makefile.local +++ b/Makefile.local @@ -19,9 +19,12 @@ DATE:=$(shell date +%F) endif VERSION:=$(shell cat ${srcdir}/version) +ELPA_VERSION:=$(subst ~,_,$(VERSION)) ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),) ifeq ($(IS_GIT),yes) VERSION:=$(shell git --git-dir=${srcdir}/.git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/) +# drop the ~g$sha1 part +ELPA_VERSION:=$(word 1,$(subst ~, ,$(VERSION))) # Write the file 'version.stamp' in case its contents differ from $(VERSION) FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs) ifneq ($(FILE_VERSION),$(VERSION)) diff --git a/emacs/.gitignore b/emacs/.gitignore index 9fa1c44e..8e15eed7 100644 --- a/emacs/.gitignore +++ b/emacs/.gitignore @@ -1,3 +1,4 @@ .eldeps* *.elc notmuch-version.el +notmuch-pkg.el diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 558e68f2..dfa7c1f1 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -28,6 +28,12 @@ $(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl @sed -e 's/%AG%/Generated file (from $(<F)) -- do not edit!/' \ -e 's/%VERSION%/"$(VERSION)"/' $< > $@ +$(dir)/notmuch-pkg.el: $(srcdir)/$(dir)/notmuch-pkg.el.tmpl + @sed -e 's/%AG%/Generated file (from $(<F)) -- do not edit!/' \ + -e 's/%VERSION%/"$(ELPA_VERSION)"/' $< > $@ + +all: $(dir)/notmuch-pkg.el +install-emacs: $(dir)/notmuch-pkg.el emacs_images := \ $(srcdir)/$(dir)/notmuch-logo.png @@ -85,4 +91,4 @@ endif mkdir -p "$(DESTDIR)$(emacsetcdir)" install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" -CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el +CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el $(dir)/notmuch-pkg.el diff --git a/emacs/notmuch-pkg.el.tmpl b/emacs/notmuch-pkg.el.tmpl new file mode 100644 index 00000000..de97baac --- /dev/null +++ b/emacs/notmuch-pkg.el.tmpl @@ -0,0 +1,6 @@ +;; %AG% +(define-package + "notmuch" + %VERSION% + "Emacs based front-end (MUA) for notmuch" + nil) |