Add a --archive-id option to update_manifest.py.

native_client_sdk/src/build_tools/sdk_tools/update_manifest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Utility to update the SDK manifest file in the build_tools directory'''
 
 import optparse
 import os
 import re
@@ skipping 34 matching lines @@
     }
 
 NACL_SDK_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
     os.path.abspath(__file__))))
 
 BUILD_TOOLS_OUT = os.path.join(NACL_SDK_ROOT, 'scons-out', 'build', 'obj',
                                'build_tools')
 
 BUNDLE_SDK_TOOLS = 'sdk_tools'
 BUNDLE_PEPPER_MATCHER = re.compile('^pepper_([0-9]+)$')
-IGNORE_OPTIONS = set(['gsutil', 'manifest_file', 'upload', 'root_url'])
+IGNORE_OPTIONS = set([
+    'archive_id', 'gsutil', 'manifest_file', 'upload', 'root_url'])
 
 
 class Error(Exception):
   '''Generic error/exception for update_manifest module'''
   pass
 
 
 def UpdateBundle(bundle, options):
   ''' Update the bundle per content of the options.
 
@@ skipping 60 matching lines @@
       self.SetBundle(bundle)
     UpdateBundle(bundle, options)
 
   def _VerifyAllOptionsConsumed(self, options, bundle_name):
     ''' Verify that all the options have been used. Raise an exception if
         any valid option has not been used. Returns True if all options have
         been consumed.
 
     Args:
       options: the object containing the remaining unused options attributes.
-      bundl_name: The name of the bundle, or None if it's missing.'''
+      bundle_name: The name of the bundle, or None if it's missing.'''
     # Any option left in the list should have value = None
     for key, val in options.__dict__.items():
       if val != None and key not in IGNORE_OPTIONS:
         if bundle_name:
           raise Error('Unused option "%s" for bundle "%s"' % (key, bundle_name))
         else:
           raise Error('No bundle name specified')
     return True;
 
   def UpdateManifest(self, options):
@@ skipping 123 matching lines @@
       options.bundle_version = int(match.group(1))
     if options.bundle_version is None:
       raise Error('Need to specify a bundle version')
     if options.bundle_revision is None:
       raise Error('Need to specify a bundle revision')
     if options.bundle_name == 'pepper':
       self.options.bundle_name = 'pepper_%s' % options.bundle_version
     if options.desc is None:
       options.desc = ('Chrome %s bundle, revision %s' %
                       (options.bundle_version, options.bundle_revision))
-    root_url = '%s/pepper_%s_%s' % (options.root_url, options.bundle_version,
-                                    options.bundle_revision)
+    root_url = options.root_url
+    if options.archive_id:
+      # Support archive names like trunk.113440 or 17.0.963.3, which is how
+      # the Chrome builders archive things.
+      root_url = '/'.join([root_url, options.archive_id])
+    else:
+      # This is the old archive naming scheme
+      root_url = '%s/pepper_%s_%s' % (root_url, options.bundle_version,
+                                      options.bundle_revision)
     options.mac_arch_url = '/'.join([root_url, 'naclsdk_mac.tgz'])
     options.linux_arch_url = '/'.join([root_url, 'naclsdk_linux.tgz'])
     options.win_arch_url = '/'.join([root_url, 'naclsdk_win.exe'])
 
   def HandleBundles(self):
     '''Handles known bundles by automatically uploading files'''
     bundle_name = self.options.bundle_name
     if bundle_name == BUNDLE_SDK_TOOLS:
       self._HandleSDKTools()
     elif bundle_name.startswith('pepper'):
@@ skipping 12 matching lines @@
 
 
 def main(argv):
   '''Main entry for update_manifest.py'''
 
   buildtools_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
   parser = optparse.OptionParser(usage=HELP)
 
   # Setup options
   parser.add_option(
+      '-a', '--archive-id', dest='archive_id',
+      default=None,
+      help='Archive identifier, produced by the Chromium builders; string '
+           'like "trunk.113440" or "17.0.963.3".  Used with --root-url to '
+           'build the full archive URL. If not set the archive id defaults to '
+           '"pepper_<version>_<revision>"')
+  parser.add_option(
       '-b', '--bundle-version', dest='bundle_version',
       type='int',
       default=None,
       help='Required: Version number for the bundle.')
   parser.add_option(
       '-B', '--bundle-revision', dest='bundle_revision',
       type='int',
       default=None,
       help='Required: Revision number for the bundle.')
   parser.add_option(
@@ skipping 17 matching lines @@
       default=None,
       help='URL for the Mac archive.')
   parser.add_option(
       '-n', '--bundle-name', dest='bundle_name',
       default=None,
       help='Required: Name of the bundle.')
   parser.add_option(
       '-r', '--recommended', dest='recommended',
       choices=sdk_update.YES_NO_LITERALS,
       default=None,
-      help='Required: whether this bundle is recommended. one of "yes" or "no"')
+      help='Required: whether this bundle is recommended. One of "yes" or "no"')
   parser.add_option(
       '-R', '--root-url', dest='root_url',
       default='http://commondatastorage.googleapis.com/nativeclient-mirror/'
               'nacl/nacl_sdk',
       help='Root url for uploading')
   parser.add_option(
       '-s', '--stability', dest='stability',
       choices=sdk_update.STABILITY_LITERALS,
       default=None,
       help='Required: Stability for this bundle; one of. '
@@ skipping 23 matching lines @@
 
   manifest_file = UpdateSDKManifestFile(options)
   manifest_file.HandleBundles()
   manifest_file.UpdateWithOptions()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))