Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ldgen_unicode_path_v3.3' into 'release/v3.3'

Browse source 
tools/ldgen: Parse paths with Unicode characters in archives (v3.3)

See merge request espressif/esp-idf!10967
This commit is contained in:
Angus Gratton 2020-10-26 12:08:28 +08:00
parent cd06c14265 ef43198018
commit c1b49c419d
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 fragments import Sections, Scheme, Mapping, Fragment
from pyparsing import Suppress, White, ParseException, Literal, Group, ZeroOrMore 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 from ldgen_common import LdGenFailure
@ -608,9 +608,9 @@ class SectionsInfo(dict):
first_line = sections_info_file.readline() first_line = sections_info_file.readline()
archive_path = (Literal("In archive").suppress() + archive_path = (Literal("In archive").suppress() +
# trim the last character from archive_path, : White().suppress() +
Word(printables + " ").setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]) + # trim the last character (:) from archive_path
LineEnd()) restOfLine.setResultsName("archive_path").setParseAction(lambda t: t[0][:-1]))
parser = archive_path parser = archive_path
results = None 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 FreeRTOS-openocd.c.obj: file format elf32-xtensa-le