From ffebfd437622f4fd55317e8baee63141eb630c80 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 1 Jul 2022 19:44:14 +0300 Subject: [PATCH] Drop deprecated "program" target --- platformio/builder/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platformio/builder/main.py b/platformio/builder/main.py index e2482625..74f6acd3 100644 --- a/platformio/builder/main.py +++ b/platformio/builder/main.py @@ -79,7 +79,8 @@ DEFAULT_ENV_OPTIONS = dict( COMPILATIONDB_PATH=os.path.join("$PROJECT_DIR", "compile_commands.json"), LIBPATH=["$BUILD_DIR"], PROGNAME="program", - PROG_PATH=os.path.join("$BUILD_DIR", "$PROGNAME$PROGSUFFIX"), + PROGPATH=os.path.join("$BUILD_DIR", "$PROGNAME$PROGSUFFIX"), + PROG_PATH="$PROGPATH", # deprecated PYTHONEXE=get_pythonexe_path(), IDE_EXTRA_DATA={}, ) @@ -200,7 +201,7 @@ for item in env.GetExtraScripts("post"): if env.get("SIZETOOL") and not ( set(["nobuild", "sizedata"]) & set(COMMAND_LINE_TARGETS) ): - env.Depends(["upload", "program"], "checkprogsize") + env.Depends("upload", "checkprogsize") # Replace platform's "size" target with our _new_targets = [t for t in DEFAULT_TARGETS if str(t) != "size"] Default(None) @@ -212,7 +213,7 @@ if "compiledb" in COMMAND_LINE_TARGETS: # Print configured protocols env.AddPreAction( - ["upload", "program"], + "upload", env.VerboseAction( lambda source, target, env: env.PrintUploadInfo(), "Configuring upload protocol...",