Clang toolchain on Linux: compress with XZ, include LLVM Gold plugin.

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 131 matching lines @@
     want.extend(['bin/libc++.1.dylib',
                  # Copy only the OSX (ASan and profile) and iossim (ASan)
                  # runtime libraries:
                  'lib/clang/*/lib/darwin/*asan_osx*',
                  'lib/clang/*/lib/darwin/*asan_iossim*',
                  'lib/clang/*/lib/darwin/*profile_osx*',
                  ])
   elif sys.platform.startswith('linux'):
     # Copy only
     # lib/clang/*/lib/linux/libclang_rt.{[atm]san,san,ubsan,profile}-*.a ,
-    # but not dfsan.
+    # but not dfsan. Also, copy LLVM Gold plugin.
     want.extend(['lib/clang/*/lib/linux/*[atm]san*',
                  'lib/clang/*/lib/linux/*ubsan*',
                  'lib/clang/*/lib/linux/*libclang_rt.san*',
                  'lib/clang/*/lib/linux/*profile*',
                  'lib/clang/*/msan_blacklist.txt',
+                 'lib/LLVMgold.so',
                  ])
   elif sys.platform == 'win32':
     want.extend(['lib/clang/*/lib/windows/clang_rt.asan*.dll',
                  'lib/clang/*/lib/windows/clang_rt.asan*.lib',
                  'lib/clang/*/include_sanitizer/*',
                  ])
   if args.gcc_toolchain is not None:
     # Copy the stdlibc++.so.6 we linked Clang against so it can run.
     want.append('lib/libstdc++.so.6')
 
@@ skipping 34 matching lines @@
     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.
   tar_entries = ['bin', 'lib', 'buildlog.txt']
   if sys.platform == 'darwin':
     tar_entries += ['include']
-  with tarfile.open(pdir + '.tgz', 'w:gz') as tar:
+  tar_mode = 'w:gz'
+  tar_ext = '.tgz'
+  # On Linux, we use xz for compression that is about 35% more efficient
+  # than gzip on Clang toolchain archives.
+  if sys.platform.startswith('linux'):
+    tar_mode = 'w'
+    tar_ext = '.tar'
+  with tarfile.open(pdir + tar_ext, tar_mode) as tar:
     for entry in tar_entries:
       tar.add(os.path.join(pdir, entry), arcname=entry, filter=PrintTarProgress)
+  if sys.platform.startswith('linux'):
+    subprocess.call(['xz', '-z', '-9', pdir+tar_ext])
+    tar_ext = '.tar.xz'
 
   if sys.platform == 'darwin':
     platform = 'Mac'
   elif sys.platform == 'win32':
     platform = 'Win'
   else:
     platform = 'Linux_x64'
 
   print 'To upload, run:'
-  print ('gsutil cp -a public-read %s.tgz '
-         'gs://chromium-browser-clang/%s/%s.tgz') % (pdir, platform, pdir)
+  print ('gsutil cp -a public-read %s%s '
+         'gs://chromium-browser-clang/%s/%s%s') %
+         (pdir, tar_ext, platform, pdir, tar_ext)
 
   # Zip up gold plugin on Linux.

[hans, 2015/10/05 20:53:57]

Bundling the plugin makes this code unnecessary.

   if sys.platform.startswith('linux'):
     golddir = 'llvmgold-' + stamp
     shutil.rmtree(golddir, ignore_errors=True)
     os.makedirs(os.path.join(golddir, 'lib'))
     shutil.copy(os.path.join(LLVM_RELEASE_DIR, 'lib', 'LLVMgold.so'),
                 os.path.join(golddir, 'lib'))
     with tarfile.open(golddir + '.tgz', 'w:gz') as tar:
       tar.add(os.path.join(golddir, 'lib'), arcname='lib',
               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())