From 96ebd9b7c37c39a74b6733c9b38389859397c306 Mon Sep 17 00:00:00 2001 From: Alexander Afanasyev Date: Mon, 1 Jun 2020 19:16:52 -0400 Subject: [PATCH] Rename VERSION to VERSION.info to avoid conflicts with modern STL On case-insensitive file systems (e.g., macOS), inclusion of the new standard header resulted in unexpected inclusion of VERSION file. Change-Id: I84d6e37fd5f31666ced4b8b47816ff28dd911f17 --- .gitignore | 2 +- wscript | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b1d7223..6ff803e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,4 @@ __pycache__/ *.py[cod] # Other -/VERSION +/VERSION.info diff --git a/wscript b/wscript index 4e8b19e..2a83317 100644 --- a/wscript +++ b/wscript @@ -198,7 +198,7 @@ def version(ctx): except (OSError, subprocess.CalledProcessError): pass - versionFile = ctx.path.find_node('VERSION') + versionFile = ctx.path.find_node('VERSION.info') if not gotVersionFromGit and versionFile is not None: try: Context.g_module.VERSION = versionFile.read() @@ -215,7 +215,7 @@ def version(ctx): except EnvironmentError as e: Logs.warn('%s exists but is not readable (%s)' % (versionFile, e.strerror)) else: - versionFile = ctx.path.make_node('VERSION') + versionFile = ctx.path.make_node('VERSION.info') try: versionFile.write(Context.g_module.VERSION)