lightweight builds archiving for mac and win64

scripts/slave/zip_build.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.
 
 """ Creates a zip file in the staging dir with the result of a compile.
     It can be sent to other machines for testing.
 """
 
 import csv
@@ skipping 153 matching lines @@
                              chromium_utils.FULL_BUILD_REVISION_FILENAME)
     shutil.move(tmp_revision_file.name, dest_path)
     return dest_path
   except IOError:
     print 'Writing to revision file in %s failed.' % dirname
 
 def MakeUnversionedArchive(build_dir, staging_dir, zip_file_list,
                            zip_file_name, strip_files=None):
   """Creates an unversioned full build archive.
   Returns the path of the created archive."""
+  # Prevents having zip_file_list to contain duplicates
+  zip_file_list = list(set(zip_file_list))
   (zip_dir, zip_file) = chromium_utils.MakeZip(staging_dir,
                                                zip_file_name,
                                                zip_file_list,
                                                build_dir,
                                                raise_error=True,
                                                strip_files=strip_files)
 
   chromium_utils.RemoveDirectory(zip_dir)
   if not os.path.exists(zip_file):
     raise StagingError('Failed to make zip package %s' % zip_file)
@@ skipping 80 matching lines @@
 
 class PathMatcher(object):
   """Generates a matcher which can be used to filter file paths."""
 
   def __init__(self, options):
     def CommaStrParser(val):
       return [f.strip() for f in csv.reader([val]).next()]
     self.inclusions = CommaStrParser(options.include_files)
     self.exclusions = (CommaStrParser(options.exclude_files)
                        + chromium_utils.FileExclusions())
-
     self.regex_whitelist = FileRegexWhitelist(options)
     self.regex_blacklist = FileRegexBlacklist(options)
     self.exclude_unmatched = options.exclude_unmatched
-    self.ignore_regex = options.ignore_regex
+    self.exclude_extra = options.exclude_extra
+    self.custom_whitelist = options.whitelist
 
   def __str__(self):
     return '\n  '.join([
         'Zip rules',
         'Inclusions: %s' % self.inclusions,
         'Exclusions: %s' % self.exclusions,
         "Whitelist regex: '%s'" % self.regex_whitelist,
         "Blacklist regex: '%s'" % self.regex_blacklist,
         'Zip unmatched files: %s' % (not self.exclude_unmatched),
-        'Ignore regex matches: %s' % self.ignore_regex])
+        'Exclude extra: %s' % self.exclude_extra,
+        "Custom Whitelist regex: '%s'" % self.custom_whitelist])
 
 
   def Match(self, filename):
     if filename in self.inclusions:
       return True
     if filename in self.exclusions:
       return False
-    if self.ignore_regex:
+    if (self.custom_whitelist and
+       re.match(self.custom_whitelist, filename)):
+      return True
+    if self.exclude_extra:
       return False
     if re.match(self.regex_whitelist, filename):
       return True
     if re.match(self.regex_blacklist, filename):
       return False
     return not self.exclude_unmatched
 
 
 def Archive(options):
   build_dir = build_directory.GetBuildOutputDirectory(
@@ skipping 109 matching lines @@
                            help='build target to archive (Debug or Release)')
   option_parser.add_option('--src-dir', default='src',
                            help='path to the top-level sources directory')
   option_parser.add_option('--build-dir', help='ignored')
   option_parser.add_option('--exclude-files', default='',
                            help='Comma separated list of files that should '
                                 'always be excluded from the zip.')
   option_parser.add_option('--include-files', default='',
                            help='Comma separated list of files that should '
                                 'always be included in the zip.')
-  option_parser.add_option('--ignore-regex', action='store_true',
-                           default=False, help='Ignores regex matches')
+  option_parser.add_option('--whitelist', default='',
+                           help='Custom regex whitelist to include files')
+  option_parser.add_option('--exclude-extra', action='store_true',
+                           default=False, help='Only includes include file list'
+                           'and regex whitelist match provided')
   option_parser.add_option('--master-name', help='Name of the buildbot master.')
   option_parser.add_option('--slave-name', help='Name of the buildbot slave.')
   option_parser.add_option('--build-number', type=int,
                            help='Buildbot build number.')
   option_parser.add_option('--parent-build-number', type=int,
                            help='Buildbot parent build number.')
   option_parser.add_option('--webkit-dir',
                            help='webkit directory path, relative to --src-dir')
   option_parser.add_option('--revision-dir',
                            help='Directory path that shall be used to decide '
@@ skipping 71 matching lines @@
       json.dump(urls, json_file)
   else:  # we need to print buildbot annotations
     if 'storage_url' in urls:
       print '@@@STEP_LINK@download@%s@@@' % urls['storage_url']
     if 'zip_url' in urls:
       print '@@@SET_BUILD_PROPERTY@build_archive_url@"%s"@@@' %  urls['zip_url']
   return 0
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))