From 99bf2ed61dde3e0f5a6fae61e7a00ba059d066b9 Mon Sep 17 00:00:00 2001 From: Sergei Silnov Date: Fri, 26 Jun 2020 19:42:04 +0200 Subject: [PATCH] idf.py: remove mentions of idf_project.yml and update tests --- tools/ci/test_build_system_cmake.sh | 6 +++--- tools/cmake/project.cmake | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh index 4072a9cec5..d0d24dd6bb 100755 --- a/tools/ci/test_build_system_cmake.sh +++ b/tools/ci/test_build_system_cmake.sh @@ -696,12 +696,12 @@ endmenu\n" >> ${IDF_PATH}/Kconfig # Make sure that component manager is not installed pip uninstall -y idf_component_manager printf "\n#include \"test_component.h\"\n" >> main/main.c - printf "dependencies:\n test_component:\n path: test_component\n git: ${COMPONENT_MANAGER_TEST_REPO}\n" >> idf_project.yml + printf "dependencies:\n test_component:\n path: test_component\n git: ${COMPONENT_MANAGER_TEST_REPO}\n" >> main/idf_component.yml ! idf.py build || failure "Build should fail if dependencies are not installed" - pip install ${COMPONENT_MANAGER_REPO} || failure "Failed to install the component manager" + pip install ${COMPONENT_MANAGER_PACKAGE} --upgrade || failure "Failed to install component manager" idf.py reconfigure build || failure "Build didn't succeed with required components installed by package manager" pip uninstall -y idf_component_manager - rm idf_project.yml + rm main/idf_component.yml git checkout main/main.c print_status "Build fails if partitions don't fit in flash" diff --git a/tools/cmake/project.cmake b/tools/cmake/project.cmake index 8329ed50af..014e539a0b 100644 --- a/tools/cmake/project.cmake +++ b/tools/cmake/project.cmake @@ -181,10 +181,6 @@ function(__project_init components_var test_components_var) __project_component_dir(${component_dir}) endforeach() else() - # Add project manifest and lock file to the list of dependencies - set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/idf_project.yml") - set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/dependencies.lock") - idf_build_get_property(idf_component_manager IDF_COMPONENT_MANAGER) if(idf_component_manager) if(idf_component_manager EQUAL "0") @@ -213,8 +209,8 @@ function(__project_init components_var test_components_var) message(WARNING "IDF_COMPONENT_MANAGER environment variable is set to unknown value " "\"${idf_component_manager}\". If you want to use component manager set it to 1.") endif() - elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/idf_project.yml") - message(WARNING "\"idf_project.yml\" file is found in project directory, " + elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/main/idf_component.yml") + message(WARNING "\"idf_component.yml\" file is found in project's main component directory, " "but component manager is not enabled. Please set IDF_COMPONENT_MANAGER environment variable.") endif()