Archive Linux perf builds for manual bisect

scripts/common/chromium_utils.py

 # 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.
 
 """ Set of basic operations/utilities that are used by the build. """
 
 from contextlib import contextmanager
 import ast
 import base64
 import cStringIO
@@ skipping 582 matching lines @@
     # try to make the copy faster on Windows. http://crbug.com/418702.
     if link_ok and WIN_LINK_FUNC:
       WIN_LINK_FUNC(src_path, os.path.join(dest_dir, dest_fn))
     else:
       shutil.copy2(src_path, os.path.join(dest_dir, dest_fn))
   else:
     shutil.copy2(src_path, os.path.join(dest_dir, src_file))
 
 
 def MakeZip(output_dir, archive_name, file_list, file_relative_dir,
-            raise_error=True, remove_archive_directory=True):
+            raise_error=True, remove_archive_directory=True, strip_files = None):

[RobertoCN, 2016/08/03 20:49:49]

nit: Doesn't it make more sense to default to an empty list?

[miimnk, 2016/08/03 21:37:11]

Changed

   """Packs files into a new zip archive.
 
   Files are first copied into a directory within the output_dir named for
   the archive_name, which will be created if necessary and emptied if it
   already exists.  The files are then then packed using archive names
   relative to the output_dir.  That is, if the zipfile is unpacked in place,
   it will create a directory identical to the new archive_name directory, in
   the output_dir.  The zip file will be named as the archive_name, plus
   '.zip'.
 
   Args:
     output_dir: Absolute path to the directory in which the archive is to
       be created.
     archive_dir: Subdirectory of output_dir holding files to be added to
       the new zipfile.
     file_list: List of paths to files or subdirectories, relative to the
       file_relative_dir.
     file_relative_dir: Absolute path to the directory containing the files
       and subdirectories in the file_list.
     raise_error: Whether to raise a PathNotFound error if one of the files in
       the list is not found.
     remove_archive_directory: Whether to remove the archive staging directory
       before copying files over to it.
+    strip_files: List of executable files to strip symbols when zipping
 
   Returns:
     A tuple consisting of (archive_dir, zip_file_path), where archive_dir
     is the full path to the newly created archive_name subdirectory.
 
   Raises:
     PathNotFound if any of the files in the list is not found, unless
     raise_error is False, in which case the error will be ignored.
   """
 
@@ skipping 27 matching lines @@
       if os.path.isdir(src_path):
         if WIN_LINK_FUNC:
           WIN_LINK_FUNC(src_path, os.path.join(archive_dir, needed_file))
         else:
           shutil.copytree(src_path, os.path.join(archive_dir, needed_file),
                           symlinks=True)
       elif dirname != '' and basename != '':
         dest_dir = os.path.join(archive_dir, dirname)
         MaybeMakeDirectory(dest_dir)
         CopyFileToDir(src_path, dest_dir, basename, link_ok=True)
+        if strip_files and basename in strip_files:
+          cmd = ['strip', os.path.join(dest_dir, basename)]

[RobertoCN, 2016/08/03 20:49:49]

'strip' is a gnu command, right? what happens if this is called from windows?

[miimnk, 2016/08/03 21:37:11]

Yes. It seems that it would give error for windows. I changed it so the command
won't run for windows. Updated the comments above. 

+          RunCommand(cmd)
       else:
         CopyFileToDir(src_path, archive_dir, basename, link_ok=True)
+        if strip_files and basename in strip_files:
+          cmd = ['strip', os.path.join(archive_dir, basename)]
+          RunCommand(cmd)
     except PathNotFound:
       if raise_error:
         raise
   end_time = time.clock()
   print 'Took %f seconds to create archive directory.' % (end_time - start_time)
 
   # Pack the zip file.
   output_file = '%s.zip' % archive_dir
   previous_file = '%s_old.zip' % archive_dir
   MoveFile(output_file, previous_file)
@@ skipping 1346 matching lines @@
     return False
   # Matches e.g. "cl_x86 = path/to/clang-cl.exe"
   clang_cl_re = re.compile(
       r'^cl_x\d\d\s+\=\s+(?P<compiler_path>[^ ]+)\s.*$',
       re.VERBOSE)
   for line in open(build_file):
     m = clang_cl_re.match(line)
     if m:
       return 'clang' in m.group('compiler_path')
   return False