Handle case where WINDOWSSDKDIR is not set

build/win/copy_cdb_to_output.py

 #!/usr/bin/env python
 # Copyright 2016 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 hashlib
 import os
 import shutil
 import sys
 
@@ skipping 35 matching lines @@
 def _CopyCDBToOutput(output_dir, target_arch):
   """Copies the Windows debugging executable cdb.exe to the output
   directory, which is created if it does not exist. The output
   directory, and target architecture that should be copied, are
   passed. Supported values for the target architecture are the GYP
   values "ia32" and "x64" and the GN values "x86" and "x64".
   """
   if not os.path.isdir(output_dir):
     os.makedirs(output_dir)
   vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
-  win_sdk_dir = os.path.normpath(os.environ['WINDOWSSDKDIR'])
+  # If WINDOWSSDKDIR is not set use the default SDK path. This will be the case
+  # when DEPOT_TOOLS_WIN_TOOLCHAIN=0 and vcvarsall.bat has not been run.
+  if not 'WINDOWSSDKDIR' in os.environ:
+    win_sdk_dir = 'C:\\Program Files (x86)\\Windows Kits\\10'
+  else:
+    win_sdk_dir = os.path.normpath(os.environ['WINDOWSSDKDIR'])

[scottmg, 2016/06/01 21:07:35]

replace the if/else with os.path.normpath(os.environ.get('WINDOWSSDKDIR',
'C:\\Program Files...'))

[brucedawson, 2016/06/01 22:24:07]

Done.

   if target_arch == 'ia32' or target_arch == 'x86':
     src_arch = 'x86'
   elif target_arch == 'x64':
     src_arch = 'x64'
   else:
     print 'copy_cdb_to_output.py: unknown target_arch %s' % target_arch
     sys.exit(1)
   # We need to copy multiple files, so cache the computed source directory.
   src_dir = os.path.join(win_sdk_dir, 'Debuggers', src_arch)
   # Note that the outputs from the "copy_cdb_to_output" target need to
   # be kept in sync with this list.
   _CopyImpl('cdb.exe', output_dir, src_dir)
   _CopyImpl('dbgeng.dll', output_dir, src_dir)
   _CopyImpl('dbghelp.dll', output_dir, src_dir)
   _CopyImpl('dbgmodel.dll', output_dir, src_dir)
   return 0
 
 
 def main():
   if len(sys.argv) < 2:
     print >>sys.stderr, 'Usage: copy_cdb_to_output.py <output_dir> ' + \
         '<target_arch>'
     return 1
   return _CopyCDBToOutput(sys.argv[1], sys.argv[2])
 
 
 if __name__ == '__main__':
   sys.exit(main())