[NaCl SDK] Update build_sdk.py to display Cr-Commit-Position in README.

native_client_sdk/src/tools/getos.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.
 
 """Determine OS and various other system properties.
 
 Determine the name of the platform used and other system properties such as
 the location of Chrome.  This is used, for example, to determine the correct
 Toolchain to invoke.
@@ skipping 50 matching lines @@
 
 
 def GetSDKVersion():
   root = GetSDKPath()
   readme = os.path.join(root, "README")
   if not os.path.exists(readme):
     raise Error("README not found in SDK root: %s" % root)
 
   version = None
   revision = None
+  commit_position = None
   for line in open(readme):
     if ':' in line:
       name, value = line.split(':', 1)
       if name == "Version":
         version = value.strip()
       if name == "Chrome Revision":
         revision = value.strip()
+      if name == "Chrome Commit Position":
+        commit_position = value.strip()
 
-  if revision == None or version == None:
+  if revision is None or version is None or commit_position is None:
     raise Error("error parsing SDK README: %s" % readme)
 
   try:
     version = int(version)
   except ValueError:
     raise Error("error parsing SDK README: %s" % readme)
 
-  return (version, revision)
+  return (version, revision, commit_position)
 
 
 def GetSystemArch(platform):
   if platform == 'win':
     if UseWin64():
       return 'x86_64'
     return 'x86_32'
 
   if platform in ['mac', 'linux']:
     try:
@@ skipping 99 matching lines @@
       help='Print architecture of current machine (x86_32, x86_64 or arm).')
   parser.add_option('--chrome', action='store_true',
       help='Print the path chrome (by first looking in $CHROME_PATH and '
            'then $PATH).')
   parser.add_option('--nacl-arch', action='store_true',
       help='Print architecture used by NaCl on the current machine.')
   parser.add_option('--sdk-version', action='store_true',
       help='Print major version of the NaCl SDK.')
   parser.add_option('--sdk-revision', action='store_true',
       help='Print revision number of the NaCl SDK.')
+  parser.add_option('--sdk-commit-position', action='store_true',
+      help='Print commit position of the NaCl SDK.')
   parser.add_option('--check-version',
       help='Check that the SDK version is at least as great as the '
            'version passed in.')
 
   options, _ = parser.parse_args(args)
 
   platform = GetPlatform()
 
   if len(args) > 1:
     parser.error('Only one option can be specified at a time.')
 
   if not args:
     print platform
     return 0
 
   if options.arch:
     out = GetSystemArch(platform)
   elif options.nacl_arch:
     out = GetNaClArch(platform)
   elif options.chrome:
     out = GetChromePath(platform)
   elif options.sdk_version:
     out = GetSDKVersion()[0]
   elif options.sdk_revision:
     out = GetSDKVersion()[1]
+  elif options.sdk_commit_position:
+    out = GetSDKVersion()[2]
   elif options.check_version:
     required_version = ParseVersion(options.check_version)
     version = GetSDKVersion()
     # We currently ignore the revision and just check the major version number.
     # Currently, version[1] is just a Git hash, which cannot be compared.
     # TODO(mgiuca): Compare the minor revision numbers (which should be
     # Cr-Commit-Position values), when http://crbug.com/406783 is fixed.
     # Then Cr-Commit-Position should be available: see http://crbug.com/406993.
     if version[0] < required_version[0]:
       raise Error("SDK version too old (current: %s, required: %s)"
              % (version[0], required_version[0]))
     out = None
 
   if out:
     print out
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)