andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix regex for parsing rules.mk files 

I don't know why it couldn't put it together before... ¯\_(ツ)_/¯
master
Erovia 2019-10-14 18:35:12 +02:00 committed by skullydazed
parent f8002828ca
commit d257a98cb8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/python/qmk/makefile.py
View File

@ -16,20 +16,15 @@ def parse_rules_mk(file_path):
Returns: Returns:
a dictionary with the file's content a dictionary with the file's content
""" """
# regex to match lines with comment at the end # regex to match lines uncommented lines and get the data
# group(1) = option's name # group(1) = option's name
# group(2) = operator (eg.: '=', '+=') # group(2) = operator (eg.: '=', '+=')
# group(3) = value(s) # group(3) = value(s)
commented_regex = re.compile(r"^\s*(\w+)\s*([\:\+\-]?=)\s*(.*?)(?=\s*\#)") rules_mk_regex = re.compile(r"^\s*(\w+)\s*([\?\:\+\-]?=)\s*(\S.*?)(?=\s*(\#|$))")
# regex to match lines without comment at the end
# group(1) = option's name
# group(2) = operator (eg.: '=', '+=')
# group(3) = value(s)
uncommented_regex = re.compile(r"^\s*(\w+)\s*([\:\+\-]?=)\s*(.*?)(?=\s*$)")
mk_content = qmk.path.unicode_lines(file_path) mk_content = qmk.path.unicode_lines(file_path)
parsed_file = dict() parsed_file = dict()
for line in mk_content: for line in mk_content:
found = commented_regex.search(line) if "#" in line else uncommented_regex.search(line) found = rules_mk_regex.search(line)
if found: if found:
parsed_file[found.group(1)] = dict(operator = found.group(2), value = found.group(3)) parsed_file[found.group(1)] = dict(operator = found.group(2), value = found.group(3))
return parsed_file return parsed_file