diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-08-12 14:20:55 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-08-12 14:20:55 (GMT) |
| commit | 6a1b06d97163ad7ec280c2a028fac33258677123 (patch) | |
| tree | 9f1b75f6b1e2409e7e8d1308ec747e0a6f6d7ec3 | |
| parent | 8bb44b6de01a456e4027f58af0bb7890b78142cb (diff) | |
| parent | f6ec68e2eb534bf8fff6f470b7e8facdde045b63 (diff) | |
| download | SCons-6a1b06d97163ad7ec280c2a028fac33258677123.zip SCons-6a1b06d97163ad7ec280c2a028fac33258677123.tar.gz SCons-6a1b06d97163ad7ec280c2a028fac33258677123.tar.bz2 | |
updated from upstream
| -rw-r--r-- | src/CHANGES.txt | 16 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvs.py | 5 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 13fba67..8c185c8 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,16 +6,20 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - From John Doe: - - - Whatever John Doe did. - From Daniel Holth: - Add basic support for PyPy (by deleting __slots__ from Node with a metaclass on PyPy); wrap most-used open() calls in 'with' statements to avoid too many open files. - Add __main__.py for `python -m SCons` in case it is on PYTHONPATH. + From Alexey Klimkin: + - Use memoization to optimize PATH evaluation across all dependencies per + node. (PR #345) + + From M. Limber: + - Fixed msvs.py for Visual Studio Express editions that would report + "Error : ValueError: invalid literal for float(): 10.0Exp". + From Paweł Tomulik: - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes (https://pairlist4.pair.net/pipermail/scons-users/2016-May/004893.html). @@ -25,10 +29,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Added LoadableModule to the list of global functions (DefaultEnvironment builders). - From Alexey Klimkin: - - Use memoization to optimize PATH evaluation across all dependencies per - node. (PR #345) - RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 From Dirk Baechle: 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) |