sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

buildorder.py: handle the case when more than one dependency type is set (#1555)

Browse Source
This commit is contained in:
Vladimir Oltean 2017-09-23 03:55:06 +03:00 committed by Fredrik Fornwall
parent 44eace2079
commit f579fc2f75
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/buildorder.py
View File

@ -31,6 +31,10 @@ def unique_everseen(iterable, key=None):
def die(msg): def die(msg):
sys.exit('ERROR: ' + msg) sys.exit('ERROR: ' + msg)
def rchop(thestring, ending):
if thestring.endswith(ending):
return thestring[:-len(ending)]
return thestring
class TermuxBuildFile(object): class TermuxBuildFile(object):
def __init__(self, path): def __init__(self, path):
@ -40,6 +44,7 @@ class TermuxBuildFile(object):
pkg_dep_prefix = 'TERMUX_PKG_DEPENDS=' pkg_dep_prefix = 'TERMUX_PKG_DEPENDS='
pkg_build_dep_prefix = 'TERMUX_PKG_BUILD_DEPENDS=' pkg_build_dep_prefix = 'TERMUX_PKG_BUILD_DEPENDS='
subpkg_dep_prefix = 'TERMUX_SUBPKG_DEPENDS=' subpkg_dep_prefix = 'TERMUX_SUBPKG_DEPENDS='
comma_deps = ''
with open(self.path, encoding="utf-8") as f: with open(self.path, encoding="utf-8") as f:
prefix = None prefix = None
@ -53,15 +58,18 @@ class TermuxBuildFile(object):
else: else:
continue continue
comma_deps = line[len(prefix):].replace('"', '').replace("'", '') comma_deps += line[len(prefix):].replace('"', '').replace("'", '').replace("\n", ",")
return set([ # Remove trailing ',' that is otherwise replacing the final newline
# Replace parenthesis to handle version qualifiers, as in "gcc (>= 5.0)": comma_deps = comma_deps[:-1]
re.sub(r'\(.*?\)', '', dep).replace('-dev', '').strip() for dep in comma_deps.split(',') if not comma_deps:
]) # no deps found
return set()
# no deps found return set([
return set() # Replace parenthesis to handle version qualifiers, as in "gcc (>= 5.0)":
rchop(re.sub(r'\(.*?\)', '', dep).strip(), '-dev') for dep in comma_deps.split(',')
])
class TermuxPackage(object): class TermuxPackage(object):