Skip to content

Commit 104d28b

Browse files
authored
Merge pull request #4540 from loick111/feature/custom_variants_dir_idf4.2
Allow custom variants directory
2 parents 29e3b64 + f7fe024 commit 104d28b

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Diff for: tools/platformio-build-esp32.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,20 @@
278278

279279
libs = []
280280

281+
variants_dir = join(FRAMEWORK_DIR, "variants")
282+
283+
if "build.variants_dir" in env.BoardConfig():
284+
variants_dir = join("$PROJECT_DIR", env.BoardConfig().get("build.variants_dir"))
285+
281286
if "build.variant" in env.BoardConfig():
282287
env.Append(
283288
CPPPATH=[
284-
join(FRAMEWORK_DIR, "variants",
285-
env.BoardConfig().get("build.variant"))
289+
join(variants_dir, env.BoardConfig().get("build.variant"))
286290
]
287291
)
288292
libs.append(env.BuildLibrary(
289293
join("$BUILD_DIR", "FrameworkArduinoVariant"),
290-
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
294+
join(variants_dir, env.BoardConfig().get("build.variant"))
291295
))
292296

293297
envsafe = env.Clone()

Diff for: tools/platformio-build-esp32s2.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -264,16 +264,20 @@
264264

265265
libs = []
266266

267+
variants_dir = join(FRAMEWORK_DIR, "variants")
268+
269+
if "build.variants_dir" in env.BoardConfig():
270+
variants_dir = join("$PROJECT_DIR", env.BoardConfig().get("build.variants_dir"))
271+
267272
if "build.variant" in env.BoardConfig():
268273
env.Append(
269274
CPPPATH=[
270-
join(FRAMEWORK_DIR, "variants",
271-
env.BoardConfig().get("build.variant"))
275+
join(variants_dir, env.BoardConfig().get("build.variant"))
272276
]
273277
)
274278
libs.append(env.BuildLibrary(
275279
join("$BUILD_DIR", "FrameworkArduinoVariant"),
276-
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
280+
join(variants_dir, env.BoardConfig().get("build.variant"))
277281
))
278282

279283
envsafe = env.Clone()

0 commit comments

Comments
 (0)