diff options
| author | binji <binji@chromium.org> | 2014-09-10 16:11:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 23:20:10 +0000 |
| commit | 7e8e1bc34c946f7f361bfd16c2628170b55dd45a (patch) | |
| tree | 8025e12b568992c03dbc74063fdc5bf4f5c019c3 | |
| parent | 39e40610845c395edde654e40fc8d88e466aea81 (diff) | |
| download | chromium_src-7e8e1bc34c946f7f361bfd16c2628170b55dd45a.zip chromium_src-7e8e1bc34c946f7f361bfd16c2628170b55dd45a.tar.gz chromium_src-7e8e1bc34c946f7f361bfd16c2628170b55dd45a.tar.bz2 | |
[NaCl SDK] Never check SVN or git-svn for Chromium repo.
This will need to be merged back to M38.
No trybots because this only affects the NaCl SDK build.
BUG=none
R=bradnelson@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/559233002
Cr-Commit-Position: refs/heads/master@{#294253}
| -rw-r--r-- | native_client_sdk/src/build_tools/build_version.py | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/native_client_sdk/src/build_tools/build_version.py b/native_client_sdk/src/build_tools/build_version.py index cb94488..014b86e 100644 --- a/native_client_sdk/src/build_tools/build_version.py +++ b/native_client_sdk/src/build_tools/build_version.py @@ -28,7 +28,7 @@ def ChromeVersion(): Returns: Chrome version string or trunk + svn rev. ''' - info = FetchVersionInfo() + info = FetchGitCommitPosition() if info.url == 'git': _, ref, revision = ParseCommitPosition(info.revision) if ref == 'refs/heads/master': @@ -88,26 +88,7 @@ def NaClRevision(): The NaCl revision as a string. e.g. "12345" ''' nacl_dir = os.path.join(SRC_DIR, 'native_client') - return FetchVersionInfo(nacl_dir, 'native_client').revision - - -def FetchVersionInfo(directory=None, - directory_regex_prior_to_src_url='chrome|blink|svn'): - '''Returns the last change (in the form of a branch, revision tuple), - from some appropriate revision control system. - - TODO(binji): This is copied from lastchange.py. Remove this function and use - lastchange.py directly when the dust settles. (see crbug.com/406783) - ''' - svn_url_regex = re.compile( - r'.*/(' + directory_regex_prior_to_src_url + r')(/.*)') - - version_info = (lastchange.FetchSVNRevision(directory, svn_url_regex) or - lastchange.FetchGitSVNRevision(directory, svn_url_regex) or - FetchGitCommitPosition(directory)) - if not version_info: - version_info = lastchange.VersionInfo(None, None) - return version_info + return lastchange.FetchVersionInfo(None, nacl_dir, 'native_client').revision def FetchGitCommitPosition(directory=None): |