Rework win_toolchains a bit and copy the vs runtime DLLs as needed.

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 55 matching lines @@
 def CopyVsRuntimeDlls(output_dir, runtime_dirs):
   """Copies the VS runtime DLLs from the given |runtime_dirs| to the output
   directory so that even if not system-installed, built binaries are likely to
   be able to run.
 
   This needs to be run after gyp has been run so that the expected target
   output directories are already created.
   """
   assert sys.platform.startswith(('win32', 'cygwin'))
 
-  def copy_runtime_impl(target, source):
-    """Copy |source| to |target| if it doesn't already exist or if it need 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 os.path.exists(target):
-        os.unlink(target)
-      shutil.copy2(source, target)
-
-  def copy_runtime(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 which in ('p', 'r'):
-      dll = dll_pattern % which
-      target = os.path.join(target_dir, dll)
-      source = os.path.join(source_dir, dll)
-      copy_runtime_impl(target, source)
-
   x86, x64 = runtime_dirs
   out_debug = os.path.join(output_dir, 'Debug')
   out_debug_nacl64 = os.path.join(output_dir, 'Debug', 'x64')
   out_release = os.path.join(output_dir, 'Release')
   out_release_nacl64 = os.path.join(output_dir, 'Release', 'x64')
   out_debug_x64 = os.path.join(output_dir, 'Debug_x64')
   out_release_x64 = os.path.join(output_dir, 'Release_x64')
 
   if os.path.exists(out_debug) and not os.path.exists(out_debug_nacl64):
     os.makedirs(out_debug_nacl64)
   if os.path.exists(out_release) and not os.path.exists(out_release_nacl64):
     os.makedirs(out_release_nacl64)
-  copy_runtime(out_debug,          x86, 'msvc%s120d.dll')
-  copy_runtime(out_release,        x86, 'msvc%s120.dll')
-  copy_runtime(out_debug_x64,      x64, 'msvc%s120d.dll')
-  copy_runtime(out_release_x64,    x64, 'msvc%s120.dll')
-  copy_runtime(out_debug_nacl64,   x64, 'msvc%s120d.dll')
-  copy_runtime(out_release_nacl64, x64, 'msvc%s120.dll')
+  _CopyRuntime(out_debug,          x86, 'msvc%s120d.dll')
+  _CopyRuntime(out_release,        x86, 'msvc%s120.dll')
+  _CopyRuntime(out_debug_x64,      x64, 'msvc%s120d.dll')
+  _CopyRuntime(out_release_x64,    x64, 'msvc%s120.dll')
+  _CopyRuntime(out_debug_nacl64,   x64, 'msvc%s120d.dll')
+  _CopyRuntime(out_release_nacl64, x64, 'msvc%s120.dll')
 
   # Copy the PGO runtime library to the release directories.
   if 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 = 'pgort120.dll'
     source_x86 = os.path.join(pgo_x86_runtime_dir, pgo_runtime_dll)
     if os.path.exists(source_x86):
       copy_runtime_impl(os.path.join(out_release, pgo_runtime_dll), source_x86)

[scottmg, 2014/11/13 03:49:59]

this will be broken

[Dirk Pranke, 2014/11/13 05:49:36]

Good catch. Will fix. I thought I searched for other references to this, but I
guess I did that wrong.

     source_x64 = os.path.join(pgo_x64_runtime_dir, pgo_runtime_dll)
     if os.path.exists(source_x64):
       copy_runtime_impl(os.path.join(out_release_x64, pgo_runtime_dll),
                         source_x64)
 
 
+def CopyDlls(target_dir, configuration, cpu_arch):
+  """Copy the VS runtime DLLs into the requested directory as needed.
+
+  configuration is one of 'Debug' or 'Release'.
+  cpu_arch is one of 'x86' or 'x64'.
+
+  The debug configuration gets both the debug and release DLLs; the
+  release config only the latter.

[scottmg, 2014/11/13 03:49:59]

add a note to see the gyp version above, and note that this is used for GN and
the above for GYP

[Dirk Pranke, 2014/11/13 05:49:36]

Will do.

+  """

[scottmg, 2014/11/13 03:49:59]

add a note that this will mean nacl tests will fail

[Dirk Pranke, 2014/11/13 05:49:36]

I'm not sure what you're referring to here. Which nacl tests? 

Do you mean something more specific than the idea that getting NaCl to work at
under GN on Windows will be blocked on getting this stuff straightened out?

[Nick Bray (chromium), 2014/11/13 20:10:53]

Reading between the lines: NaCl will need x64 dlls for x86 Chrome?  Is that the
issue?

+  vs2013_runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs()
+  if not vs2013_runtime_dll_dirs:
+    return
+
+  x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
+  runtime_dir = x64_runtime if cpu_arch == 'x64' else x86_runtime
+  _CopyRuntime(target_dir, runtime_dir, 'msvc%s120.dll')
+  if configuration == 'Debug':
+    _CopyRuntime(target_dir, runtime_dir, 'msvc%s120d.dll')
+
+
 def _GetDesiredVsToolchainHashes():
   """Load a list of SHA1s corresponding to the toolchains that we want installed
   to build with."""
   sha1path = os.path.join(script_dir,
                           '..', 'buildtools', 'toolchain_vs2013.hash')
   with open(sha1path, 'rb') as f:
     return f.read().strip().splitlines()
 
 
 def Update():
@@ skipping 40 matching lines @@
       os.environ['GYP_MSVS_VERSION'],
       os.environ.get('WDK_DIR', ''))
 
 
 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).
+      '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]]()
+  return commands[sys.argv[1]](*sys.argv[2:])
+
+
+def _CopyRuntime(target_dir, source_dir, dll_pattern):

[scottmg, 2014/11/13 03:49:59]

nit; move this up to before where it's used

[Dirk Pranke, 2014/11/13 05:49:36]

Will do.

[Dirk Pranke, 2014/11/14 23:03:22]

Done.

+    """Copy both the msvcr and msvcp runtime DLLs, only if the target doesn't
+    exist, but the target directory does exist."""
+    def copy_runtime_impl(target, source):
+      """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 os.path.exists(target):
+          os.unlink(target)
+        shutil.copy2(source, target)
+
+    for which in ('p', 'r'):
+      dll = dll_pattern % which
+      target = os.path.join(target_dir, dll)
+      source = os.path.join(source_dir, dll)
+      copy_runtime_impl(target, source)
 
 
 if __name__ == '__main__':
   sys.exit(main())