]> git.notmuchmail.org Git - notmuch/commitdiff
Rename version to version.txt
authorRalph Seichter <github@seichter.de>
Wed, 28 Oct 2020 14:44:35 +0000 (15:44 +0100)
committerDavid Bremner <david@tethera.net>
Fri, 30 Oct 2020 19:14:24 +0000 (16:14 -0300)
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.
Makefile.global
Makefile.local
bindings/python-cffi/setup.py
bindings/python-cffi/version [deleted file]
bindings/python-cffi/version.txt [new file with mode: 0644]
doc/conf.py
version [deleted file]
version.txt [new file with mode: 0644]

index cd489ef2ee4d916ecd4124b3405eaaaa589d0e34..8477468dcdac8e703d49e0adb7f0eaac4c8b40ff 100644 (file)
@@ -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)
index c65cee7cb15c1ae72ddaeca34060f07a86429ba1..dde7981ba3df65133d47fe170a591fe8b28e791f 100644 (file)
@@ -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):
index b00608358f45e160e468f7f168d7f694f941f1d6..cda5233840bc0e0183181b8464c750ed3dd75866 100644 (file)
@@ -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 (file)
index 48b9990..0000000
+++ /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 (file)
index 0000000..48b9990
--- /dev/null
@@ -0,0 +1 @@
+0.31
index 94e266af5878c8590802780f23e8e8c99a42b81e..11bed51d7596100ac2ca381792661e8378bbc5dd 100644 (file)
@@ -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 (file)
index 48b9990..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-0.31
diff --git a/version.txt b/version.txt
new file mode 100644 (file)
index 0000000..48b9990
--- /dev/null
@@ -0,0 +1 @@
+0.31