feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Merge pull request #4540 from loick111/feature/custom_variants_dir_idf4.2

Browse Source 
Allow custom variants directory
This commit is contained in:
Me No Dev
2020-11-15 21:10:52 +02:00
committed by GitHub
parent 29e3b640a8 f7fe024744
commit 104d28bd9c
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/platformio-build-esp32.py
View File

@@ -278,16 +278,20 @@ env.Append(
libs = [] libs = []
variants_dir = join(FRAMEWORK_DIR, "variants")
if "build.variants_dir" in env.BoardConfig():
variants_dir = join("$PROJECT_DIR", env.BoardConfig().get("build.variants_dir"))
if "build.variant" in env.BoardConfig(): if "build.variant" in env.BoardConfig():
env.Append( env.Append(
CPPPATH=[ CPPPATH=[
join(FRAMEWORK_DIR, "variants", join(variants_dir, env.BoardConfig().get("build.variant"))
env.BoardConfig().get("build.variant"))
] ]
) )
libs.append(env.BuildLibrary( libs.append(env.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduinoVariant"), join("$BUILD_DIR", "FrameworkArduinoVariant"),
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant")) join(variants_dir, env.BoardConfig().get("build.variant"))
)) ))
envsafe = env.Clone() envsafe = env.Clone()

10
tools/platformio-build-esp32s2.py
View File

@@ -264,16 +264,20 @@ env.Append(
libs = [] libs = []
variants_dir = join(FRAMEWORK_DIR, "variants")
if "build.variants_dir" in env.BoardConfig():
variants_dir = join("$PROJECT_DIR", env.BoardConfig().get("build.variants_dir"))
if "build.variant" in env.BoardConfig(): if "build.variant" in env.BoardConfig():
env.Append( env.Append(
CPPPATH=[ CPPPATH=[
join(FRAMEWORK_DIR, "variants", join(variants_dir, env.BoardConfig().get("build.variant"))
env.BoardConfig().get("build.variant"))
] ]
) )
libs.append(env.BuildLibrary( libs.append(env.BuildLibrary(
join("$BUILD_DIR", "FrameworkArduinoVariant"), join("$BUILD_DIR", "FrameworkArduinoVariant"),
join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant")) join(variants_dir, env.BoardConfig().get("build.variant"))
)) ))
envsafe = env.Clone() envsafe = env.Clone()