rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: Add support to search for a suitable version of python.

Browse Source 
The command python has been removed from upstream python and python2
and python3 is now used. This patch wraps the commands in a shell
script that locates a suitable python to run.

Updates #3537
This commit is contained in:
Chris Johns
2018-10-07 20:59:45 +11:00
parent 8992d20b8c
commit 13f4c37999
27 changed files with 914 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source-builder/sb/macros.py
View File

@@ -53,7 +53,8 @@ class macros:
def iterkeys(self):
return self.keys
def _unicode_to_str(self, us):
@staticmethod
def _unicode_to_str(us):
try:
if type(us) == unicode:
return us.encode('ascii', 'replace')
@@ -174,14 +175,14 @@ class macros:
'override', 'undefine', 'convert']:
raise TypeError('bad value tuple (attrib field): %s' % (value[1]))
if value[1] == 'convert':
value = self.expand(value)
value = (value[0], value[1], self.expand(value[2]))
self.macros[self.write_map][self.key_filter(key)] = value
def __delitem__(self, key):
self.undefine(key)
def __contains__(self, key):
return self.has_key(key)
return self.has_key(self._unicode_to_str(key))
def __len__(self):
return len(list(self.keys()))
@@ -201,6 +202,7 @@ class macros:
return sorted(set(keys))
def has_key(self, key):
key = self._unicode_to_str(key)
if type(key) is not str:
raise TypeError('bad key type (want str): %s' % (type(key)))
if self.key_filter(key) not in list(self.keys()):
@@ -452,6 +454,7 @@ class macros:
def expand(self, _str):
"""Simple basic expander of config file macros."""
_str = self._unicode_to_str(_str)
expanded = True
while expanded:
expanded = False