RT-Thread/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-10-20 13:55:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[tools] Modify building.py and gcc.py for work with Python 3.

Browse Source
This commit is contained in:
ArdaFu
2018-11-07 13:40:41 +08:00
parent 3a63c0af56
commit e7ca31ccaa
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/building.py
View File

@@ -806,7 +806,7 @@ def EndBuilding(target, program = None):
if not GetOption('help') and not GetOption('target'): if not GetOption('help') and not GetOption('target'):
if not os.path.exists(rtconfig.EXEC_PATH): if not os.path.exists(rtconfig.EXEC_PATH):
print ("Error: the toolchain path ("+rtconfig.EXEC_PATH+") is not exist, please check 'EXEC_PATH' in path or rtconfig.py.") print ("Error: the toolchain path (" + rtconfig.EXEC_PATH + ") is not exist, please check 'EXEC_PATH' in path or rtconfig.py.")
need_exit = True need_exit = True
if need_exit: if need_exit:

5
tools/gcc.py
View File

@@ -55,14 +55,14 @@ def GetNewLibVersion(rtconfig):
for line in f: for line in f:
if line.find('_NEWLIB_VERSION') != -1 and line.find('"') != -1: if line.find('_NEWLIB_VERSION') != -1 and line.find('"') != -1:
version = re.search(r'\"([^"]+)\"', line).groups()[0] version = re.search(r'\"([^"]+)\"', line).groups()[0]
f.close() f.close()
elif CheckHeader(rtconfig, 'newlib.h'): # get version from newlib.h elif CheckHeader(rtconfig, 'newlib.h'): # get version from newlib.h
f = open(os.path.join(root, 'include', 'newlib.h'), 'r') f = open(os.path.join(root, 'include', 'newlib.h'), 'r')
if f: if f:
for line in f: for line in f:
if line.find('_NEWLIB_VERSION') != -1 and line.find('"') != -1: if line.find('_NEWLIB_VERSION') != -1 and line.find('"') != -1:
version = re.search(r'\"([^"]+)\"', line).groups()[0] version = re.search(r'\"([^"]+)\"', line).groups()[0]
f.close() f.close()
return version return version
def GCCResult(rtconfig, str): def GCCResult(rtconfig, str):
@@ -148,7 +148,6 @@ def GCCResult(rtconfig, str):
result += '#define LIBC_POSIX_THREADS 1\n' result += '#define LIBC_POSIX_THREADS 1\n'
os.remove('__tmp.c') os.remove('__tmp.c')
f.close()
return result return result
def GenerateGCCConfig(rtconfig): def GenerateGCCConfig(rtconfig):