gn: Make WDK_DIR environment variable optional for VS professional users

build/vs_toolchain.py

 # Copyright 2014 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.
 
 import json
 import os
 import pipes
 import shutil
 import subprocess
 import sys
@@ skipping 146 matching lines @@
       ] + _GetDesiredVsToolchainHashes()
     subprocess.check_call(get_toolchain_args)
 
   return 0
 
 
 def GetToolchainDir():
   """Gets location information about the current toolchain (must have been
   previously updated by 'update'). This is used for the GN build."""
   SetEnvironmentAndGetRuntimeDllDirs()
+  depot_tools_win_toolchain = \
+      bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1')))
+  is_express = os.environ['GYP_MSVS_VERSION'][-1:] == "e"

[scottmg, 2014/09/15 23:22:02]

nit; just [-1] seems fine since you're comparing against "e"
nit; "e" -> 'e'

+  if not (depot_tools_win_toolchain or is_express or 'WDK_DIR' in os.environ):
+    os.environ['WDK_DIR'] = ""

[scottmg, 2014/09/15 23:22:02]

nit; "" -> ''

+
   print '''vs_path = "%s"
 sdk_path = "%s"
 vs_version = "%s"
 wdk_dir = "%s"
 ''' % (
       os.environ['GYP_MSVS_OVERRIDE_PATH'],
       os.environ['WINDOWSSDKDIR'],
       os.environ['GYP_MSVS_VERSION'],
       os.environ['WDK_DIR'])

[scottmg, 2014/09/15 23:22:02]

OK, based on explanation, instead just do

os.environ.get('WDK_DIR', '')

here then?

[ckocagil, 2014/09/15 23:35:44]

I tried not to relax the checks here. This would make GetToolchainDir print an
empty string instead of throwing a KeyError when an Express user forgets to set
WDK_DIR. Does this sound good?

[scottmg, 2014/09/15 23:45:29]

I'd rather not have the extra code, but thanks for being careful.

Express isn't really supported anyway (not tested anywhere) so.. meh. sigh.

[ckocagil, 2014/09/15 23:51:16]

Done, we use os.environ.get now.

 
 
 def main():
   if not sys.platform.startswith(('win32', 'cygwin')):
     return 0
   commands = {
       'update': Update,
       'get_toolchain_dir': GetToolchainDir,
       # TODO(scottmg): Add copy_dlls for GN builds (gyp_chromium calls
       # CopyVsRuntimeDlls via import, currently).
   }
   if len(sys.argv) < 2 or sys.argv[1] not in commands:
     print >>sys.stderr, 'Expected one of: %s' % ', '.join(commands)
     return 1
   return commands[sys.argv[1]]()
 
 
 if __name__ == '__main__':
   sys.exit(main())