summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-02-07 15:18:26 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2020-02-07 14:40:20 +0000
commit458aa4294db511c3662da190399d1ecd78b478f6 (patch)
treee3133fa6dd9482170598284baacc7b00a9ae3dc8
parent5c2d377121ce774e3ee2e7a29b78d697733e75e1 (diff)
downloadqtwebengine-chromium-458aa4294db511c3662da190399d1ecd78b478f6.tar.gz
Fix generation of attribution documentation
By updating the licenses.py script, commit e687bc69 undid the adaptations from d089b7f3. Re-apply them. Fixes: QTBUG-81965 Change-Id: I28b17107c4cfb2a136fb1e981791a0f3a86099e1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rwxr-xr-xchromium/tools/licenses.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/tools/licenses.py b/chromium/tools/licenses.py
index 791efb55b47..38dbc74d0fe 100755
--- a/chromium/tools/licenses.py
+++ b/chromium/tools/licenses.py
@@ -613,15 +613,18 @@ def GenerateCredits(
for key, val in env.items():
if escape:
val = cgi.escape(val)
+ val = val.replace("*/", "* /")
template = template.replace('{{%s}}' % key, val)
return template
def MetadataToTemplateEntry(metadata, entry_template):
env = {
'name': metadata['Name'],
+ 'name-sanitized': metadata['Name'].replace(' ', '-'),
'url': metadata['URL'],
'license': open(metadata['License File'], 'rb').read(),
- }
+ 'license-type': metadata['License']
+ }
return {
'name': metadata['Name'],
'content': EvaluateTemplate(entry_template, env),
@@ -653,6 +656,7 @@ def GenerateCredits(
chromium_license_metadata = {
'Name': 'The Chromium Project',
'URL': 'http://www.chromium.org',
+ 'License': 'BSD 3-clause "New" or "Revised" License',
'License File': os.path.join(_REPOSITORY_ROOT, 'LICENSE') }
entries.append(MetadataToTemplateEntry(chromium_license_metadata,
entry_template))