diff --git a/ChangeLog b/ChangeLog index 0980cd35..76bba037 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ NEW IN WAF 1.9 preview 2 - Remove Task.dep_vars as it is never used (define Task.vars on instances if necessary) - Remove the unused attribute 'mac_resources', use 'mac_files' instead (see demos/mac_app) - Remove qt4 and kde4 from the default modules + - Refactored msvc.py - Task.sig_vars, Task.sig_explit_deps and Task.sig_implicit_deps return None - Use relative paths in apply_incpaths by default (and absolute ones when paths cross drives) - Modify Utils.run_once so that it accepts a list of *args diff --git a/TODO b/TODO index 954cbfe9..ae5ad7a9 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,5 @@ Waf 1.9 ------- -Refactor msvc.py Update the documentation diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py index bec8c392..ae28c3ba 100644 --- a/waflib/Tools/msvc.py +++ b/waflib/Tools/msvc.py @@ -327,11 +327,11 @@ def gather_msvc_detected_versions(): break index += 1 match = version_pattern.match(version) - if not match: - continue - else: + if match: versionnumber = float(match.group(1)) - detected_versions.append((versionnumber, version+vcvar, prefix+"\\"+version)) + else: + continue + detected_versions.append((versionnumber, version+vcvar, prefix+'\\'+version)) def fun(tup): return tup[0]