AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: pro2cmake.py: Nicer printing of conditions

Browse Source 
Do not needlessly add () and NOT all over the conditions.

Change-Id: If907357306eb3f8ab5b2878bcad5902171a90476
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
This commit is contained in:
Tobias Hunger 2019-01-17 17:11:52 +01:00
parent e5bee37762
commit 23e3aaf2cd
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
util/cmake/pro2cmake.py
View File

@ -519,6 +519,8 @@ def map_condition(condition: str) -> str:
condition = condition.replace('|', ' OR ') condition = condition.replace('|', ' OR ')
condition = condition.replace('==', ' STREQUAL ') condition = condition.replace('==', ' STREQUAL ')
condition = condition.replace('NOT NOT', '') # remove double negation
cmake_condition = '' cmake_condition = ''
for part in condition.split(): for part in condition.split():
# some features contain e.g. linux, that should not be # some features contain e.g. linux, that should not be
@ -686,19 +688,40 @@ def write_sources_section(cm_fh: typing.IO[str], scope: Scope, *,
cm_fh.write('{} {}\n'.format(ind, d)) cm_fh.write('{} {}\n'.format(ind, d))
is_framework = False is_framework = False
return set(scope.keys()) - scope.visited_keys()
def is_simple_condition(condition: str) -> bool:
return ' ' not in condition or (condition.startswith('NOT ') and ' ' not in condition[4:])
def write_extend_target(cm_fh: typing.IO[str], target: str, def write_extend_target(cm_fh: typing.IO[str], target: str,
scope: Scope, parent_condition: str = '', scope: Scope, parent_condition: str = '',
previous_conditon: str = '', *, previous_condition: str = '', *,
indent: int = 0) -> str: indent: int = 0) -> str:
total_condition = scope.condition() total_condition = scope.condition()
if total_condition == 'else': if total_condition == 'else':
assert previous_conditon, \ assert previous_condition, \
"Else branch without previous condition in: %s" % scope.file() "Else branch without previous condition in: %s" % scope.file()
total_condition = 'NOT ({})'.format(previous_conditon) if previous_condition.startswith('NOT '):
total_condition = previous_condition[4:]
elif is_simple_condition(previous_condition):
total_condition = 'NOT {}'.format(previous_condition)
else:
total_condition = 'NOT ({})'.format(previous_condition)
if parent_condition: if parent_condition:
total_condition = '({}) AND ({})'.format(parent_condition, if not total_condition:
total_condition) total_condition = parent_condition
else:
if is_simple_condition(parent_condition) and is_simple_condition(total_condition):
total_condition = '{} AND {}'.format(parent_condition,
total_condition)
elif is_simple_condition(total_condition):
total_condition = '({}) AND {}'.format(parent_condition, total_condition)
elif is_simple_condition(parent_condition):
total_condition = '{} AND ({})'.format(parent_condition, total_condition)
else:
total_condition = '({}) AND ({})'.format(parent_condition, total_condition)
extend_qt_io_string = io.StringIO() extend_qt_io_string = io.StringIO()
write_sources_section(extend_qt_io_string, scope) write_sources_section(extend_qt_io_string, scope)