From 10f8c5d205d5398bb86809bf8e7958038ba3b6fe Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 19 Nov 2016 13:44:29 -0400 Subject: [PATCH] build/emacs: add target to create elpa package This package can be created without emacs, but will only be usable in versions of emacs supporting package.el --- Makefile.global | 2 ++ emacs/Makefile.local | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.global b/Makefile.global index 444e6bb4..d8f335af 100644 --- a/Makefile.global +++ b/Makefile.global @@ -23,6 +23,8 @@ 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))) +# convert git version to package.el friendly form +ELPA_VERSION:=$(subst +,snapshot,$(ELPA_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) diff --git a/emacs/Makefile.local b/emacs/Makefile.local index 90a57cca..f1636177 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -24,6 +24,8 @@ emacs_sources := \ $(dir)/notmuch-company.el \ $(dir)/notmuch-draft.el +elpa_sources := ${emacs_sources} $(dir)/notmuch-pkg.el + $(dir)/notmuch-version.el: $(dir)/Makefile.local version.stamp $(dir)/notmuch-version.el: $(srcdir)/$(dir)/notmuch-version.el.tmpl @sed -e 's/%AG%/Generated file (from $(