Support Express for 2013 automatic toolchain

build/gyp_chromium

 #!/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 script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
@@ skipping 379 matching lines @@
       not 'OS=ios' in os.environ.get('GYP_DEFINES', []):
     os.environ['GYP_GENERATORS'] = 'ninja'
 
   # If using ninja on windows, and the automatic toolchain has been installed
   # by depot_tools, then use it.
   if (sys.platform in ('win32', 'cygwin') and
       os.environ.get('GYP_GENERATORS') == 'ninja'):
     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
     toolchain = os.path.normpath(os.path.join(
         depot_tools_path, 'win_toolchain', 'vs2013_files'))
-    if os.path.isdir(toolchain):
+    version_file = os.path.join(toolchain, '.version')
+    if os.path.isdir(toolchain) and os.path.isfile(version_file):
       os.environ['GYP_MSVS_OVERRIDE_PATH'] = toolchain
-      os.environ['GYP_MSVS_VERSION'] = '2013'
+      with open(version_file, 'r') as f:
+        version_is_pro = f.read().strip() == 'pro'
+      os.environ['GYP_MSVS_VERSION'] = '2013' if version_is_pro else '2013e'
       # We need to make sure windows_sdk_path is set to the automated
       # toolchain values in GYP_DEFINES, but don't want to override any other
       # values there.
       gyp_defines_dict = gyp.NameValueListToDict(gyp.ShlexEnv('GYP_DEFINES'))
       win8sdk = os.path.join(toolchain, 'win8sdk')
+      wdk = os.path.join(toolchain, 'wdk')
       gyp_defines_dict['windows_sdk_path'] = win8sdk
       os.environ['WINDOWSSDKDIR'] = win8sdk
+      os.environ['WDK_DIR'] = wdk
       os.environ['GYP_DEFINES'] = ' '.join('%s=%s' % (k, pipes.quote(str(v)))
           for k, v in gyp_defines_dict.iteritems())
       # Include the VS runtime in the PATH in case it's not machine-installed.
       runtime_path = ';'.join(os.path.normpath(os.path.join(toolchain, s))
                               for s in ('sys64', 'sys32'))
       os.environ['PATH'] = runtime_path + ';' + os.environ['PATH']
-      print('Using automatic toolchain in %s.' % toolchain)
+      print('Using automatic toolchain in %s (%s edition).' % (
+                toolchain, 'Pro' if version_is_pro else 'Express'))
 
   # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check
   # to enfore syntax checking.
   syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
   if syntax_check and int(syntax_check):
     args.append('--check')
 
   supplemental_includes = GetSupplementalFiles()
   if not RunGN(supplemental_includes):
     sys.exit(1)
   args.extend(
       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
 
   args.extend(['-D', 'gyp_output_dir=' + GetOutputDirectory()])
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))