diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/about_credits_entry.tmpl | 1 | ||||
| -rw-r--r-- | tools/scripts/git_submodule.py | 14 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 70 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 33 |
4 files changed, 59 insertions, 59 deletions
diff --git a/tools/about_credits_entry.tmpl b/tools/about_credits_entry.tmpl index 20bbb28a0..2bb9cff4e 100644 --- a/tools/about_credits_entry.tmpl +++ b/tools/about_credits_entry.tmpl @@ -1,5 +1,4 @@ /*! -\contentspage qtwebengine-licensing.html \page qtwebengine-3rdparty-{{name-sanitized}}.html attribution \ingroup qtwebengine-licensing \brief {{license-type}} diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index 684a8af67..edaed1ed2 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -61,6 +61,9 @@ class DEPSParser: #result.update(self.custom_vars or {}) return result + def get_recursedeps(self): + return self.local_scope["recursedeps"] + def createSubmodulesFromScope(self, scope, os): submodules = [] for dep in scope: @@ -225,6 +228,9 @@ class Submodule: # The submodule operations should be done relative to the current submodule's # supermodule. if self.topmost_supermodule_path_prefix: + if not os.path.isdir(self.path): + print '-- skipping ' + self.path + ' as dir has been stripped. --' + return os.chdir(self.topmost_supermodule_path_prefix) if os.path.isdir(self.path): @@ -309,14 +315,14 @@ class Submodule: os.chdir(oldCwd) return flattened_submodules - def readSubmodules(self): + def readSubmodules(self, use_deps=False): submodules = [] - if self.ref: + if use_deps: submodules = resolver.readSubmodules() print 'DEPS file provides the following submodules:' for submodule in submodules: print '{:<80}'.format(submodule.pathRelativeToTopMostSupermodule()) + '{:<120}'.format(submodule.url) + submodule.ref - else: # Try .gitmodules since no ref has been specified + else: # Try .gitmodules instead gitmodules_file_name = '.gitmodules' submodules = self.readSubmodulesFromGitModules(self, gitmodules_file_name, self.path) return submodules @@ -324,7 +330,7 @@ class Submodule: def initSubmodules(self): oldCwd = os.getcwd() os.chdir(self.path) - submodules = self.readSubmodules() + submodules = self.readSubmodules(True) for submodule in submodules: submodule.initialize() subprocessCall(['git', 'commit', '-a', '--amend', '--no-edit']) diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 741979a9e..dffdcbc11 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -68,41 +68,29 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('buildtools/third_party/libunwind') or (file_path.startswith('chrome/') and not file_path.startswith('chrome/VERSION') and + not file_path.startswith('chrome/app/resources/') and + not file_path.startswith('chrome/app/theme/') and not file_path.startswith('chrome/browser/chrome_notification_types.h') and - not '/app/theme/' in file_path and - not '/app/resources/' in file_path and - not '/browser/printing/' in file_path and - not ('/browser/resources/' in file_path and not '/chromeos/' in file_path) and - not '/renderer/resources/' in file_path and - not 'repack_locales' in file_path and - not 'third_party/chromevox' in file_path and - not 'media/webrtc/desktop_media_list.h' in file_path and - not 'media/webrtc/desktop_streams_registry.' in file_path and - not 'browser/net/chrome_mojo_proxy_resolver_factory.' in file_path and - not '/browser/accessibility/' in file_path and - not '/browser/custom_handlers/' in file_path and - not '/browser/devtools/' in file_path and - not '/browser/ui/webui/' in file_path and - not 'common/chrome_constants.' in file_path and - not 'common/chrome_paths' in file_path and - not 'common/chrome_switches.' in file_path and - 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 '/extensions/api/' in file_path and - not '/extensions/browser/api/' in file_path and - not '/extensions/permissions/' in file_path and - not '/renderer_host/pepper/' in file_path and - not '/renderer/pepper/' in file_path and - not '/spellchecker/' in file_path and - not '/tools/convert_dict/' in file_path and - not file_path.endswith('cf_resources.rc') and - not file_path.endswith('version.py') and + not file_path.startswith('chrome/browser/accessibility/') and + not file_path.startswith('chrome/browser/custom_handlers/') and + not file_path.startswith('chrome/browser/devtools/') and + not file_path.startswith('chrome/browser/extensions/api/') and + not file_path.startswith('chrome/browser/media/webrtc/') and + not file_path.startswith('chrome/browser/net/') and + not file_path.startswith('chrome/browser/prefs/') and + not file_path.startswith('chrome/browser/printing/') and + not file_path.startswith('chrome/browser/renderer_host/') and + not file_path.startswith('chrome/browser/spellchecker') and + not file_path.startswith('chrome/browser/ui/webui/') and + not (file_path.startswith('chrome/browser/resources/') and + not '/chromeos/' in file_path and + not '/settings/' in file_path and + not '/mediarouter/' in file_path) and + not (file_path.startswith('chrome/common/') and not file_path.startswith('chrome/common/extensions/docs')) and + not file_path.startswith('chrome/renderer/') and + not file_path.startswith('chrome/tools/convert_dict/') and not file_path.endswith('.grd') and not file_path.endswith('.grdp') and - not file_path.endswith('.json') and not file_path.endswith('chrome_version.rc.version')) or file_path.startswith('chrome_elf') or file_path.startswith('chromecast') @@ -144,14 +132,16 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('testing/buildbot') or (file_path.startswith('third_party/') and ( file_path.startswith('third_party/WebKit/LayoutTests') - or file_path.startswith('third_party/accessibility-audit') + or file_path.startswith('third_party/accessibility') or file_path.startswith('third_party/afl') or file_path.startswith('third_party/android_') - or file_path.startswith('third_party/apache-win32') + or file_path.startswith('third_party/angle/third_party/deqp') + or file_path.startswith('third_party/angle/third_party/glmark2') + or file_path.startswith('third_party/angle/third_party/vulkan-validation-layers') + or file_path.startswith('third_party/apache-') or file_path.startswith('third_party/arcode-android-sdk') 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/blink/perf_tests/') or file_path.startswith('third_party/blink/web_tests/') or file_path.startswith('third_party/breakpad/src/processor/testdata/') @@ -167,10 +157,9 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/catapult/tracing/test_data/') or file_path.startswith('third_party/chromevox') or file_path.startswith('third_party/chromite') - or file_path.startswith('third_party/closure_compiler') or file_path.startswith('third_party/colorama') or file_path.startswith('third_party/depot_tools') - or file_path.startswith('third_party/elfutils') + or file_path.startswith('third_party/devtools-node-modules') or file_path.startswith('third_party/fuschsia-sdk/') or file_path.startswith('third_party/glslang/src/Test/') or file_path.startswith('third_party/google_') @@ -179,7 +168,6 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/icu/android') or file_path.startswith('third_party/icu/cast') or file_path.startswith('third_party/icu/chromeos') - or file_path.startswith('third_party/icu/ios') or file_path.startswith('third_party/instrumented_libraries') or file_path.startswith('third_party/jsr-305') or file_path.startswith('third_party/junit') @@ -294,10 +282,10 @@ def clearDirectory(directory): shutil.rmtree(direntry) os.chdir(currentDir) -def listFilesInCurrentRepository(): +def listFilesInCurrentRepository(use_deps=False): currentRepo = GitSubmodule.Submodule(os.getcwd()) files = subprocess.check_output(['git', 'ls-files']).splitlines() - submodules = currentRepo.readSubmodules() + submodules = currentRepo.readSubmodules(use_deps) for submodule in submodules: submodule_files = submodule.listFiles() for submodule_file in submodule_files: @@ -340,7 +328,7 @@ def exportChromium(): os.makedirs(third_party_chromium); print 'exporting contents of:' + third_party_upstream_chromium os.chdir(third_party_upstream_chromium) - files = listFilesInCurrentRepository() + files = listFilesInCurrentRepository(True) # Add LASTCHANGE files which are not tracked by git. files.append('build/util/LASTCHANGE') files.append('build/util/LASTCHANGE.committime') diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 2cdc1e3fb..58d5aa19d 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,9 +38,9 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '77.0.3865.98' -chromium_branch = '3865' -ninja_version = 'v1.9.0' +chromium_version = '79.0.3945.147' +chromium_branch = '3945' +ninja_version = 'v1.8.2' json_url = 'http://omahaproxy.appspot.com/all.json' @@ -88,17 +88,24 @@ def readSubmodules(): for sub in git_submodules: submodule_dict[sub.path] = sub + extradeps_dirs = parser.get_recursedeps() # Add buildtools submodules - buildtools_deps_file_path = "buildtools/DEPS" - if (os.path.isfile(buildtools_deps_file_path)): - with open(buildtools_deps_file_path, 'r') as buildtools_deps_file: - buildtools_deps = buildtools_deps_file.read() - if buildtools_deps: - buildtools_parser = GitSubmodule.DEPSParser() - buildtools_parser.topmost_supermodule_path_prefix = './buildtools/' - buildtools_submodules = buildtools_parser.parse(buildtools_deps) - for sub in buildtools_submodules: - submodule_dict[sub.path] = sub + extradeps_dirs.append('buildtools') + + for extradeps_dir in extradeps_dirs: + if extradeps_dir.startswith('src/'): + extradeps_dir = extradeps_dir[4:] + extra_deps_file_path = extradeps_dir + '/DEPS' + if (os.path.isfile(extra_deps_file_path)): + with open(extra_deps_file_path, 'r') as extra_deps_file: + extra_deps = extra_deps_file.read() + if extra_deps: + extradeps_parser = GitSubmodule.DEPSParser() + extradeps_parser.topmost_supermodule_path_prefix = extradeps_dir + extradeps_submodules = extradeps_parser.parse(extra_deps) + for sub in extradeps_submodules: + submodule_dict[sub.path] = sub + # Remove unwanted upstream submodules for path in submodule_blacklist: |