Unify the version string to be displayed on "About Chromium" dialog. (5/6)

- Fetch Subversion URL and the revision from 'git log' even if git-svn is not available.
- Remove VersionInfo.root, since nobody is using it.
- Allow a user to specify the directory name just prior to the svn src URL.

FYI: We decided to split the changes of issue 7104106 (http://codereview.chromium.org/7104106/) into the following steps. This is the fifth step of them:

(1) Add CreateVersionString() to chrome_version_info.*, update the GTK+ code to use it. (reviewer: erg, tony)
(2) Update the mac code to use CreateVersionString(). Update About.xib. (reviewer: mark)
(3) Update the views code to use CreateVersionString(). This can happen at the same time as (2). (reviewer: davemoore, tony)
(4) Update version.bat to use lastchange.py. (reviewer: evan)
(5) Make changes to lastchange.py and webkit_version.py. (reviewer: evan, mark)
(6) Update tweak_info_plist to use lastchange.py. (reviewer: mark)

BUG=37186
TEST=Observe that "About Chromium" dialog shows the version string like "14.0.787.0 (Developer Build 88242 Windows" on Windows and Linux.


Review URL: http://codereview.chromium.org/7493073

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94828 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 17 deletions

diff --git a/webkit/build/webkit_version.py b/webkit/build/webkit_version.py
index c365b18..7fdf9b32 100755
--- a/webkit/build/webkit_version.py
+++ b/webkit/build/webkit_version.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -58,22 +58,17 @@ def GetWebKitRevision(webkit_dir, version_file):
   version_file_dir = os.path.dirname(version_file)
   version_info = lastchange.FetchVersionInfo(
       default_lastchange=None,
-      directory=os.path.join(webkit_dir, version_file_dir))
+      directory=os.path.join(webkit_dir, version_file_dir),
+      directory_regex_prior_to_src_url='webkit')
 
-  if (version_info.url.startswith(version_info.root) and
-      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.url == None:
+    version_info.url = 'Unknown URL'
+  version_info.url = version_info.url.strip('/')
 
-  return "%s@%s" % (webkit_url, version_info.revision)
+  if version_info.revision == None:
+    version_info.revision = '0'
+
+  return "%s@%s" % (version_info.url, version_info.revision)
 
 
 def EmitVersionHeader(webkit_dir, version_file, output_dir):
@@ -107,5 +102,3 @@ def main():
 
 if __name__ == "__main__":
   main()
-
-