summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-04-29 03:06:34 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-04-29 03:06:34 (GMT)
commit54352952b9cd900091d3bcc50a82028a36f184f1 (patch)
treec1689b4824e3437ebd129e432eeafc918a20c5cc /src/engine/SCons
parentfa5d94516ebe9e0f73049ed07db3d729f70e3d63 (diff)
downloadSCons-54352952b9cd900091d3bcc50a82028a36f184f1.zip
SCons-54352952b9cd900091d3bcc50a82028a36f184f1.tar.gz
SCons-54352952b9cd900091d3bcc50a82028a36f184f1.tar.bz2
[ci skip] minor reformatting
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Tool/msvs.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 376d814..e5c9bd0 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -67,6 +67,7 @@ def xmlify(s):
s = s.replace('\n', '&#x0A;')
return s
+
def processIncludes(includes, env, target, source):
"""
Process a CPPPATH list in includes, given the env, target and source.
@@ -76,16 +77,21 @@ def processIncludes(includes, env, target, source):
return [env.Dir(i).abspath for i in
SCons.PathList.PathList(includes).subst_path(env, target, source)]
+
def processFlags(flags, env):
- # If /std:c++XX is in flags then we need to ensure /Zc:__cplusplus is in
- # flags to tell intellisense to respect our specified standard
+ """
+ If /std:c++XX is in flags then we need to ensure /Zc:__cplusplus is in
+ flags to tell intellisense to respect our specified standard
+ """
if any(f.startswith('/std:c++') for f in flags) and \
not any(f == '/Zc:__cplusplus' for f in flags):
flags.append('/Zc:__cplusplus')
return [env.subst(f) for f in flags]
+
external_makefile_guid = '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}'
+
def _generateGUID(slnfile, name):
"""This generates a dummy GUID for the sln file to use. It is
based on the MD5 signatures of the sln filename plus the name of
@@ -101,8 +107,10 @@ def _generateGUID(slnfile, name):
solution = "{" + solution[:8] + "-" + solution[8:12] + "-" + solution[12:16] + "-" + solution[16:20] + "-" + solution[20:32] + "}"
return solution
+
version_re = re.compile(r'(\d+\.\d+)(.*)')
+
def msvs_parse_version(s):
"""
Split a Visual Studio version, which may in fact be something like