From: Tomi Ollila Date: Tue, 8 Apr 2014 01:05:24 +0000 (+0000) Subject: [PATCH v4 2/3] emacs: add notmuch-version.el.tmpl and create notmuch-version.el from it X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6a192c377d592585a3b537a2406f3eb749170c2;p=notmuch-archives.git [PATCH v4 2/3] emacs: add notmuch-version.el.tmpl and create notmuch-version.el from it --- diff --git a/b2/e023172d3fa29783f44a612e4c1b61b9d9561d b/b2/e023172d3fa29783f44a612e4c1b61b9d9561d new file mode 100644 index 000000000..ceb5c8ea5 --- /dev/null +++ b/b2/e023172d3fa29783f44a612e4c1b61b9d9561d @@ -0,0 +1,145 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 15239431FBC + for ; Mon, 7 Apr 2014 11:05:24 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.07 +X-Spam-Level: ** +X-Spam-Status: No, score=2.07 tagged_above=-999 required=5 + tests=[DATE_IN_PAST_96_XX=2.07] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id mJOWGUD3Osfy for ; + Mon, 7 Apr 2014 11:05:14 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 8254F431FB6 + for ; Mon, 7 Apr 2014 11:05:14 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 7D6741000E3; Mon, 7 Apr 2014 21:05:07 +0300 (EEST) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v4 2/3] emacs: add notmuch-version.el.tmpl and create + notmuch-version.el from it +Message-Id: <1395261431-24668-2b-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <1395261431-24668-1-git-send-email-tomi.ollila@iki.fi> +References: <1395261431-24668-1-git-send-email-tomi.ollila@iki.fi> +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Date: Mon, 07 Apr 2014 18:05:24 -0000 +X-Original-Date: Wed, 19 Mar 2014 22:37:10 +0200 +X-List-Received-Date: Mon, 07 Apr 2014 18:05:24 -0000 + +The notmuch cli program and emacs lisp versions may differ (especially +in remote usage). It helps to resolve problems if we can determine +the versions of notmuch cli and notmuch emacs mua separately. + +The build process now creates notmuch-version.el from template file +by filling the version info to notmuch-emacs-version variable. +--- + +Alternative to id:1395261431-24668-2-git-send-email-tomi.ollila@iki.fi +only change being in notmuch-emacs-version docstring. + + emacs/.gitignore | 1 + + emacs/Makefile.local | 11 +++++++++-- + emacs/notmuch-version.el.tmpl | 23 +++++++++++++++++++++++ + emacs/notmuch.el | 4 ++++ + 4 files changed, 37 insertions(+), 2 deletions(-) + create mode 100644 emacs/notmuch-version.el.tmpl + +diff --git a/emacs/.gitignore b/emacs/.gitignore +index 5421301..9fa1c44 100644 +--- a/emacs/.gitignore ++++ b/emacs/.gitignore +@@ -1,2 +1,3 @@ + .eldeps* + *.elc ++notmuch-version.el +diff --git a/emacs/Makefile.local b/emacs/Makefile.local +index 6a39b32..ca039e5 100644 +--- a/emacs/Makefile.local ++++ b/emacs/Makefile.local +@@ -17,7 +17,14 @@ emacs_sources := \ + $(dir)/notmuch-crypto.el \ + $(dir)/notmuch-tag.el \ + $(dir)/coolj.el \ +- $(dir)/notmuch-print.el ++ $(dir)/notmuch-print.el \ ++ $(dir)/notmuch-version.el ++ ++$(dir)/notmuch-version.el: $(dir)/Makefile.local version.stamp ++$(dir)/notmuch-version.el: $(dir)/notmuch-version.el.tmpl ++ @sed -e 's/%AG%/Generated file (from $( $@ ++ + + emacs_images := \ + $(srcdir)/$(dir)/notmuch-logo.png +@@ -71,4 +78,4 @@ endif + mkdir -p "$(DESTDIR)$(emacsetcdir)" + install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" + +-CLEAN := $(CLEAN) $(emacs_bytecode) ++CLEAN := $(CLEAN) $(emacs_bytecode) $(dir)/notmuch-version.el +diff --git a/emacs/notmuch-version.el.tmpl b/emacs/notmuch-version.el.tmpl +new file mode 100644 +index 0000000..6cf367b +--- /dev/null ++++ b/emacs/notmuch-version.el.tmpl +@@ -0,0 +1,23 @@ ++;; -*- emacs-lisp -*- ++;; ++;; %AG% ++;; ++;; This file is part of Notmuch. ++;; ++;; Notmuch is free software: you can redistribute it and/or modify it ++;; under the terms of the GNU General Public License as published by ++;; the Free Software Foundation, either version 3 of the License, or ++;; (at your option) any later version. ++;; ++;; Notmuch is distributed in the hope that it will be useful, but ++;; WITHOUT ANY WARRANTY; without even the implied warranty of ++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++;; General Public License for more details. ++;; ++;; You should have received a copy of the GNU General Public License ++;; along with Notmuch. If not, see . ++ ++(defconst notmuch-emacs-version %VERSION% ++ "Version of Notmuch Emacs MUA.") ++ ++(provide 'notmuch-version) +diff --git a/emacs/notmuch.el b/emacs/notmuch.el +index 0471750..b7dd944 100644 +--- a/emacs/notmuch.el ++++ b/emacs/notmuch.el +@@ -61,6 +61,10 @@ + (require 'notmuch-message) + (require 'notmuch-parser) + ++(unless (require 'notmuch-version nil t) ++ (defconst notmuch-emacs-version "unknown" ++ "Placeholder variable when notmuch-version.el[c] is not available.")) ++ + (defcustom notmuch-search-result-format + `(("date" . "%12s ") + ("count" . "%-7s ") +-- +1.8.0 +