Unify the version string to be displayed on "About Chromium" dialog.

webkit/build/webkit_version.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 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.
 
 '''Reads the Webkit Version.xcconfig file looking for MAJOR_VERSION and
 MINOR_VERSION, emitting them into a webkit_version.h header file as
 WEBKIT_MAJOR_VERSION and WEBKIT_MINOR_VERSION macros.
 '''
 
@@ skipping 42 matching lines @@
   """Get the WebKit revision, in the form 'trunk@1234'."""
 
   # "svn info" tells us what we want, but third_party/WebKit does *not*
   # point at the upstream repo.  So instead we run svn info on the directory
   # containing the versioning file (which is some subdirectory of WebKit).
   version_file_dir = os.path.dirname(version_file)
   version_info = lastchange.FetchVersionInfo(
       default_lastchange=None,
       directory=os.path.join(webkit_dir, version_file_dir))
 
-  if (version_info.url.startswith(version_info.root) and
+  if (version_info.url and
+      version_info.root and
+      version_info.url.startswith(version_info.root) and

[Mark Mentovai, 2011/07/19 15:44:32]

What I meant was that you’ve changed the contents of version_info.url such that
version_info.root may no longer be a prefix.

Right?

       version_info.url.endswith(version_file_dir)):
     # Now compute the real WebKit URL by stripping off the version file
     # directory from the URL we get out of version_info.
     # Further, we want to strip off the "http://svn..." from the left.
     # This is the root URL from the repository.
     webkit_url = version_info.url[len(version_info.root):-len(version_file_dir)]
     webkit_url = webkit_url.strip('/')
   else:
     # The data isn't as we expect: perhaps they're using git without svn?
     # Just dump the output directly.
     webkit_url = version_info.url
 
+  if version_info.revision == None:
+    version_info.revision = '0'
+
   return "%s@%s" % (webkit_url, version_info.revision)
 
 
 def EmitVersionHeader(webkit_dir, version_file, output_dir):
   '''Given webkit's version file, emit a header file that we can use from
   within webkit_glue.cc.
   '''
 
   # See .gypi file for discussion of this workaround for the version file.
   assert version_file[0] == '/'
@@ skipping 14 matching lines @@
 """ % (version_file, major, minor, webkit_revision)
   f.write(template)
   f.close()
 
 def main():
   EmitVersionHeader(*sys.argv[1:])
 
 
 if __name__ == "__main__":
   main()
-
-