1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
#!/usr/bin/env python
# Copyright (C) 2016 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
import glob
import os
import re
import shutil
import subprocess
import sys
import json
import urllib3
import git_submodule as GitSubmodule
from abc import ABC, abstractmethod
class DEPSParser(ABC):
def __init__(self):
self.global_scope = {
'Var': lambda var_name: '{%s}' % var_name,
'Str': str,
'deps_os': {},
}
self.local_scope = {}
self.topmost_supermodule_path_prefix = ''
def subdir(self, dep):
if dep.startswith('src/'):
return dep[4:]
# Don't skip submodules that have a supermodule path prefix set (at the moment these
# are 2nd level deep submodules).
elif not self.topmost_supermodule_path_prefix:
# Ignore the information about chromium itself since we get that from git,
# also ignore anything outside src/ (e.g. depot_tools)
return None
else:
return dep
@abstractmethod
def parse(self):
pass
def get_recursedeps(self):
return self.local_scope["recursedeps"]
chromium_version = '130.0.6723.192'
chromium_branch = '6723'
json_url = 'http://omahaproxy.appspot.com/all.json'
qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
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 = [
'buildtools/clang_format/script',
'buildtools/third_party/libc++/trunk',
'buildtools/third_party/libc++abi/trunk',
'buildtools/third_party/libunwind/trunk',
'chrome/browser/resources/chromeos/quickoffice',
'remoting/host/installer/linux/internal',
'third_party/widevine/cdm/chromeos',
'third_party/widevine/cdm/linux',
'third_party/widevine/test/license_server',
'ui/file_manager/internal'
]
submodule_whitelist = [ 'src/third_party/android_ndk' , 'src/third_party/libunwindstack' ]
sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts'))
def currentVersion():
return chromium_version
def readReleaseChannels():
response = urllib2.urlopen(json_url)
raw_json = response.read().strip()
data = json.loads(raw_json)
channels = {}
for obj in data:
os = obj['os']
channels[os] = []
for ver in obj['versions']:
channels[os].append({ 'channel': ver['channel'], 'version': ver['version'], 'branch': ver['true_branch'] })
return channels
def read(parserCls):
git_deps = subprocess.check_output(['git', 'show', chromium_version +':DEPS'])
parser = parserCls()
git_submodules = parser.parse(git_deps, submodule_whitelist)
submodule_dict = {}
for sub in git_submodules:
submodule_dict[sub.path] = sub
extradeps_dirs = parser.get_recursedeps()
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 = parserCls()
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:
if path in submodule_dict:
del submodule_dict[path]
return submodule_dict.values()
def findSnapshotBaselineSha1():
if not os.path.isdir(snapshot_src_dir):
return ''
oldCwd = os.getcwd()
os.chdir(snapshot_src_dir)
line = subprocess.check_output(['git', 'log', '-n1', '--pretty=oneline', '--grep=' + currentVersion()])
os.chdir(oldCwd)
return line.split(' ')[0]
def preparePatchesFromSnapshot():
oldCwd = os.getcwd()
base_sha1 = findSnapshotBaselineSha1()
if not base_sha1:
sys.exit('-- base sha1 not found in ' + os.getcwd() + ' --')
patches_dir = os.path.join(upstream_src_dir, 'patches')
if os.path.isdir(patches_dir):
shutil.rmtree(patches_dir)
os.mkdir(patches_dir)
os.chdir(snapshot_src_dir)
print('-- preparing patches to ' + patches_dir + ' --')
subprocess.call(['git', 'format-patch', '-q', '-o', patches_dir, base_sha1])
os.chdir(patches_dir)
patches = glob.glob('00*.patch')
# We'll collect the patches for submodules in corresponding lists
patches_dict = {}
for patch in patches:
patch_path = os.path.abspath(patch)
with open(patch, 'r') as pfile:
for line in pfile:
if 'Subject:' in line:
match = re.search('<(.+)>', line)
if match:
submodule = match.group(1)
if submodule not in patches_dict:
patches_dict[submodule] = []
patches_dict[submodule].append(patch_path)
os.chdir(oldCwd)
return patches_dict
def resetUpstream():
oldCwd = os.getcwd()
target_dir = os.path.join(upstream_src_dir, 'chromium')
os.chdir(target_dir)
chromium = GitSubmodule.Submodule()
chromium.path = "."
submodules = chromium.readSubmodules(True)
submodules.append(chromium)
print('-- resetting upstream submodules in ' + os.path.relpath(target_dir) + ' to baseline --')
for module in submodules:
oldCwd = os.getcwd()
module_path = os.path.abspath(os.path.join(target_dir, module.path))
if not os.path.isdir(module_path):
continue
cwd = os.getcwd()
os.chdir(module_path)
line = subprocess.check_output(['git', 'log', '-n1', '--pretty=oneline', '--grep=-- QtWebEngine baseline --'])
line = line.split(' ')[0]
if line:
subprocess.call(['git', 'reset', '-q', '--hard', line])
os.chdir(cwd)
module.reset()
os.chdir(oldCwd)
print('done.\n')
|
