Clang/Windows update script: copy the dynamic ASan RTL if present

tools/clang/scripts/update.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.
 
 """Windows can't run .sh files, so this is a Python implementation of
 update.sh. This script should replace update.sh on all platforms eventually."""
 
 import os
 import re
@@ skipping 114 matching lines @@
   if not vs_version:
     # TODO(hans): Find a less hacky way to find the MSVS installation.
     sys.path.append(os.path.join(CHROMIUM_DIR, 'tools', 'gyp', 'pylib'))
     import gyp.MSVSVersion
     # We request VS 2013 because Clang won't build with 2010, and 2013 will be
     # the default for Chromium soon anyway.
     vs_version = gyp.MSVSVersion.SelectVisualStudioVersion('2013')
   return vs_version
 
 
+def CopyDirectoryContents(src, dst, filename_filter=None):

[hans, 2014/08/29 16:31:06]

Maybe define this with CopyFile above, and give it a comment.

+  if not os.path.exists(dst):
+    os.makedirs(dst)
+  for root, _, files in os.walk(src):
+    for f in files:
+      if filename_filter and not re.match(filename_filter, f):
+        continue
+      CopyFile(os.path.join(root, f), dst)
+
+
 def UpdateClang():
   print 'Updating Clang to %s...' % (LLVM_WIN_REVISION)
   if LLVM_WIN_REVISION != 'HEAD' and ReadStampFile() == LLVM_WIN_REVISION:
     print 'Already up to date.'
     return 0
 
   AddCMakeToPath()
   ClobberChromiumBuildFiles()
 
   # Reset the stamp file in case the build is unsuccessful.
@@ skipping 15 matching lines @@
   # Do an x86 build of compiler-rt to get the 32-bit ASan run-time.
   # TODO(hans): Remove once the regular build above produces this.
   if not os.path.exists(COMPILER_RT_BUILD_DIR):
     os.makedirs(COMPILER_RT_BUILD_DIR)
   os.chdir(COMPILER_RT_BUILD_DIR)
   RunCommand(GetVSVersion().SetupScript('x86') +
              ['&&', 'cmake', '-GNinja', '-DCMAKE_BUILD_TYPE=Release',
               '-DLLVM_ENABLE_ASSERTIONS=ON', LLVM_DIR])
   RunCommand(GetVSVersion().SetupScript('x86') + ['&&', 'ninja', 'compiler-rt'])
 
+  asan_rt_bin_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'bin')
+  asan_rt_bin_dst_dir = os.path.join(LLVM_BUILD_DIR, 'bin')
+  CopyDirectoryContents(asan_rt_bin_src_dir, asan_rt_bin_dst_dir,
+                        r'^.*-i386\.dll$')
+
   # TODO(hans): Make this (and the .gypi file) version number independent.
   asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang',
                                      '3.6.0', 'lib', 'windows')
   asan_rt_lib_dst_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang',
                                      '3.6.0', 'lib', 'windows')
-
-  if not os.path.exists(asan_rt_lib_dst_dir):
-    os.makedirs(asan_rt_lib_dst_dir)
-  for root, _, files in os.walk(asan_rt_lib_src_dir):
-    for f in files:
-      if re.match(r'^.*-i386\.lib$', f):
-        CopyFile(os.path.join(root, f), asan_rt_lib_dst_dir)
+  CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir,
+                        r'^.*-i386\.lib$')
 
   CopyFile(os.path.join(asan_rt_lib_src_dir, '..', '..', 'asan_blacklist.txt'),
            os.path.join(asan_rt_lib_dst_dir, '..', '..'))
 
   # Make an extra copy of the sanitizer headers, to be put on the include path
   # of the fallback compiler.
   sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', '3.6.0',
                                        'include', 'sanitizer')
   aux_sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang',
                                            '3.6.0', 'include_sanitizer',
@@ skipping 34 matching lines @@
 
   if re.search(r'\b(make_clang_dir)=', os.environ.get('GYP_DEFINES', '')):
     print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).'
     return 0
 
   return UpdateClang()
 
 
 if __name__ == '__main__':
   sys.exit(main())