From: Ralph Seichter <github@seichter.de>
Date: Wed, 28 Oct 2020 14:44:35 +0000 (+0100)
Subject: Rename version to version.txt
X-Git-Tag: 0.31.1~6
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=981d5a01689937ba45f3cd9dbdcdc65e6d264286

Rename version to version.txt

Building Notmuch on macOS is known to cause problems because the Notmuch
distribution archive contains two files named "version". These names
clash with the <version> header as defined in C++20. Therefore, the
existing naming will likely become a problem on other platforms as well,
once compilers adopt the new standard.

Signed-off-by: Ralph Seichter <github@seichter.de>
Amended-by: db s/keyword/header/ in commit message.
---

diff --git a/Makefile.global b/Makefile.global
index cd489ef2..8477468d 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -17,7 +17,7 @@ else
 DATE:=$(shell date +%F)
 endif
 
-VERSION:=$(shell cat ${srcdir}/version)
+VERSION:=$(shell cat ${srcdir}/version.txt)
 ELPA_VERSION:=$(subst ~,_,$(VERSION))
 ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
 ifeq ($(IS_GIT),yes)
diff --git a/Makefile.local b/Makefile.local
index c65cee7c..dde7981b 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -19,7 +19,7 @@ endif
 
 # Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
 # this file may already have been updated.
-version.stamp: $(srcdir)/version
+version.stamp: $(srcdir)/version.txt
 	echo $(VERSION) > $@
 
 $(TAR_FILE):
diff --git a/bindings/python-cffi/setup.py b/bindings/python-cffi/setup.py
index b0060835..cda52338 100644
--- a/bindings/python-cffi/setup.py
+++ b/bindings/python-cffi/setup.py
@@ -1,6 +1,6 @@
 import setuptools
 
-with open('version') as fp:
+with open('version.txt') as fp:
     VERSION = fp.read().strip()
 
 setuptools.setup(
diff --git a/bindings/python-cffi/version b/bindings/python-cffi/version
deleted file mode 100644
index 48b9990e..00000000
--- a/bindings/python-cffi/version
+++ /dev/null
@@ -1 +0,0 @@
-0.31
diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt
new file mode 100644
index 00000000..48b9990e
--- /dev/null
+++ b/bindings/python-cffi/version.txt
@@ -0,0 +1 @@
+0.31
diff --git a/doc/conf.py b/doc/conf.py
index 94e266af..11bed51d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -19,7 +19,7 @@ copyright = u'2009-2020, Carl Worth and many others'
 location = os.path.dirname(__file__)
 
 for pathdir in ['.', '..']:
-    version_file = os.path.join(location,pathdir,'version')
+    version_file = os.path.join(location,pathdir,'version.txt')
     if os.path.exists(version_file):
         with open(version_file,'r') as infile:
             version=infile.read().replace('\n','')
diff --git a/version b/version
deleted file mode 100644
index 48b9990e..00000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-0.31
diff --git a/version.txt b/version.txt
new file mode 100644
index 00000000..48b9990e
--- /dev/null
+++ b/version.txt
@@ -0,0 +1 @@
+0.31