alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ldgen_unicode_path_v4.0' into 'release/v4.0'

Browse Source 
tools/ldgen: Parse paths with Unicode characters in archives & fix parsing of section names on Windows (v4.0)

See merge request espressif/esp-idf!10966
This commit is contained in:
Angus Gratton 2020-11-11 10:50:55 +08:00
commit 8a78522aad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ldgen/generation.py
View File

@ -21,7 +21,7 @@ import fnmatch
from fragments import Sections, Scheme, Mapping, Fragment
from pyparsing import Suppress, White, ParseException, Literal, Group, ZeroOrMore
from pyparsing import Word, OneOrMore, nums, alphanums, alphas, Optional, LineEnd, printables
from pyparsing import Word, OneOrMore, nums, alphanums, alphas, Optional, restOfLine
from ldgen_common import LdGenFailure
@ -581,9 +581,9 @@ class SectionsInfo(dict):
first_line = sections_info_dump.readline()
archive_path = (Literal("In archive").suppress() +
# trim the last character from archive_path, :
Word(printables + " ").setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]) +
LineEnd())
White().suppress() +
# trim the colon and line ending characters from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda s, loc, toks: s.rstrip(":\n\r ")))
parser = archive_path
results = None

2
tools/ldgen/test/data/sections.info
View File

@ -1,4 +1,4 @@
In archive libfreertos.a:
In archive /home/user/ãóç+ěščřžýáíé/build/esp-idf/freertos/libfreertos.a:
FreeRTOS-openocd.c.obj: file format elf32-xtensa-le