From 1fbc1b90d4ec3eac950865c4dd815f3cc71f70cf Mon Sep 17 00:00:00 2001 From: mlimber Date: Wed, 6 Jul 2016 18:55:07 +0000 Subject: 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. --- src/engine/SCons/Tool/msvs.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) -- cgit v0.12 From 68626be4e6761d2b0835f402da3bb8ae54d80e07 Mon Sep 17 00:00:00 2001 From: mlimber Date: Wed, 6 Jul 2016 19:20:00 +0000 Subject: Updated for Visual Studio Express --- src/CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index db52cf0..dc3904c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -25,6 +25,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Added LoadableModule to the list of global functions (DefaultEnvironment builders). + From Matthew Limber: + - Fixed msvs.py for Visual Studio Express editions that would report + "Error : ValueError: invalid literal for float(): 10.0Exp". + RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 From Dirk Baechle: -- cgit v0.12 From 83e76a293df54101826975c78bbffbe5e8018304 Mon Sep 17 00:00:00 2001 From: mlimber Date: Wed, 6 Jul 2016 19:34:20 +0000 Subject: CHANGES.txt edited online with Bitbucket --- src/CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index dc3904c..0bac28f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -25,7 +25,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Added LoadableModule to the list of global functions (DefaultEnvironment builders). - From Matthew Limber: + From M. Limber: - Fixed msvs.py for Visual Studio Express editions that would report "Error : ValueError: invalid literal for float(): 10.0Exp". -- cgit v0.12