diff options
Diffstat (limited to 'tools/scripts/init-repository.py')
| -rwxr-xr-x | tools/scripts/init-repository.py | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py index 4dc5ca98a..0b973ebd6 100755 --- a/tools/scripts/init-repository.py +++ b/tools/scripts/init-repository.py @@ -12,22 +12,23 @@ 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') -ninja_src = os.path.join(qtwebengine_root, 'src/3rdparty_upstream/ninja') gn_src = os.path.join(qtwebengine_root, 'src/3rdparty_upstream/gn') 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) @@ -37,7 +38,6 @@ if not chromium_src or not os.path.isdir(chromium_src): chromium_src = os.path.join(qtwebengine_root, 'src/3rdparty_upstream/chromium') if args.snapshot or not chromium_src: chromium_src = os.path.join(qtwebengine_root, 'src/3rdparty/chromium') - 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) @@ -61,27 +61,16 @@ def updateLastChange(): def initUpstreamSubmodules(): gn_url = 'https://gn.googlesource.com/gn' - ninja_url = 'https://github.com/martine/ninja.git' chromium_url = 'https://chromium.googlesource.com/chromium/src.git' - ninja_shasum = 'refs/tags/' + resolver.currentNinjaVersion() chromium_ref = 'refs/tags/' + resolver.currentVersion() os.chdir(qtwebengine_root) 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: - subprocess.call(['git', 'submodule', 'add', ninja_url, 'src/3rdparty_upstream/ninja']) if not use_external_chromium and not 'src/3rdparty_upstream/chromium' in current_submodules: subprocess.call(['git', 'submodule', 'add', chromium_url, 'src/3rdparty_upstream/chromium']) - ninjaSubmodule = GitSubmodule.Submodule() - ninjaSubmodule.path = 'src/3rdparty_upstream/ninja' - ninjaSubmodule.ref = ninja_shasum - ninjaSubmodule.url = ninja_url - ninjaSubmodule.os = 'all' - ninjaSubmodule.initialize() - gnSubmodule = GitSubmodule.Submodule() gnSubmodule.path = 'src/3rdparty_upstream/gn' gnSubmodule.ref = 'master' @@ -101,7 +90,6 @@ def initUpstreamSubmodules(): # Unstage repositories so we do not accidentally commit them. subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/gn']) - subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/ninja']) subprocess.call(['git', 'reset', '-q', 'HEAD', 'src/3rdparty_upstream/chromium']) def initSnapshot(): @@ -110,6 +98,20 @@ 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: @@ -119,3 +121,8 @@ if args.upstream: 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() |