diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-12-16 10:41:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 10:49:05 +0100 |
| commit | 25355b4210284591661e22643321588749277f6d (patch) | |
| tree | aa0311f87ed29af03c1cfb3b07b2c5926b2875a1 /init-repository.py | |
| parent | df8eff9b1e457fe0783cc6022bf7c21f5381afbb (diff) | |
Revert "Improve init-repository.py to fetch up-to-date dependency list"
Let's make sure that the submodule integration succeeds first.
This reverts commit 584a8c3c637997fbb6772ab75aea1bd587b82a37.
Change-Id: I972e5540031636489f0995ea864c4dcfc8e5cd7a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'init-repository.py')
| -rwxr-xr-x | init-repository.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/init-repository.py b/init-repository.py index 3f33b77cd..cd11a4f96 100755 --- a/init-repository.py +++ b/init-repository.py @@ -52,7 +52,6 @@ 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,7 +118,11 @@ def initUpstreamSubmodules(): ninja_url = 'https://github.com/martine/ninja.git' chromium_url = 'https://chromium.googlesource.com/chromium/src.git' ninja_shasum = '40b51a0b986b8675e15b0cd1b10c272bf51fdb84' - chromium_ref = 'refs/branch-heads/' + resolver.currentBranch() + 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 = '' os.chdir(qtwebengine_root) current_submodules = subprocess.check_output(['git', 'submodule']) @@ -138,11 +141,11 @@ 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' chromiumSubmodule.initialize() - chromiumSubmodule.initSubmodules() def initSnapshot(): snapshot = GitSubmodule.Submodule() |