From 834017e88bb8a44fbce485e2d5383debea23bcb0 Mon Sep 17 00:00:00 2001 From: valeros Date: Mon, 16 Sep 2019 16:36:30 +0300 Subject: [PATCH] Allow specifying custom PROJECT_VER, PROJECT_NAME --- builder/frameworks/espidf.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 5e5f540..2a969d5 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -657,9 +657,7 @@ env.Prepend( "WITH_POSIX", "UNITY_INCLUDE_CONFIG_H", ("IDF_VER", '\\"%s\\"' % - platform.get_package_version("framework-espidf")), - ("PROJECT_VER", '\\"%s\\"' % "1.0.0"), - ("PROJECT_NAME", '\\"%s\\"' % basename(env.subst("$PROJECT_DIR"))) + platform.get_package_version("framework-espidf")) ], @@ -697,6 +695,18 @@ env.Append( ] ) +cppdefines = env.Flatten(env.get("CPPDEFINES", [])) + +if "PROJECT_NAME" not in cppdefines: + env.Append( + CPPDEFINES=[ + ("PROJECT_NAME", '\\"%s\\"' % basename(env.subst("$PROJECT_DIR"))) + ] + ) + +if "PROJECT_VER" not in cppdefines: + env.Append(CPPDEFINES=[("PROJECT_VER", '\\"%s\\"' % "1.0.0")]) + # # ESP-IDF doesn't need assembler-with-cpp option #