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

CMake: pro2cmake.py: Better output in debug dumps

Browse Source 
Report more error conditions in debug dump and make the output
easier to read in the non-error case by wrapping all strings in
"".

Change-Id: I3c99deda3dfa27dcc0c9ce2800bfb891747e6934
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
This commit is contained in:
Tobias Hunger 2019-01-22 14:16:41 +01:00
parent 2f50466995
commit 0690c145db
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/cmake/pro2cmake.py
View File

@ -139,13 +139,27 @@ class Operation:
def __repr__(self): def __repr__(self):
assert(False) assert(False)
def _dump(self):
if not self._value:
return '<NOTHING>'
if not isinstance(self._value, list):
return '<NOT A LIST>'
result = []
for i in self._value:
if not i:
result.append('<NONE>')
else:
result.append(str(i))
return '"' + '", "'.join(result) + '"'
class AddOperation(Operation): class AddOperation(Operation):
def process(self, input): def process(self, input):
return input + self._value return input + self._value
def __repr__(self): def __repr__(self):
return '+({})'.format(','.join(self._value)) return '+({})'.format(self._dump())
class UniqueAddOperation(Operation): class UniqueAddOperation(Operation):
@ -157,7 +171,7 @@ class UniqueAddOperation(Operation):
return result return result
def __repr__(self): def __repr__(self):
return '*({})'.format(self._value) return '*({})'.format(self._dump())
class SetOperation(Operation): class SetOperation(Operation):
@ -165,7 +179,7 @@ class SetOperation(Operation):
return self._value return self._value
def __repr__(self): def __repr__(self):
return '=({})'.format(self._value) return '=({})'.format(self._dump())
class RemoveOperation(Operation): class RemoveOperation(Operation):
@ -183,7 +197,7 @@ class RemoveOperation(Operation):
return result return result
def __repr__(self): def __repr__(self):
return '-({})'.format(self._value) return '-({})'.format(self._dump())
class Scope: class Scope: