Rename VERSION to VERSION.info to avoid conflicts with modern STL
On case-insensitive file systems (e.g., macOS), inclusion of the new standard <version> header resulted in unexpected inclusion of VERSION file. Change-Id: Ib08d8e9efa0f6ed0cee6843b818b773485dc73d8
This commit is contained in:
1 parent
b07d7a96da
commit
298c4355c3
2 files changed
+3
-3
No files matched your search
+1
-1
@@ -26,4 +26,4 @@ __pycache__/
|
|||||||
*.py[cod]
|
*.py[cod]
|
||||||
|
|
||||||
# Other
|
# Other
|
||||||
/VERSION
|
/VERSION.info
|
||||||
@@ -114,7 +114,7 @@ def version(ctx):
|
|||||||
except (OSError, subprocess.CalledProcessError):
|
except (OSError, subprocess.CalledProcessError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
versionFile = ctx.path.find_node('VERSION')
|
versionFile = ctx.path.find_node('VERSION.info')
|
||||||
if not gotVersionFromGit and versionFile is not None:
|
if not gotVersionFromGit and versionFile is not None:
|
||||||
try:
|
try:
|
||||||
Context.g_module.VERSION = versionFile.read()
|
Context.g_module.VERSION = versionFile.read()
|
||||||
@@ -131,7 +131,7 @@ def version(ctx):
|
|||||||
except EnvironmentError as e:
|
except EnvironmentError as e:
|
||||||
Logs.warn('%s exists but is not readable (%s)' % (versionFile, e.strerror))
|
Logs.warn('%s exists but is not readable (%s)' % (versionFile, e.strerror))
|
||||||
else:
|
else:
|
||||||
versionFile = ctx.path.make_node('VERSION')
|
versionFile = ctx.path.make_node('VERSION.info')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
versionFile.write(Context.g_module.VERSION)
|
versionFile.write(Context.g_module.VERSION)
|
||||||
|
|||||||
Reference in new issue
Block a user