Merge branch 'bugfix/build_fails_when_editor_assoc_with_py_scripts_v3.2' into 'release/v3.2'
Fix issues with CMake builds when python scripts are associated with an editor (backport v3.2) See merge request idf/esp-idf!4637
This commit is contained in:
commit
f608afbe6b
3 changed files with 24 additions and 7 deletions
|
@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
|
||||||
include(${IDF_PATH}/tools/cmake/utilities.cmake)
|
include(${IDF_PATH}/tools/cmake/utilities.cmake)
|
||||||
project(${ULP_APP_NAME} ASM C)
|
project(${ULP_APP_NAME} ASM C)
|
||||||
|
|
||||||
set(ULP_MAP_GEN ${IDF_PATH}/components/ulp/esp32ulp_mapgen.py)
|
set(ULP_MAP_GEN ${PYTHON} ${IDF_PATH}/components/ulp/esp32ulp_mapgen.py)
|
||||||
set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/esp32.ulp.ld)
|
set(ULP_LD_TEMPLATE ${IDF_PATH}/components/ulp/ld/esp32.ulp.ld)
|
||||||
|
|
||||||
get_filename_component(sdkconfig_dir ${SDKCONFIG} DIRECTORY)
|
get_filename_component(sdkconfig_dir ${SDKCONFIG} DIRECTORY)
|
||||||
|
|
|
@ -222,17 +222,33 @@ function run_tests()
|
||||||
idf.py reconfigure > /dev/null;
|
idf.py reconfigure > /dev/null;
|
||||||
grep "CONFIG_PARTITION_TABLE_OFFSET=0x10000" sdkconfig || failure "The define from sdkconfig.defaults should be into sdkconfig"
|
grep "CONFIG_PARTITION_TABLE_OFFSET=0x10000" sdkconfig || failure "The define from sdkconfig.defaults should be into sdkconfig"
|
||||||
grep "CONFIG_PARTITION_TABLE_TWO_OTA=y" sdkconfig || failure "The define from sdkconfig should be into sdkconfig"
|
grep "CONFIG_PARTITION_TABLE_TWO_OTA=y" sdkconfig || failure "The define from sdkconfig should be into sdkconfig"
|
||||||
|
rm sdkconfig;
|
||||||
|
rm sdkconfig.defaults;
|
||||||
|
|
||||||
print_status "Building a project with CMake and PSRAM workaround, all files compile with workaround"
|
print_status "Building a project with CMake and PSRAM workaround, all files compile with workaround"
|
||||||
cp sdkconfig sdkconfig.psram
|
|
||||||
rm -rf build
|
rm -rf build
|
||||||
echo "CONFIG_SPIRAM_SUPPORT=y" >> sdkconfig.psram
|
echo "CONFIG_SPIRAM_SUPPORT=y" >> sdkconfig.defaults
|
||||||
echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> sdkconfig.psram
|
echo "CONFIG_SPIRAM_CACHE_WORKAROUND=y" >> sdkconfig.defaults
|
||||||
# note: we do 'reconfigure' here, as we just need to run cmake
|
# note: we do 'reconfigure' here, as we just need to run cmake
|
||||||
idf.py reconfigure -D SDKCONFIG="`pwd`/sdkconfig.psram"
|
idf.py reconfigure -D SDKCONFIG_DEFAULTS="`pwd`/sdkconfig.defaults"
|
||||||
grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
|
grep -q '"command"' build/compile_commands.json || failure "compile_commands.json missing or has no no 'commands' in it"
|
||||||
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
|
(grep '"command"' build/compile_commands.json | grep -v mfix-esp32-psram-cache-issue) && failure "All commands in compile_commands.json should use PSRAM cache workaround"
|
||||||
rm sdkconfig.psram
|
rm sdkconfig.defaults
|
||||||
|
|
||||||
|
print_status "Make sure a full build never runs '/usr/bin/env python' or similar"
|
||||||
|
OLDPATH="$PATH"
|
||||||
|
PYTHON="$(which python)"
|
||||||
|
rm -rf build
|
||||||
|
cat > ./python << EOF
|
||||||
|
#!/bin/sh
|
||||||
|
echo "The build system has executed '/usr/bin/env python' or similar"
|
||||||
|
exit 1
|
||||||
|
EOF
|
||||||
|
chmod +x ./python
|
||||||
|
export PATH="$(pwd):$PATH"
|
||||||
|
${PYTHON} $IDF_PATH/tools/idf.py build || failure "build failed"
|
||||||
|
export PATH="$OLDPATH"
|
||||||
|
rm ./python
|
||||||
|
|
||||||
print_status "All tests completed"
|
print_status "All tests completed"
|
||||||
if [ -n "${FAILURES}" ]; then
|
if [ -n "${FAILURES}" ]; then
|
||||||
|
|
|
@ -132,7 +132,8 @@ function(kconfig_process_config)
|
||||||
COMMAND ${CMAKE_COMMAND} -E env
|
COMMAND ${CMAKE_COMMAND} -E env
|
||||||
"COMPONENT_KCONFIGS=${kconfigs}"
|
"COMPONENT_KCONFIGS=${kconfigs}"
|
||||||
"COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}"
|
"COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}"
|
||||||
${IDF_PATH}/tools/kconfig_new/confserver.py --kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG}
|
${PYTHON} ${IDF_PATH}/tools/kconfig_new/confserver.py
|
||||||
|
--kconfig ${IDF_PATH}/Kconfig --config ${SDKCONFIG}
|
||||||
VERBATIM
|
VERBATIM
|
||||||
USES_TERMINAL)
|
USES_TERMINAL)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue