Skip to content

Commit bec7ade

Browse files
committed
Properly handle file names specified as binary data
Resolve platformio#604
1 parent 8e52bea commit bec7ade

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

builder/frameworks/_embed_files.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@
2828

2929

3030
def extract_files(cppdefines, files_type):
31-
files = []
32-
if "build." + files_type in board:
33-
files.extend(
34-
[
35-
join("$PROJECT_DIR", f)
36-
for f in board.get("build." + files_type, "").split()
37-
if f
38-
]
39-
)
31+
result = []
32+
files = env.GetProjectOption("board_build.%s" % files_type, "").splitlines()
33+
if files:
34+
result.extend([join("$PROJECT_DIR", f.strip()) for f in files if f])
4035
else:
4136
files_define = "COMPONENT_" + files_type.upper()
4237
for define in cppdefines:
@@ -58,13 +53,13 @@ def extract_files(cppdefines, files_type):
5853
for f in value.split(":"):
5954
if not f:
6055
continue
61-
files.append(join("$PROJECT_DIR", f))
56+
result.append(join("$PROJECT_DIR", f))
6257

63-
for f in files:
58+
for f in result:
6459
if not isfile(env.subst(f)):
6560
print('Warning! Could not find file "%s"' % basename(f))
6661

67-
return files
62+
return result
6863

6964

7065
def remove_config_define(cppdefines, files_type):

0 commit comments

Comments
 (0)