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

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

Browse source 
Fix library path parsing in windows (backport v3.3)

See merge request idf/esp-idf!4609
This commit is contained in:
Angus Gratton 2019-04-02 11:47:18 +08:00
parent f03382b0ff 24a713b3c4
commit d5f9eb65e9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/ldgen/generation.py
View file

@ -20,7 +20,8 @@ import os
import fnmatch import fnmatch
from fragments import Sections, Scheme, Mapping, Fragment from fragments import Sections, Scheme, Mapping, Fragment
from pyparsing import Suppress, White, ParseException, Literal, Regex, Group, ZeroOrMore, Word, OneOrMore, nums, alphanums, alphas, Optional from pyparsing import Suppress, White, ParseException, Literal, Group, ZeroOrMore
from pyparsing import Word, OneOrMore, nums, alphanums, alphas, Optional, LineEnd, printables
from common import LdGenFailure from common import LdGenFailure
@ -591,7 +592,10 @@ class SectionsInfo(dict):
def add_sections_info(self, sections_info_file): def add_sections_info(self, sections_info_file):
first_line = sections_info_file.readline() first_line = sections_info_file.readline()
archive_path = Literal("In archive").suppress() + Regex(r"[^:]+").setResultsName("archive_path") + Literal(":").suppress() 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())
parser = archive_path parser = archive_path
results = None results = None