From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kqM1FuSDmV+qOAAA0tVLHw (envelope-from ) for ; Wed, 28 Oct 2020 14:44:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yLO9EeSDmV9mdQAA1q6Kng (envelope-from ) for ; Wed, 28 Oct 2020 14:44:52 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3D3CC940222 for ; Wed, 28 Oct 2020 14:44:50 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8CE68270F2; Wed, 28 Oct 2020 10:44:42 -0400 (EDT) Received: from wedjat.horus-it.com (wedjat.horus-it.com [IPv6:2a01:4f9:2a:2e8d::c0de]) by mail.notmuchmail.org (Postfix) with ESMTPS id F1F58270EA for ; Wed, 28 Oct 2020 10:44:39 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by wedjat.horus-it.com (Postfix) with ESMTP id 010E1A600D2F; Wed, 28 Oct 2020 15:44:36 +0100 (CET) X-Virus-Scanned: at horus-it.com From: ralph@ml.seichter.de To: notmuch@notmuchmail.org Subject: [PATCH] Rename version to version.txt Date: Wed, 28 Oct 2020 15:44:35 +0100 Message-Id: <20201028144435.14718-1-ralph@ml.seichter.de> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <87v9euojlp.fsf@wedjat.horus-it.com> References: <87v9euojlp.fsf@wedjat.horus-it.com> MIME-Version: 1.0 Message-ID-Hash: IFF7FH2WFS2M2P5VH2JWKV6BPFXKNONW X-Message-ID-Hash: IFF7FH2WFS2M2P5VH2JWKV6BPFXKNONW X-MailFrom: ralph@ml.seichter.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Ralph Seichter X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=ml.seichter.de (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 0.13 X-TUID: bH7wmsgv7yAe From: Ralph Seichter Building Notmuch on macOS is known to cause problems because the Notmuch distribution archive contains two files named "version". These names clash with the keyword 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 --- Makefile.global | 2 +- Makefile.local | 2 +- bindings/python-cffi/setup.py | 2 +- bindings/python-cffi/{version => version.txt} | 0 doc/conf.py | 2 +- version => version.txt | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename bindings/python-cffi/{version => version.txt} (100%) rename version => version.txt (100%) 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.txt similarity index 100% rename from bindings/python-cffi/version rename to bindings/python-cffi/version.txt 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.txt similarity index 100% rename from version rename to version.txt -- 2.24.3 (Apple Git-128)