summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authormlimber <mlimber@gmail.com>2016-07-06 18:55:07 (GMT)
committermlimber <mlimber@gmail.com>2016-07-06 18:55:07 (GMT)
commit1fbc1b90d4ec3eac950865c4dd815f3cc71f70cf (patch)
treecc762a241ae16d24924b86be20a560a851900433 /src/engine
parent1d93e3871ee6858e3bc362aa4e9822c29aadb1a3 (diff)
downloadSCons-1fbc1b90d4ec3eac950865c4dd815f3cc71f70cf.zip
SCons-1fbc1b90d4ec3eac950865c4dd815f3cc71f70cf.tar.gz
SCons-1fbc1b90d4ec3eac950865c4dd815f3cc71f70cf.tar.bz2
Fix float conversion for Express editions where the version number is reported as "10.0Exp", which fails the float conversion with:
Error : ValueError: invalid literal for float(): 10.0Exp.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Tool/msvs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 6df4928..6e91909 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1844,7 +1844,10 @@ def projectEmitter(target, source, env):
targetlist = targetlist + t
# Beginning with Visual Studio 2010 for each project file (.vcxproj) we have additional file (.vcxproj.filters)
- if float(env['MSVS_VERSION']) >= 10.0:
+ version_num = 6.0
+ if 'MSVS_VERSION' in env:
+ version_num, suite = msvs_parse_version(env['MSVS_VERSION'])
+ if version_num >= 10.0:
targetlist.append(targetlist[0] + '.filters')
return (targetlist, sourcelist)