mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
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.
This commit is contained in:
parent
582e919e27
commit
981d5a0168
6 changed files with 4 additions and 4 deletions
|
@ -17,7 +17,7 @@ else
|
||||||
DATE:=$(shell date +%F)
|
DATE:=$(shell date +%F)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
VERSION:=$(shell cat ${srcdir}/version)
|
VERSION:=$(shell cat ${srcdir}/version.txt)
|
||||||
ELPA_VERSION:=$(subst ~,_,$(VERSION))
|
ELPA_VERSION:=$(subst ~,_,$(VERSION))
|
||||||
ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
|
ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
|
||||||
ifeq ($(IS_GIT),yes)
|
ifeq ($(IS_GIT),yes)
|
||||||
|
|
|
@ -19,7 +19,7 @@ endif
|
||||||
|
|
||||||
# Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
|
# Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
|
||||||
# this file may already have been updated.
|
# this file may already have been updated.
|
||||||
version.stamp: $(srcdir)/version
|
version.stamp: $(srcdir)/version.txt
|
||||||
echo $(VERSION) > $@
|
echo $(VERSION) > $@
|
||||||
|
|
||||||
$(TAR_FILE):
|
$(TAR_FILE):
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
with open('version') as fp:
|
with open('version.txt') as fp:
|
||||||
VERSION = fp.read().strip()
|
VERSION = fp.read().strip()
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
|
|
|
@ -19,7 +19,7 @@ copyright = u'2009-2020, Carl Worth and many others'
|
||||||
location = os.path.dirname(__file__)
|
location = os.path.dirname(__file__)
|
||||||
|
|
||||||
for pathdir in ['.', '..']:
|
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):
|
if os.path.exists(version_file):
|
||||||
with open(version_file,'r') as infile:
|
with open(version_file,'r') as infile:
|
||||||
version=infile.read().replace('\n','')
|
version=infile.read().replace('\n','')
|
||||||
|
|
Loading…
Reference in a new issue