From: David Bremner <david@tethera.net>
Date: Sun, 9 Mar 2014 12:57:00 +0000 (+2100)
Subject: [Patch v3 4/4] doc: automatically read version from file
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ddce2ef57945bfc8e418cc1f6a0605b4935e551;p=notmuch-archives.git

[Patch v3 4/4] doc: automatically read version from file
---

diff --git a/c2/bb394e8d45a40ba7858d88b2f5a8d7e76fba77 b/c2/bb394e8d45a40ba7858d88b2f5a8d7e76fba77
new file mode 100644
index 000000000..cb9010de3
--- /dev/null
+++ b/c2/bb394e8d45a40ba7858d88b2f5a8d7e76fba77
@@ -0,0 +1,80 @@
+Return-Path: <bremner@tethera.net>
+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 7B5A7431FC7
+	for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 05:57:25 -0700 (PDT)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	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 mcLKAUyJonm5 for <notmuch@notmuchmail.org>;
+	Sun,  9 Mar 2014 05:57:20 -0700 (PDT)
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
+	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id B0D7A431FBF
+	for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 05:57:19 -0700 (PDT)
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
+	(envelope-from <bremner@tethera.net>)
+	id 1WMdI7-0003qO-Ax; Sun, 09 Mar 2014 09:57:19 -0300
+Received: (nullmailer pid 8489 invoked by uid 1000); Sun, 09 Mar 2014
+	12:57:08 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [Patch v3 4/4] doc: automatically read version from file
+Date: Sun,  9 Mar 2014 09:57:00 -0300
+Message-Id: <1394369820-8319-5-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 1.8.5.3
+In-Reply-To: <1394369820-8319-1-git-send-email-david@tethera.net>
+References: <1394369820-8319-1-git-send-email-david@tethera.net>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sun, 09 Mar 2014 12:57:25 -0000
+
+This avoids having to recreate the update-man-versions rule
+---
+ doc/conf.py | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 6c2806d..a926fe4 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -14,10 +14,16 @@ master_doc = 'index'
+ project = u'notmuch'
+ copyright = u'2014, Carl Worth and many others'
+ 
+-# The short X.Y version.
+-version = '0.17'
++location = os.path.dirname(__file__)
++
++for pathdir in ['.', '..']:
++    version_file = os.path.join(location,pathdir,'version')
++    if os.path.exists(version_file):
++        with open(version_file,'r') as infile:
++            version=infile.read().replace('\n','')
++
+ # The full version, including alpha/beta/rc tags.
+-release = '0.17'
++release = version
+ 
+ # List of patterns, relative to source directory, that match files and
+ # directories to ignore when looking for source files.
+-- 
+1.8.5.3
+