Rolling forward clang, hiding some warnings

tools/clang/scripts/package.py

 #!/usr/bin/env python
 # Copyright (c) 2015 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.
 
 """This script will check out llvm and clang, and then package the results up
 to a tgz file."""
 
 import argparse
 import fnmatch
@@ skipping 40 matching lines @@
     print 'Failed:', cmd
     sys.exit(1)
 
 
 def PrintTarProgress(tarinfo):
   print 'Adding', tarinfo.name
   return tarinfo
 
 
 def main():
+  if sys.platform == 'win32':
+    try:
+      subprocess.check_output(['grep', '--help'], shell=True)
+    except subprocess.CalledProcessError:
+      print 'Add gnuwin32 to your PATH, then try again.'
+      return 1
+
   parser = argparse.ArgumentParser(description='build and package clang')
   parser.add_argument('--gcc-toolchain',
                       help="the prefix for the GCC version used for building. "
                            "For /opt/foo/bin/gcc, pass "
                            "'--gcc-toolchain '/opt/foo'")
 
   args = parser.parse_args()
 
   with open('buildlog.txt', 'w') as log:
     Tee('Diff in llvm:\n', log)
     TeeCmd(['svn', 'stat', LLVM_DIR], log, fail_hard=False)
     TeeCmd(['svn', 'diff', LLVM_DIR], log, fail_hard=False)
     Tee('Diff in llvm/tools/clang:\n', log)
     TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'tools', 'clang')],
            log, fail_hard=False)
     TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'tools', 'clang')],
            log, fail_hard=False)
+    # TODO(thakis): compiler-rt is in projects/compiler-rt on Windows but
+    # llvm/compiler-rt elsewhere. So this diff call is currently only right on
+    # Windows.
     Tee('Diff in llvm/compiler-rt:\n', log)
-    TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'compiler-rt')],
+    TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'projects', 'compiler-rt')],
            log, fail_hard=False)
-    TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'compiler-rt')],
+    TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'projects', 'compiler-rt')],
            log, fail_hard=False)
     Tee('Diff in llvm/projects/libcxx:\n', log)
     TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'projects', 'libcxx')],
            log, fail_hard=False)
     TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'projects', 'libcxx')],
            log, fail_hard=False)
     Tee('Diff in llvm/projects/libcxxabi:\n', log)
     TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'projects', 'libcxxabi')],
            log, fail_hard=False)
     TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'projects', 'libcxxabi')],
@@ skipping 16 matching lines @@
   stamp = open(STAMP_FILE).read().rstrip()
   pdir = 'clang-' + stamp
   print pdir
   shutil.rmtree(pdir, ignore_errors=True)
 
   # Copy a whitelist of files to the directory we're going to tar up.
   # This supports the same patterns that the fnmatch module understands.
   exe_ext = '.exe' if sys.platform == 'win32' else ''
   want = ['bin/llvm-symbolizer' + exe_ext,
           'lib/clang/*/asan_blacklist.txt',
+          'lib/clang/*/cfi_blacklist.txt',
           # Copy built-in headers (lib/clang/3.x.y/include).
           'lib/clang/*/include/*',
           ]
   if sys.platform == 'win32':
     want.append('bin/clang-cl.exe')
+    want.append('bin/lld-link.exe')
   else:
     so_ext = 'dylib' if sys.platform == 'darwin' else 'so'
     want.extend(['bin/clang',
                  'lib/libFindBadConstructs.' + so_ext,
                  'lib/libBlinkGCPlugin.' + so_ext,
                  ])
   if sys.platform == 'darwin':
     want.extend(['bin/libc++.1.dylib',
                  # Copy only the OSX (ASan and profile) and iossim (ASan)
                  # runtime libraries:
@@ skipping 43 matching lines @@
         subprocess.call(['install_name_tool', '-id',
                          '@executable_path/' + os.path.basename(dest), dest])
         subprocess.call(['strip', '-x', dest])
       elif (sys.platform.startswith('linux') and
             os.path.splitext(f)[1] in ['.so', '.a']):
         subprocess.call(['strip', '-g', dest])
 
   # Set up symlinks.
   if sys.platform != 'win32':
     os.symlink('clang', os.path.join(pdir, 'bin', 'clang++'))
+    os.symlink('clang', os.path.join(pdir, 'bin', 'clang-cl'))
   if sys.platform == 'darwin':
     os.symlink('libc++.1.dylib', os.path.join(pdir, 'bin', 'libc++.dylib'))
     # Also copy libc++ headers.
     shutil.copytree(os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'include', 'c++'),
                     os.path.join(pdir, 'include', 'c++'))
 
   # Copy buildlog over.
   shutil.copy('buildlog.txt', pdir)
 
   # Create archive.
@@ skipping 27 matching lines @@
               filter=PrintTarProgress)
     print ('gsutil cp -a public-read %s.tgz '
            'gs://chromium-browser-clang/%s/%s.tgz') % (golddir, platform,
                                                        golddir)
 
   # FIXME: Warn if the file already exists on the server.
 
 
 if __name__ == '__main__':
   sys.exit(main())