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
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
#!/usr/bin/env python
#############################################################################
#
# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
# Contact: http://www.qt-project.org/legal
#
# This file is part of the QtWebEngine module of the Qt Toolkit.
#
# $QT_BEGIN_LICENSE:LGPL$
# Commercial License Usage
# Licensees holding valid commercial Qt licenses may use this file in
# accordance with the commercial license agreement provided with the
# Software or, alternatively, in accordance with the terms contained in
# a written agreement between you and Digia. For licensing terms and
# conditions see http://qt.digia.com/licensing. For further information
# use the contact form at http://qt.digia.com/contact-us.
#
# GNU Lesser General Public License Usage
# Alternatively, this file may be used under the terms of the GNU Lesser
# General Public License version 2.1 as published by the Free Software
# Foundation and appearing in the file LICENSE.LGPL included in the
# packaging of this file. Please review the following information to
# ensure the GNU Lesser General Public License version 2.1 requirements
# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
#
# In addition, as a special exception, Digia gives you certain additional
# rights. These rights are described in the Digia Qt LGPL Exception
# version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
#
# GNU General Public License Usage
# Alternatively, this file may be used under the terms of the GNU
# General Public License version 3.0 as published by the Free Software
# Foundation and appearing in the file LICENSE.GPL included in the
# packaging of this file. Please review the following information to
# ensure the GNU General Public License version 3.0 requirements will be
# met: http://www.gnu.org/copyleft/gpl.html.
#
#
# $QT_END_LICENSE$
#
#############################################################################
import glob
import os
import re
import shutil
import subprocess
import sys
import json
import urllib2
import git_submodule as GitSubmodule
chromium_version = '37.0.2062.68'
chromium_branch = '2062'
json_url = 'http://omahaproxy.appspot.com/all.json'
git_deps_url = 'http://src.chromium.org/chrome/branches/' + chromium_branch + '/src/.DEPS.git'
base_deps_url = 'http://src.chromium.org/chrome/releases/'
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 = [
'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'
]
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 repositoryUrlFix(submodule):
# The git repository info for webrtc is outdated in the 1750
# branch's .DEPS.git file, so we have to update the url.
# We should be able to remove this with a branch post 1750.
repository_url = submodule.url
if 'external/webrtc/stable' in repository_url:
submodule.url = repository_url.replace('external/webrtc/stable', 'external/webrtc/trunk')
def sanityCheckModules(submodules):
submodule_dict = {}
sys.stdout.write('\nverifying submodule refs.')
for submodule in submodules:
sys.stdout.flush()
if submodule.path in submodule_dict:
prev_module = submodule_dict[submodule.path]
# We might have to create our own DEPS file if different platforms use different branches,
# but for now it should be safe to select the latest revision from the requirements.
if submodule.shasum or prev_module.revision >= submodule.revision:
continue
if prev_module.ref != submodule.ref:
# Ignore for Android which might lag behind.
if submodule.os == 'android':
continue
sys.exit('ERROR: branch mismatch for ' + submodule.path + '(' + prev_module.ref + ' vs ' + submodule.ref + ')')
print('Duplicate submodule ' + submodule.path + '. Using latest revison ' + str(submodule.revision) + '.')
if submodule.ref:
repositoryUrlFix(submodule)
sys.stdout.write('.')
result = subprocess.check_output(['git', 'ls-remote', submodule.url, submodule.ref])
if submodule.ref not in result:
# We could fall back to the git shasum if the parsed remote ref does not exist in
# the git repository but that would most certainly be outdated, so bail out here.
sys.exit('\nERROR: No valid remote found!')
sys.stdout.flush()
submodule_dict[submodule.path] = submodule
print('done.\n')
return list(submodule_dict.values())
def readSubmodules():
response = urllib2.urlopen(base_deps_url + chromium_version + '/DEPS')
svn_deps = response.read().strip()
response = urllib2.urlopen(git_deps_url)
git_deps = response.read().strip()
parser = GitSubmodule.DEPSParser()
svn_submodules = parser.parse(svn_deps)
git_submodules = parser.parse(git_deps)
submodule_dict = {}
git_dict = {}
for sub in git_submodules:
git_dict[sub.path] = sub
for sub in svn_submodules:
if (sub.revision or sub.shasum) and sub.path in git_dict:
submodule_dict[sub.path] = sub
for git in git_submodules:
if git.path in submodule_dict:
# We'll use the git repository instead of svn.
module = submodule_dict[git.path]
module.url = git.url
if not module.shasum:
# We use the git shasum as fallback.
module.shasum = git.shasum
# Remove unwanted upstream submodules
for path in submodule_blacklist:
if path in submodule_dict:
del submodule_dict[path]
return sanityCheckModules(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()
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')
|
