components: update with build system changes

components/bootloader/project_include.cmake

@@ -1,8 +1,15 @@
+# Do not generate flash file when building bootloader or is in early expansion of the build
+if(BOOTLOADER_BUILD)
+    return()
+endif()
+
+idf_build_get_property(project_dir PROJECT_DIR)
+
 # This is for tracking the top level project path
 if(BOOTLOADER_BUILD)
     set(main_project_path "${CMAKE_BINARY_DIR}/../..")
 else()
-    set(main_project_path "${IDF_PROJECT_PATH}")
+    set(main_project_path "${project_dir}")
 endif()
 
 get_filename_component(secure_boot_signing_key
@@ -19,15 +26,13 @@ else()
     add_custom_target(gen_secure_boot_signing_key)
 endif()
 
-if(BOOTLOADER_BUILD OR NOT IDF_BUILD_ARTIFACTS)
-    return()  # don't keep recursing, generate on project builds
-endif()
 
 # Glue to build the bootloader subproject binary as an external
 # cmake project under this one
 #
 #
-set(BOOTLOADER_BUILD_DIR "${IDF_BUILD_ARTIFACTS_DIR}/bootloader")
+idf_build_get_property(build_dir BUILD_DIR)
+set(BOOTLOADER_BUILD_DIR "${build_dir}/bootloader")
 set(bootloader_binary_files
     "${BOOTLOADER_BUILD_DIR}/bootloader.elf"
     "${BOOTLOADER_BUILD_DIR}/bootloader.bin"
@@ -47,12 +52,16 @@ endif()
 if((NOT CONFIG_SECURE_BOOT_ENABLED) OR
     CONFIG_SECURE_BOOTLOADER_REFLASHABLE OR
     CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH)
+    idf_build_get_property(idf_path IDF_PATH)
+    idf_build_get_property(sdkconfig SDKCONFIG)
+    idf_build_get_property(idf_target IDF_TARGET)
     externalproject_add(bootloader
         # TODO: support overriding the bootloader in COMPONENT_PATHS
-        SOURCE_DIR "${IDF_PATH}/components/bootloader/subproject"
+        SOURCE_DIR "${idf_path}/components/bootloader/subproject"
         BINARY_DIR "${BOOTLOADER_BUILD_DIR}"
-        CMAKE_ARGS  -DSDKCONFIG=${SDKCONFIG} -DIDF_PATH=${IDF_PATH} -DIDF_TARGET=${IDF_TARGET}
+        CMAKE_ARGS  -DSDKCONFIG=${sdkconfig} -DIDF_PATH=${idf_path} -DIDF_TARGET=${idf_target}
                     -DSECURE_BOOT_SIGNING_KEY=${secure_boot_signing_key}
+                    -DPYTHON_DEPS_CHECKED=1
         INSTALL_COMMAND ""
         BUILD_ALWAYS 1  # no easy way around this...
         BUILD_BYPRODUCTS ${bootloader_binary_files}
@@ -69,4 +78,4 @@ endif()
 # So for now we just have the top-level build remove the final build products...
 set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY
     ADDITIONAL_MAKE_CLEAN_FILES
-    ${bootloader_binary_files})
+    ${bootloader_binary_files})