diff options
Diffstat (limited to 'tools/scripts/init-repository.py')
| -rwxr-xr-x | tools/scripts/init-repository.py | 64 |
1 files changed, 30 insertions, 34 deletions
diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py index 221f74a65..e6ec0c440 100755 --- a/tools/scripts/init-repository.py +++ b/tools/scripts/init-repository.py @@ -1,32 +1,6 @@ -#!/usr/bin/env python - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the QtWebEngine module of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +#!/usr/bin/env python3 +# Copyright (C) 2016 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 import glob import os @@ -38,6 +12,7 @@ import argparse qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) import git_submodule as GitSubmodule +import cipd_package as CIPDPackage import version_resolver as resolver chromium_src = os.environ.get('CHROMIUM_SRC_DIR') @@ -47,13 +22,14 @@ use_external_chromium = False parser = argparse.ArgumentParser(description='Initialize QtWebEngine repository.') parser.add_argument('--baseline-upstream', action='store_true', help='initialize using upstream Chromium submodule w/o applying patches (for maintenance purposes only)') +parser.add_argument('--use_cipd', action='store_true', help='fetch and deploy packages with cipd') group = parser.add_mutually_exclusive_group() group.add_argument('-u', '--upstream', action='store_true', help='initialize using upstream Chromium submodule') group.add_argument('-s', '--snapshot', action='store_true', help='initialize using flat Chromium snapshot submodule (default)') args = parser.parse_args() - if args.baseline_upstream: args.upstream = True + args.use_cipd = True if chromium_src: chromium_src = os.path.abspath(chromium_src) @@ -66,7 +42,7 @@ if not chromium_src or not os.path.isdir(chromium_src): ninja_src = os.path.join(qtwebengine_root, 'src/3rdparty/ninja') gn_src = os.path.join(qtwebengine_root, 'src/3rdparty/gn') args.snapshot = True - print 'CHROMIUM_SRC_DIR not set, using Chromium in' + chromium_src + print('CHROMIUM_SRC_DIR not set, using Chromium in' + chromium_src) if not args.baseline_upstream: # Write our chromium sources directory into git config. @@ -79,7 +55,7 @@ def updateLastChange(): return currentDir = os.getcwd() os.chdir(chromium_src) - print 'updating LASTCHANGE files' + print('updating LASTCHANGE files') subprocess.call(['python', 'build/util/lastchange.py', '-o', 'build/util/LASTCHANGE']) subprocess.call(['python', 'build/util/lastchange.py', '-m', 'SKIA_COMMIT_HASH', '-s', 'third_party/skia', '--header', 'skia/ext/skia_commit_hash.h']) subprocess.call(['python', 'build/util/lastchange.py', '-m', 'GPU_LISTS_VERSION', '--revision-id-only', '--header', 'gpu/config/gpu_lists_version.h']) @@ -93,7 +69,7 @@ def initUpstreamSubmodules(): chromium_ref = 'refs/tags/' + resolver.currentVersion() os.chdir(qtwebengine_root) - current_submodules = subprocess.check_output(['git', 'submodule']) + current_submodules = subprocess.check_output(['git', 'submodule']).decode() if not 'src/3rdparty_upstream/gn' in current_submodules: subprocess.call(['git', 'submodule', 'add', gn_url, 'src/3rdparty_upstream/gn']) if not 'src/3rdparty_upstream/ninja' in current_submodules: @@ -123,6 +99,7 @@ def initUpstreamSubmodules(): chromiumSubmodule.os = 'all' chromiumSubmodule.initialize() chromiumSubmodule.initSubmodules() + subprocess.call(['src/3rdparty_upstream/chromium/third_party/node/update_npm_deps']) # Unstage repositories so we do not accidentally commit them. subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/gn']) @@ -135,12 +112,31 @@ def initSnapshot(): snapshot.os = 'all' snapshot.initialize() +def initPackages(): + # 'androidx' it is the only so far cipd package we need + third_party_upstream_chromium = os.path.join(qtwebengine_root, 'src/3rdparty_upstream/chromium') + currentDir = os.getcwd() + os.chdir(third_party_upstream_chromium) + cipd = CIPDPackage.CIPDEntity(third_party_upstream_chromium) + cipd_entites = cipd.readEntities() + for e in cipd_entites: + pkg = e.findPackage(CIPDPackage.androidx_package_name) + if pkg: + print('-- fetching and deploying ' + CIPDPackage.androidx_package_name) + pkg.fetchAndDeploy() + os.chdir(currentDir) + os.chdir(qtwebengine_root) if args.upstream: initUpstreamSubmodules() updateLastChange() if not args.baseline_upstream and not use_external_chromium: - subprocess.call(['python', os.path.join(qtwebengine_root, 'tools', 'scripts', 'patch_upstream.py')]) + subprocess.call(['python3', os.path.join(qtwebengine_root, 'tools', 'scripts', 'patch_upstream.py')]) if args.snapshot: initSnapshot() +if args.use_cipd: + cipdNotFound = subprocess.call(['which', 'cipd']) + if cipdNotFound: + raise Exception("You need cipd from depo tools.Try setting ./src/3rdparty_upstream/chromium/third_party/depot_tools/cipd in your PATH.") + initPackages() |