From de850d71e4101249931de42670154eba2517c530 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 22 May 2014 20:33:17 +0200 Subject: Add --baseline-upstream option to init-repository.py This flag makes it possible to initialize an upstream repository without applying the QtWebEngine patches, which will be the used to take a new snapshot, on top of which we will rebase our patches. Change-Id: I89a6a135bb457edfc31c24a052f1732fb70299dc Reviewed-by: Andras Becsi --- init-repository.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'init-repository.py') diff --git a/init-repository.py b/init-repository.py index b2a2d208f..7870515e3 100755 --- a/init-repository.py +++ b/init-repository.py @@ -76,11 +76,15 @@ use_external_chromium = False parser = argparse.ArgumentParser(description='Initialize QtWebEngine repository.') parser.add_argument('--no-gerrit', action='store_true', help='skip adding the upstream Gerrit remote and commit hook') +parser.add_argument('--baseline-upstream', action='store_true', help='initialize using upstream Chromium submodule w/o applying patches (for maintenance purposes only)') 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 + if chromium_src: chromium_src = os.path.abspath(chromium_src) use_external_chromium = True @@ -180,6 +184,7 @@ subprocess.call(['git', 'update-index', '--assume-unchanged', '.gitmodules']) if args.upstream: initUpstreamSubmodules() updateLastChange() - applyPatches() + if not args.baseline_upstream: + applyPatches() if args.snapshot: initSnapshot() -- cgit v1.2.3