1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some corner cases of condition mapping in pro2cmake

Browse Source 
no-png is an old unused scope that should be mapped to the png
feature instead.

Map contains(QT_CONFIG, shared) to correct variable check.

Sympy doesn't like dashes in indentifiers, so replace all of them
with a _dash_ token which will be replaced again at the end
of the condition simplifying.

When doing sympy preprocessing, fix mapping of target names that
don't contain double colons.

Change-Id: Id3d37800665c96505b7cbb1d80fdbed59c3ae9c0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-08-27 19:15:36 +02:00
parent 3416a83f05
commit 5c75f6a21a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/cmake/pro2cmake.py
View File

@ -1016,7 +1016,9 @@ def map_condition(condition: str) -> str:
condition) condition)
condition = re.sub(r'qtConfig\(opengl\.\*\)', r'QT_FEATURE_opengl', condition) condition = re.sub(r'qtConfig\(opengl\.\*\)', r'QT_FEATURE_opengl', condition)
condition = re.sub(r'^win\*$', r'win', condition) condition = re.sub(r'^win\*$', r'win', condition)
condition = re.sub(r'^no-png$', r'NOT QT_FEATURE_png', condition)
condition = re.sub(r'contains\(CONFIG, static\)', r'NOT QT_BUILD_SHARED_LIBS', condition) condition = re.sub(r'contains\(CONFIG, static\)', r'NOT QT_BUILD_SHARED_LIBS', condition)
condition = re.sub(r'contains\(QT_CONFIG,\w*shared\)', r'QT_BUILD_SHARED_LIBS', condition)
def gcc_version_handler(match_obj: re.Match): def gcc_version_handler(match_obj: re.Match):
operator = match_obj.group(1) operator = match_obj.group(1)
@ -1624,6 +1626,8 @@ def simplify_condition(condition: str) -> str:
condition = condition.replace(' OR ', ' | ') condition = condition.replace(' OR ', ' | ')
condition = condition.replace(' ON ', ' true ') condition = condition.replace(' ON ', ' true ')
condition = condition.replace(' OFF ', ' false ') condition = condition.replace(' OFF ', ' false ')
# Replace dashes with a token
condition = condition.replace('-', '_dash_')
# SymPy chokes on expressions that contain two tokens one next to # SymPy chokes on expressions that contain two tokens one next to
# the other delimited by a space, which are not an operation. # the other delimited by a space, which are not an operation.
@ -1633,7 +1637,9 @@ def simplify_condition(condition: str) -> str:
# the expression, and thus simplify it. # the expression, and thus simplify it.
# Do this by replacing and keeping a map of conditions to single # Do this by replacing and keeping a map of conditions to single
# token symbols. # token symbols.
pattern = re.compile(r'(TARGET [a-zA-Z]+::[a-zA-Z]+)') # Support both target names without double colons, and with double
# colons.
pattern = re.compile(r'(TARGET [a-zA-Z]+(?:::[a-zA-Z]+)?)')
target_symbol_mapping = {} target_symbol_mapping = {}
all_target_conditions = re.findall(pattern, condition) all_target_conditions = re.findall(pattern, condition)
for target_condition in all_target_conditions: for target_condition in all_target_conditions:
@ -1657,6 +1663,7 @@ def simplify_condition(condition: str) -> str:
condition = condition.replace('|', 'OR') condition = condition.replace('|', 'OR')
condition = condition.replace('True', 'ON') condition = condition.replace('True', 'ON')
condition = condition.replace('False', 'OFF') condition = condition.replace('False', 'OFF')
condition = condition.replace('_dash_', '-')
except: except:
# sympy did not like our input, so leave this condition alone: # sympy did not like our input, so leave this condition alone:
condition = input_condition condition = input_condition