diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 12:19:37 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-15 16:52:24 +0000 |
commit | 6b35497375c07c49cca7317a4452acc6adc7a1cd (patch) | |
tree | 5531da6c89bb3da6495e8c83a0b86bff638f3baa /tools | |
parent | 91e13af7e1056a7bad83eb34ebf63fdd45e24bea (diff) |
Basic adaptations for 65-based
Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/scripts/git_submodule.py | 26 | ||||
-rwxr-xr-x | tools/scripts/take_snapshot.py | 8 | ||||
-rw-r--r-- | tools/scripts/version_resolver.py | 4 |
3 files changed, 27 insertions, 11 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index c2f5d9c31..bf931563c 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -46,20 +46,36 @@ def subprocessCheckOutput(args): class DEPSParser: def __init__(self): self.global_scope = { - 'Var': self.Lookup, + 'Var': lambda var_name: '{%s}' % var_name, 'deps_os': {}, } self.local_scope = {} self.topmost_supermodule_path_prefix = '' - def Lookup(self, var_name): - return self.local_scope["vars"][var_name] + def get_vars(self): + """Returns a dictionary of effective variable values + (DEPS file contents with applied custom_vars overrides).""" + result = {} + # Variables defined in DEPS file override built-in ones. + result.update(self.local_scope["vars"]) + #result.update(self.custom_vars or {}) + return result def createSubmodulesFromScope(self, scope, os): submodules = [] for dep in scope: + url = '' if (type(scope[dep]) == str): - repo_rev = scope[dep].split('@') + url = scope[dep] + elif (type(scope[dep]) == dict): + url = scope[dep]['url'] + + if ('condition' in scope[dep]) and (not 'checkout_linux' in scope[dep]['condition']): + url = '' + + if url: + url = url.format(**self.get_vars()) + repo_rev = url.split('@') repo = repo_rev[0] rev = repo_rev[1] subdir = dep @@ -84,7 +100,7 @@ class DEPSParser: elif len(rev) == 0: submodule.ref = 'master' else: - sys.exit("Invalid shasum: " + str(scope[dep])) + sys.exit("Invalid shasum: " + str(url)) submodules.append(submodule) return submodules diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 0b279f5d3..50191621a 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -102,8 +102,8 @@ def isInChromiumBlacklist(file_path): not 'common/content_restriction.h' in file_path and not 'common/custom_handlers/' in file_path and not 'common/spellcheck_' in file_path and - not 'common/url_constants' in file_path and - not 'common/webui_url_constants' in file_path and + not 'common/url_constants.' in file_path and + not 'common/webui_url_constants.' in file_path and not '/extensions/api/' in file_path and not '/extensions/browser/api/' in file_path and not '/extensions/permissions/' in file_path and @@ -165,7 +165,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/ashmem') or file_path.startswith('third_party/binutils') or file_path.startswith('third_party/bison') - or file_path.startswith('third_party/breakpad') + or file_path.startswith('third_party/breakpad/src/processor/testdata/') or file_path.startswith('third_party/boringssl/crypto_test_data.cc') or file_path.startswith('third_party/boringssl/src/fuzz') or (file_path.startswith('third_party/cacheinvalidation') and @@ -226,11 +226,11 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/talloc') or file_path.startswith('third_party/trace-viewer') or file_path.startswith('third_party/undoview') + or file_path.startswith('third_party/wayland/src') or file_path.startswith('third_party/webgl') or file_path.startswith('third_party/webrtc/resources/') or file_path.startswith('tools/android') or file_path.startswith('tools/luci_go') - or file_path.startswith('tools/metrics') or file_path.startswith('tools/memory_inspector') or file_path.startswith('tools/perf') or file_path.startswith('tools/swarming_client') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 6e2ab7cda..d93b24038 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,8 +38,8 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '64.0.3282.139' -chromium_branch = '3282' +chromium_version = '65.0.3325.151' +chromium_branch = '3325' ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' |