Copy the Universal CRT files to the output dirs

build/vs_toolchain.py

 #!/usr/bin/env python
 # 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 glob
 import json
 import os
 import pipes
 import shutil
 import subprocess
 import sys
 
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
@@ skipping 128 matching lines @@
   GYP_MSVS_VERSION."""
   vs_version = GetVisualStudioVersion()
   if vs_version == '2013':
     return '120'
   elif vs_version == '2015':
     return '140'
   else:
     raise ValueError('Unexpected GYP_MSVS_VERSION')
 
 
-def _CopyRuntimeImpl(target, source):
+def _CopyRuntimeImpl(target, source, verbose = True):

[M-A Ruel, 2016/02/08 20:19:14]

verbose=True

[brucedawson, 2016/02/08 21:00:31]

Done.

   """Copy |source| to |target| if it doesn't already exist or if it
   needs to be updated.
   """
   if (os.path.isdir(os.path.dirname(target)) and
       (not os.path.isfile(target) or
       os.stat(target).st_mtime != os.stat(source).st_mtime)):
-    print 'Copying %s to %s...' % (source, target)
+    if verbose:
+      print 'Copying %s to %s...' % (source, target)
     if os.path.exists(target):
       os.unlink(target)
     shutil.copy2(source, target)
 
 
 def _CopyRuntime2013(target_dir, source_dir, dll_pattern):
   """Copy both the msvcr and msvcp runtime DLLs, only if the target doesn't
   exist, but the target directory does exist."""
   for file_part in ('p', 'r'):
     dll = dll_pattern % file_part
@@ skipping 11 matching lines @@
     source = os.path.join(source_dir, dll)
     _CopyRuntimeImpl(target, source)
 
 
 def _CopyRuntime(target_dir, source_dir, target_cpu, debug):
   """Copy the VS runtime DLLs, only if the target doesn't exist, but the target
   directory does exist. Handles VS 2013 and VS 2015."""
   suffix = "d.dll" if debug else ".dll"
   if GetVisualStudioVersion() == '2015':
     _CopyRuntime2015(target_dir, source_dir, '%s140' + suffix)
-    if debug:
-      _CopyRuntimeImpl(os.path.join(target_dir, 'ucrtbased.dll'),
-                       os.path.join(source_dir, 'ucrtbased.dll'))
+    ucrt_src_dir = os.path.join(source_dir, "api-ms-win-*.dll")

[M-A Ruel, 2016/02/08 20:19:14]

single quote

[brucedawson, 2016/02/08 21:00:31]

Done.

+    print 'Copying %s to %s...' % (ucrt_src_dir, target_dir)
+    for ucrt_src_file in glob.glob(ucrt_src_dir):
+      file_part = os.path.split(ucrt_src_file)[1]

[M-A Ruel, 2016/02/08 20:19:14]

os.path.basename()

[brucedawson, 2016/02/08 21:00:31]

Much better. Done.

+      ucrt_dst_file = os.path.join(target_dir, file_part)
+      _CopyRuntimeImpl(ucrt_dst_file, ucrt_src_file, verbose = False)

[M-A Ruel, 2016/02/08 20:19:14]

remove "verbose = "

[brucedawson, 2016/02/08 21:00:31]

Done.

+    _CopyRuntimeImpl(os.path.join(target_dir, 'ucrtbase' + suffix),
+                      os.path.join(source_dir, 'ucrtbase' + suffix))
   else:
     _CopyRuntime2013(target_dir, source_dir, 'msvc%s120' + suffix)
 
   # Copy the PGO runtime library to the release directories.
   if not debug and os.environ.get('GYP_MSVS_OVERRIDE_PATH'):
     pgo_x86_runtime_dir = os.path.join(os.environ.get('GYP_MSVS_OVERRIDE_PATH'),
                                         'VC', 'bin')
     pgo_x64_runtime_dir = os.path.join(pgo_x86_runtime_dir, 'amd64')
     pgo_runtime_dll = 'pgort' + _VersionNumber() + '.dll'
     if target_cpu == "x86":
@@ skipping 147 matching lines @@
       'copy_dlls': CopyDlls,
   }
   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]](*sys.argv[2:])
 
 
 if __name__ == '__main__':
   sys.exit(main())