Skip to content

Commit c37a254

Browse files
pfeerickivankravets
authored andcommitted
1 parent bfcdb32 commit c37a254

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

builder/frameworks/espidf.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ def generate_project_ld_script(target, source, env):
447447
"sections": source[0].get_path(),
448448
"input": join(
449449
FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.project.ld.in"),
450-
"sdk_header": join(env.subst("$PROJECTSRC_DIR"), "sdkconfig.h"),
450+
"sdk_header": join(env.subst("$PROJECT_SRC_DIR"), "sdkconfig.h"),
451451
"fragments": " ".join(
452452
["\"%s\"" % f for f in project_files.get("lf_files")]),
453453
"output": target[0].get_path(),
@@ -591,7 +591,7 @@ def configure_exceptions(sdk_params):
591591
join(FRAMEWORK_DIR, "components", "lwip", "port", "esp32", "include"),
592592
join(FRAMEWORK_DIR, "components", "lwip", "port", "esp32", "include", "arch"),
593593
join(FRAMEWORK_DIR, "components", "include_compat"),
594-
join("$PROJECTSRC_DIR"),
594+
join("$PROJECT_SRC_DIR"),
595595
join(FRAMEWORK_DIR, "components", "mbedtls", "port", "include"),
596596
join(FRAMEWORK_DIR, "components", "mbedtls", "mbedtls", "include"),
597597
join(FRAMEWORK_DIR, "components", "mdns", "include"),
@@ -719,7 +719,7 @@ def configure_exceptions(sdk_params):
719719

720720

721721
def process_project_configs(filename):
722-
config = join(env.subst("$PROJECTSRC_DIR"), filename)
722+
config = join(env.subst("$PROJECT_SRC_DIR"), filename)
723723
if not isfile(config):
724724
print("Warning! Cannot find %s file. Default "
725725
"file will be added to your project!" % filename)
@@ -738,15 +738,15 @@ def process_project_configs(filename):
738738

739739
new_config = find_valid_example_file(filename)
740740
copy(config, join(
741-
env.subst("$PROJECTSRC_DIR"), "%s.bak" % filename))
741+
env.subst("$PROJECT_SRC_DIR"), "%s.bak" % filename))
742742
copy(new_config, config)
743743

744744

745745
process_project_configs("sdkconfig")
746-
sdk_config = join(env.subst("$PROJECTSRC_DIR"), "sdkconfig")
746+
sdk_config = join(env.subst("$PROJECT_SRC_DIR"), "sdkconfig")
747747

748748
process_project_configs("sdkconfig.h")
749-
sdk_config_header = join(env.subst("$PROJECTSRC_DIR"), "sdkconfig.h")
749+
sdk_config_header = join(env.subst("$PROJECT_SRC_DIR"), "sdkconfig.h")
750750
sdk_params = get_sdk_configuration(sdk_config_header)
751751

752752
configure_exceptions(sdk_params)
@@ -783,7 +783,7 @@ def process_project_configs(filename):
783783
join("$BUILD_DIR", "esp32_out.ld"),
784784
join(FRAMEWORK_DIR, "components", "esp32", "ld", "esp32.ld"),
785785
env.VerboseAction(
786-
'$CC -I"$PROJECTSRC_DIR" -C -P -x c -E $SOURCE -o $TARGET',
786+
'$CC -I"$PROJECT_SRC_DIR" -C -P -x c -E $SOURCE -o $TARGET',
787787
"Generating LD script $TARGET"))
788788

789789
env.Depends("$BUILD_DIR/$PROGNAME$PROGSUFFIX", linker_script)

builder/frameworks/ulp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def bin_converter(target, source, env):
5656

5757

5858
ulp_env.Append(
59-
CPPPATH=["$PROJECTSRC_DIR"],
59+
CPPPATH=["$PROJECT_SRC_DIR"],
6060

6161
BUILDERS=dict(
6262
BuildElf=Builder(
@@ -114,7 +114,7 @@ def preprocess_ld_script():
114114
"-DWITH_POSIX", "-D__ASSEMBLER__",
115115
'-DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h"',
116116
"-DHAVE_CONFIG_H", "-MT", "$TARGET", "-E", "-P", "-xc", "-o",
117-
"$TARGET", "-I $PROJECTSRC_DIR", "$SOURCE")
117+
"$TARGET", "-I $PROJECT_SRC_DIR", "$SOURCE")
118118

119119
return ulp_env.Command(
120120
join(ULP_BUILD_DIR, "ulp_main.common.ld"),

0 commit comments

Comments
 (0)