Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve license parsing #279

Merged
merged 5 commits into from
Dec 13, 2020
Merged

Improve license parsing #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99e1348
utils.py: import license modifications from proposed catkin_pkg changes
shr-project Sep 16, 2020
fb4c91f
tests: update the get_license cases where superflore was guessing
shr-project Sep 18, 2020
71b7b82
tests: update tests to match with new utils.get_license behavior
shr-project Sep 18, 2020
cf448f4
bitbake: move translate_license function to superflore utils and prin…
shr-project Sep 18, 2020
2f8fdc1
tests: update tests to match with using translate_license function
shr-project Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions superflore/generators/bitbake/yocto_recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

from collections import defaultdict
import hashlib
import re
from subprocess import DEVNULL, PIPE, Popen

from superflore.exceptions import NoPkgXml
Expand Down Expand Up @@ -126,7 +125,6 @@ def __init__(
srcrev_cache[self.src_uri] = self.get_srcrev()
self.srcrev = srcrev_cache[self.src_uri]
self.skip_keys = skip_keys
self.multi_hyphen_re = re.compile('-{2,}')

def get_license_line(self):
self.license_line = ''
Expand Down Expand Up @@ -271,14 +269,6 @@ def get_bottom_inherit_line(self):
ret = 'inherit ros_${ROS_BUILD_TYPE}\n'
return ret

def trim_hyphens(self, s):
return self.multi_hyphen_re.sub('-', s)

def translate_license(self, lic):
conversion_table = {ord(' '): '-', ord('/'): '-', ord(':'): '-',
ord('+'): '-', ord('('): '-', ord(')'): '-'}
return self.trim_hyphens(lic.translate(conversion_table))

@staticmethod
def modify_name_if_native(dep, is_native):
"""
Expand Down Expand Up @@ -412,12 +402,17 @@ def get_recipe_text(self, distributor):
# license
self.get_license_line()
if isinstance(self.license, str):
ret += 'LICENSE = "%s"\n' % self.translate_license(
get_license(self.license))
oe_lic = get_license(self.license)
if oe_lic != self.license:
ret += '# Original license in package.xml:\n'
ret += '# "' + self.license + '"\n'
elif isinstance(self.license, list):
ret += 'LICENSE = "'
ret += ' & '.join([self.translate_license(
get_license(lic)) for lic in self.license]) + '"\n'
oe_lic = ' & '.join([get_license(lic) for lic in self.license])
if oe_lic != ' & '.join(self.license):
ret += '# Original license in package.xml, joined with '
ret += '"&" when multiple license tags were used:\n'
ret += '# "' + ' & '.join(self.license) + '"\n'
ret += 'LICENSE = "' + oe_lic + '"\n'
ret += 'LIC_FILES_CHKSUM = "file://package.xml;beginline='
ret += str(self.license_line)
ret += ';endline='
Expand Down
Loading