Fix Landmines MSVS Version Checking

build/landmines.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This file holds a list of reasons why a particular build needs to be clobbered
 (or a list of 'landmines').
 
 This script runs every build as a hook. If it detects that the build should
@@ skipping 51 matching lines @@
 
 @memoize()
 def gyp_defines():
   """Parses and returns GYP_DEFINES env var as a dictionary."""
   return dict(arg.split('=', 1)
       for arg in shlex.split(os.environ.get('GYP_DEFINES', '')))
 
 @memoize()
 def gyp_msvs_version():
   val = os.environ.get('GYP_MSVS_VERSION', '')
-  return int(val) if val else None
+  return val if val else None

[iannucci, 2013/06/13 18:12:44]

Actually, you can just make this

return os.environ.get('GYP_MSVS_VERSION', None)

[robliao, 2013/06/13 18:27:31]

Done.

 
 @memoize()
 def distributor():
   """
   Returns a string which is the distributed build engine in use (if any).
   Possible values: 'goma', 'ib', ''
   """
   if 'goma' in gyp_defines():
     return 'goma'
   elif IsWindows():
@@ skipping 64 matching lines @@
     add('Need to clobber winja goma due to backend cwd cache fix.')
   if platform() == 'android':
     add('Clobber: Resources removed in r195014 require clobber.')
   if platform() == 'win' and builder() == 'ninja':
     add('Compile on cc_unittests fails due to symbols removed in r185063.')
   if platform() == 'linux' and builder() == 'ninja':
     add('Builders switching from make to ninja will clobber on this.')
   if platform() == 'mac':
     add('Switching from bundle to unbundled dylib (issue 14743002).')
   if (platform() == 'win' and builder() == 'ninja' and
-      gyp_msvs_version() == 2012 and
+      gyp_msvs_version() == '2012' and
       gyp_defines().get('target_arch') == 'x64' and
       gyp_defines().get('dcheck_always_on') == '1'):
     add("Switched win x64 trybots from VS2010 to VS2012.")
 
   return landmines
 
 
 def get_target_build_dir(build_tool, target, is_iphone=False):
   """
   Returns output directory absolute path dependent on build and targets.
@@ skipping 67 matching lines @@
   gyp_helper.apply_chromium_gyp_env()
 
   for target in ('Debug', 'Release', 'Debug_x64', 'Release_x64'):
     set_up_landmines(target)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())