Copy msvc*.dll from the build_dir to the installer_dir rather than straight to the installer_dir as…

chrome/tools/build/win/create_installer_archive.py

 #!/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.
 
 """Script to create Chrome Installer archive.
 
   This script is used to create an archive of all the files required for a
   Chrome install in appropriate directory structure. It reads chrome.release
   file as input, creates chrome.7z archive, compresses setup.exe and
@@ skipping 417 matching lines @@
 def DoComponentBuildTasks(staging_dir, build_dir, target_arch, current_version):
   # Get the required directories for the upcoming operations.
   chrome_dir = os.path.join(staging_dir, CHROME_DIR)
   version_dir = os.path.join(chrome_dir, current_version)
   installer_dir = os.path.join(version_dir, 'Installer')
   # |installer_dir| is technically only created post-install, but we need it
   # now to add setup.exe's config and manifest to the archive.
   if not os.path.exists(installer_dir):
     os.mkdir(installer_dir)
 
-  # Copy the VS CRT DLLs to |build_dir| and |installer_dir|. This must be done
-  # before the general copy step below to ensure the CRT DLLs are added to the
-  # archive and marked as a dependency in the exe manifests generated below.
+  # Copy the VS CRT DLLs to |build_dir|. This must be done before the general
+  # copy step below to ensure the CRT DLLs are added to the archive and marked
+  # as a dependency in the exe manifests generated below.
   CopyVisualStudioRuntimeDLLs(target_arch, build_dir)
-  CopyVisualStudioRuntimeDLLs(target_arch, installer_dir)
 
-  # The set of component DLLs required by setup.exe (to be dropped in the
-  # archive in the |installer_dir|).
-  setup_component_dll_names = { 'base.dll',
+  # Explicitly list the component DLLs setup.exe depends on (this list may
+  # contain wildcards). These will be copied to |installer_dir| in the archive.
+  setup_component_dll_globs = [ 'base.dll',
                                 'crcrypto.dll',
                                 'crnspr.dll',
                                 'crnss.dll',
                                 'icui18n.dll',
-                                'icuuc.dll', }
+                                'icuuc.dll',
+                                'msvc*.dll' ]
+  for setup_component_dll_glob in setup_component_dll_globs:
+    setup_component_dlls = glob.glob(os.path.join(build_dir,
+                                                  setup_component_dll_glob))
+    for setup_component_dll in setup_component_dlls:
+      shutil.copy(setup_component_dll, installer_dir)
 
-  # Stage all the component DLLs found in |build_dir|. These are all the DLLs
-  # which have not already been added to the staged |version_dir| by virtue of
-  # chrome.release.
+  # Stage all the component DLLs found in |build_dir| to the |version_dir| (for
+  # the version assembly to be able to refer to them below and make sure
+  # chrome.exe can find them at runtime). The component DLLs are considered to
+  # be all the DLLs which have not already been added to the |version_dir| by
+  # virtue of chrome.release.
   build_dlls = glob.glob(os.path.join(build_dir, '*.dll'))
   staged_dll_basenames = [os.path.basename(staged_dll) for staged_dll in \
                           glob.glob(os.path.join(version_dir, '*.dll'))]
   component_dll_filenames = []
   for component_dll in [dll for dll in build_dlls if \
                         os.path.basename(dll) not in staged_dll_basenames]:
     component_dll_name = os.path.basename(component_dll)
     # remoting_*.dll's don't belong in the archive (it doesn't depend on them
     # in gyp). Trying to copy them causes a build race when creating the
     # installer archive in component mode. See: crbug.com/180996
     if component_dll_name.startswith('remoting_'):
       continue
     component_dll_filenames.append(component_dll_name)
-    # Copy each |component_dll| to the version_dir (for the version assembly to
-    # be able to refer to them below and make sure chrome.exe can find them at
-    # runtime).
     shutil.copy(component_dll, version_dir)
-    # Also copy the ones listed in |setup_component_dll_names| directly to the
-    # Installer directory for the installed setup.exe to be able to run (as it
-    # doesn't statically link in component DLLs).
-    if component_dll_name in setup_component_dll_names:
-      shutil.copy(component_dll, installer_dir)
 
   # Augment {version}.manifest to include all component DLLs as part of the
   # assembly it constitutes, which will allow dependents of this assembly to
   # find these DLLs.
   version_assembly_dll_additions = []
   for dll_filename in component_dll_filenames:
     version_assembly_dll_additions.append("  <file name='%s'/>" % dll_filename)
   CopyAndAugmentManifest(build_dir, version_dir,
                          '%s.manifest' % current_version,
                          '\n'.join(version_assembly_dll_additions),
@@ skipping 110 matching lines @@
   if not options.resource_file_path:
     options.resource_file_path = os.path.join(options.build_dir,
                                               MINI_INSTALLER_INPUT_FILE)
 
   return options
 
 
 if '__main__' == __name__:
   print sys.argv
   sys.exit(main(_ParseOptions()))