Copy VS CRT DLLs in output directory before packaging component builds.

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 328 matching lines @@
 def DoComponentBuildTasks(staging_dir, build_dir, 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 relevant CRT DLLs to |build_dir|. We copy DLLs from all versions
+  # of VS installed to make sure we have the correct CRT version, unused DLLs
+  # should not conflict with the others anyways.
+  crt_dlls = []
+  if build_dir.endswith('Debug/'):
+    crt_dlls = glob.glob(
+        "C:/Program Files (x86)/Microsoft Visual Studio */VC/redist/"
+        "Debug_NonRedist/x86/Microsoft.*.DebugCRT/*.dll")
+  elif build_dir.endswith('Release/'):
+    crt_dlls = glob.glob(
+        "C:/Program Files (x86)/Microsoft Visual Studio */VC/redist/x86/"
+        "Microsoft.*.CRT/*.dll")
+  else:
+    print ("Warning: CRT DLLs not copied, could not determine build "
+           "configuration from output directory.")
+
+  for dll in crt_dlls:
+    shutil.copy(dll, build_dir)
+
   # Copy all the DLLs in |build_dir| to the version directory. Simultaneously
   # build a list of their names to mark them as dependencies of chrome.exe and
   # setup.exe later.
   dlls = glob.glob(os.path.join(build_dir, '*.dll'))
   dll_names = []
   for dll in dlls:
     shutil.copy(dll, version_dir)
     dll_names.append(os.path.splitext(os.path.basename(dll))[0])
 
   exe_config = (
@@ skipping 147 matching lines @@
       help='Whether to include HiDPI resource files.')
   parser.add_option('--enable_metro', default='0',
       help='Whether to include resource files from the "METRO" section of the '
            'input file.')
   parser.add_option('--component_build', default='0',
       help='Whether this archive is packaging a component build.')
 
   options, args = parser.parse_args()
   if not options.build_dir:
     parser.error('You must provide a build dir.')
+  elif not options.build_dir.endswith('/'):
+    options.build_dir += '/'
 
   if not options.staging_dir:
     parser.error('You must provide a staging dir.')
 
   if not options.input_file:
     parser.error('You must provide an input file')
 
   if not options.output_dir:
     options.output_dir = options.build_dir
 
   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()))