pioduino/platform-espressif32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamically detect the main component name // Resolve #330

Browse Source 
CMake uses the folder name as component target
This commit is contained in:
Valerii Koval
2020-04-27 17:35:32 +03:00
parent ddc18c01b4
commit 9d5cc62409
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/frameworks/espidf.py
+9 -8
View File
@@ -865,21 +865,22 @@ target_configs = load_target_configurations(
sdk_config = get_sdk_configuration() sdk_config = get_sdk_configuration()
if all(t in target_configs for t in ("__idf_src", "__idf_main")):
project_target_name = "__idf_%s" % basename(env.subst("$PROJECT_SRC_DIR"))
if project_target_name not in target_configs:
sys.stderr.write("Error: Couldn't find the main target of the project!\n")
env.Exit(1)
if all(t in target_configs for t in (project_target_name, "__idf_main")):
sys.stderr.write( sys.stderr.write(
( (
"Warning! Detected two different targets with project sources. Please use " "Warning! Detected two different targets with project sources. Please use "
"either 'src' or specify 'main' folder in 'platformio.ini' file.\n" "either %s or specify 'main' folder in 'platformio.ini' file.\n"
% project_target_name
) )
) )
env.Exit(1) env.Exit(1)
project_target_name = "__idf_main" if "__idf_main" in target_configs else "__idf_src"
if project_target_name not in target_configs:
sys.stderr.write("Error: Couldn't find the main target of the project!\n")
env.Exit(1)
project_ld_scipt = generate_project_ld_script( project_ld_scipt = generate_project_ld_script(
sdk_config, [project_target_name, "__pio_env"]) sdk_config, [project_target_name, "__pio_env"])
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", project_ld_scipt) env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", project_ld_scipt)