From 584a8c3c637997fbb6772ab75aea1bd587b82a37 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Fri, 6 Dec 2013 14:46:31 +0100 Subject: Improve init-repository.py to fetch up-to-date dependency list This patch introduces a new mechanism to retrieve submodules. The utilities in version_resolver.py provide means to download the upstream DEPS file for a specified Chromium version. This makes it possible to check out the needed svn branches and specific revisions used for the release. We still use the git repositories found in the upstream .DEPS.git file but since it is not regularly updated after the branch-off, we try to match the release svn revisions to git shasums which is possible since each commit includes git-svn-id's. Also add a maintenance tool get_version.py which reads the Chrome release information from http://omahaproxy.appspot.com. We now pin the latest stable channel Chromium release from branch 1650 with the version number 31.0.1650.63 and a branch-off date of Sept 23rd. Change-Id: Ibbf565f876af79dc008bcd161fddcbdd8bc73977 Reviewed-by: Jocelyn Turcotte --- init-repository.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'init-repository.py') diff --git a/init-repository.py b/init-repository.py index 2affa196a..1716a289a 100755 --- a/init-repository.py +++ b/init-repository.py @@ -52,6 +52,7 @@ qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__))) sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts')) import git_submodule as GitSubmodule +import version_resolver as resolver chromium_src = os.environ.get('CHROMIUM_SRC_DIR') ninja_src = os.path.join(qtwebengine_root, 'src/3rdparty_upstream/ninja') @@ -119,11 +120,7 @@ def initUpstreamSubmodules(): ninja_url = 'https://github.com/martine/ninja.git' chromium_url = 'https://chromium.googlesource.com/chromium/src.git' ninja_shasum = '40b51a0b986b8675e15b0cd1b10c272bf51fdb84' - chromium_shasum = '29d2d710e0e7961dff032ad4ab73887cc33122bb' - # Do not define a branch for now. - # We will turn this on, once we actually switch to using the release branch. - #chromium_ref = 'refs/branch-heads/1599' - chromium_ref = '' + chromium_ref = 'refs/branch-heads/' + resolver.currentBranch() os.chdir(qtwebengine_root) current_submodules = subprocess.check_output(['git', 'submodule']) @@ -142,13 +139,13 @@ def initUpstreamSubmodules(): if not use_external_chromium: chromiumSubmodule = GitSubmodule.Submodule() chromiumSubmodule.path = 'src/3rdparty_upstream/chromium' - chromiumSubmodule.shasum = chromium_shasum chromiumSubmodule.ref = chromium_ref chromiumSubmodule.url = chromium_url chromiumSubmodule.os = 'all' if args.android: GitSubmodule.extra_os = ['android'] chromiumSubmodule.initialize() + chromiumSubmodule.initSubmodules() def initSnapshot(): snapshot = GitSubmodule.Submodule() -- cgit v1.2.3