diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-02-16 10:19:16 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-02-23 03:29:13 +0100 |
| commit | e5f0892c4c94da31035ea25c40ad847ff01d133d (patch) | |
| tree | be469d496b85172760395149d16a6cd87e791c47 /tools/scripts/version_resolver.py | |
| parent | 7e4cd3a66fb3a8ef4eab64a9f067f90db2a4cb52 (diff) | |
Add whitelist for version resolver
If DEPS entry has condition we only care about linux_checkout,
however we need also some files for andorid, add white list to
keep the checkouts to minimum.
Upadate black listed submodules.
Task-number: QTBUG-83459
Change-Id: Id6f744dd52880a2f43c5fc3655837612c82d2f6e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tools/scripts/version_resolver.py')
| -rw-r--r-- | tools/scripts/version_resolver.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 99b4d2869..9dd60b477 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -54,20 +54,12 @@ snapshot_src_dir = os.path.abspath(os.path.join(qtwebengine_root, 'src/3rdparty' upstream_src_dir = os.path.abspath(snapshot_src_dir + '_upstream') submodule_blacklist = [ - 'third_party/WebKit/LayoutTests/w3c/csswg-test' - , 'third_party/WebKit/LayoutTests/w3c/web-platform-tests' - , 'chrome/tools/test/reference_build/chrome_mac' - , 'chrome/tools/test/reference_build/chrome_linux' - , 'chrome/tools/test/reference_build/chrome_win' - # buildtools duplicates: - , 'buildtools/clang_format/script' - , 'buildtools/linux64' - , 'buildtools/mac' - , 'buildtools/win' - , 'buildtools/third_party/libc++/trunk' - , 'buildtools/third_party/libc++abi/trunk' - , 'buildtools/third_party/libunwind/trunk' - ] + 'buildtools/clang_format/script', + 'buildtools/third_party/libc++/trunk', + 'buildtools/third_party/libc++abi/trunk', + 'buildtools/third_party/libunwind/trunk' +] +submodule_whitelist = [ 'src/third_party/android_ndk' , 'src/third_party/libunwindstack' ] sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts')) @@ -94,7 +86,7 @@ def read(parserCls): git_deps = subprocess.check_output(['git', 'show', chromium_version +':DEPS']) parser = parserCls() - git_submodules = parser.parse(git_deps) + git_submodules = parser.parse(git_deps, submodule_whitelist) submodule_dict = {} |