From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id C1A876DE0C3A for ; Sat, 19 Nov 2016 10:14:09 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=-0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K7H3nsvhn5GK for ; Sat, 19 Nov 2016 10:14:09 -0800 (PST) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 35CD76DE0BBB for ; Sat, 19 Nov 2016 10:14:09 -0800 (PST) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1c89gg-0006Q2-Dk; Sat, 19 Nov 2016 12:44:26 -0500 Received: (nullmailer pid 32382 invoked by uid 1000); Sat, 19 Nov 2016 17:44:45 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/2] build/emacs: add target to create elpa package Date: Sat, 19 Nov 2016 13:44:29 -0400 Message-Id: <20161119174429.31642-3-david@tethera.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161119174429.31642-1-david@tethera.net> References: <20161119174429.31642-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Nov 2016 18:14:09 -0000 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 444e6bb..d8f335a 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 90a57cc..f163617 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 $(