blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-11 18:19:07 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
tools/ldgen: Parse paths with Unicode characters in archives (v4.1)

See merge request espressif/esp-idf!10965
This commit is contained in:
Angus Gratton 2020-10-26 12:08:07 +08:00
commit c92efa0ae3
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 last character (:) from archive_path
restOfLine.setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]))
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