From: Angus Gratton Date: Wed, 5 Sep 2018 02:35:04 +0000 (+0800) Subject: Merge branch 'master' into feature/cmake X-Git-Tag: v3.2-beta1~205^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b355854d4de8ad8c6debd9ebbabfc28f420d4cc5;p=esp-idf Merge branch 'master' into feature/cmake --- b355854d4de8ad8c6debd9ebbabfc28f420d4cc5 diff --cc .gitlab-ci.yml index 9532a662f3,8fef09d06d..0f735b1f5a --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@@ -578,22 -546,8 +573,22 @@@ check_permissions script: - tools/ci/check-executable.sh +check_examples_cmake_make: + stage: deploy + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG + tags: + - build + except: + - master + - /^release\/v/ + - /^v\d+\.\d+(\.\d+)?($|-)/ + dependencies: [] + before_script: *do_nothing_before + script: + - tools/ci/check_examples_cmake_make.sh + check_submodule_sync: - stage: deploy + stage: check image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build diff --cc components/bootloader/subproject/main/esp32.bootloader.ld index d44295115e,384488125b..1a182acb5e --- a/components/bootloader/subproject/main/esp32.bootloader.ld +++ b/components/bootloader/subproject/main/esp32.bootloader.ld @@@ -41,18 -41,19 +41,19 @@@ SECTION *(.iram1 .iram1.*) /* catch stray IRAM_ATTR */ *liblog.a:(.literal .text .literal.* .text.*) *libgcc.a:(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_common.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_flash.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_random.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_utility.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:bootloader_sha.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:efuse.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:esp_image_format.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:flash_encrypt.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:flash_partitions.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:secure_boot.o(.literal .text .literal.* .text.*) - *libbootloader_support.a:secure_boot_signatures.o(.literal .text .literal.* .text.*) - *libmicro-ecc.a:*.o(.literal .text .literal.* .text.*) - *libspi_flash.a:*.o(.literal .text .literal.* .text.*) ++ *libbootloader_support.a:bootloader_common.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_flash.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_random.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_utility.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:bootloader_sha.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:efuse.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:esp_image_format.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:flash_encrypt.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:flash_partitions.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:secure_boot.*(.literal .text .literal.* .text.*) + *libbootloader_support.a:secure_boot_signatures.*(.literal .text .literal.* .text.*) + *libmicro-ecc.a:*.*(.literal .text .literal.* .text.*) + *libspi_flash.a:*.*(.literal .text .literal.* .text.*) *(.fini.literal) *(.fini) *(.gnu.version) diff --cc docs/conf_common.py index 86073c6cfa,4ac06b7f78..25f048adf2 --- a/docs/conf_common.py +++ b/docs/conf_common.py @@@ -40,25 -45,12 +45,22 @@@ if os.system("doxygen ../Doxyfile") != copy_if_modified('xml/', 'xml_in/') # Generate 'api_name.inc' files using the XML files by Doxygen - if os.system('python ../gen-dxd.py') != 0: - raise RuntimeError('gen-dxd.py failed') + call_with_python('../gen-dxd.py') # Generate 'kconfig.inc' file from components' Kconfig files +print("Generating kconfig.inc from kconfig contents") kconfig_inc_path = '{}/inc/kconfig.inc'.format(builddir) -call_with_python('../gen-kconfig-doc.py > ' + kconfig_inc_path + '.in') - +temp_sdkconfig_path = '{}/sdkconfig.tmp'.format(builddir) +kconfigs = subprocess.check_output(["find", "../../components", "-name", "Kconfig"]).decode() +kconfig_projbuilds = subprocess.check_output(["find", "../../components", "-name", "Kconfig.projbuild"]).decode() - confgen_args = ["python", ++call_with_python(" ".join( + "../../tools/kconfig_new/confgen.py", + "--kconfig", "../../Kconfig", + "--config", temp_sdkconfig_path, + "--create-config-if-missing", + "--env", "COMPONENT_KCONFIGS={}".format(kconfigs), + "--env", "COMPONENT_KCONFIGS_PROJBUILD={}".format(kconfig_projbuilds), - "--output", "docs", kconfig_inc_path + '.in' - ] - subprocess.check_call(confgen_args) ++ "--output", "docs", kconfig_inc_path + '.in')) copy_if_modified(kconfig_inc_path + '.in', kconfig_inc_path) # Generate 'esp_err_defs.inc' file with ESP_ERR_ error code definitions diff --cc examples/wifi/getting_started/softAP/CMakeLists.txt index 57158b16b8,0000000000..57158b16b8 mode 100644,000000..100644 --- a/examples/wifi/getting_started/softAP/CMakeLists.txt +++ b/examples/wifi/getting_started/softAP/CMakeLists.txt diff --cc tools/ci/executable-list.txt index 3579a6e9dc,0ad9b5e6a9..e240013c05 --- a/tools/ci/executable-list.txt +++ b/tools/ci/executable-list.txt @@@ -37,27 -31,15 +37,29 @@@ tools/idf.p tools/idf_monitor.py tools/idf_size.py tools/kconfig/check.sh +tools/kconfig/conf tools/kconfig/lxdialog/check-lxdialog.sh +tools/kconfig/mconf tools/kconfig/merge_config.sh tools/kconfig/streamline_config.pl -tools/kconfig/conf -tools/kconfig/mconf -tools/windows/eclipse_make.sh -tools/test_idf_monitor/run_test_idf_monitor.py +tools/kconfig_new/confgen.py +tools/kconfig_new/confserver.py +tools/kconfig_new/test/test_confserver.py tools/mass_mfg/mfg_gen.py +tools/test_idf_monitor/run_test_idf_monitor.py tools/unit-test-app/unit_test.py +tools/windows/eclipse_make.sh +tools/ci/build_examples_cmake.sh +tools/ci/test_build_system_cmake.sh +tools/ci/check_examples_cmake_make.sh +tools/cmake/convert_to_cmake.py +tools/cmake/run_cmake_lint.sh +tools/idf.py +tools/kconfig_new/confgen.py +tools/kconfig_new/confserver.py +tools/kconfig_new/test/test_confserver.py +tools/windows/tool_setup/build_installer.sh tools/test_idf_size/test.sh + tools/check_python_dependencies.py + docs/gen-dxd.py + diff --cc tools/kconfig/Makefile index c8f8ba0141,68029f257d..cd00640430 --- a/tools/kconfig/Makefile +++ b/tools/kconfig/Makefile @@@ -165,23 -161,14 +165,23 @@@ check-lxdialog := $(SRCDIR)/lxdialog/c # Use recursively expanded variables so we do not call gcc unless # we really need to do so. (Do not call gcc as part of make mrproper) CFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ - -DLOCALE -MD + -DLOCALE -MMD +%.o: $(SRCDIR)/%.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + +lxdialog/%.o: $(SRCDIR)/lxdialog/%.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + +%.o: %.c + $(CC) -I $(SRCDIR) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ + # =========================================================================== # Shared Makefile for the various kconfig executables: -# conf: Used for defconfig, oldconfig and related targets +# conf-idf: Used for defconfig, oldconfig and related targets # nconf: Used for the nconfig target. # Utilizes ncurses -# mconf: Used for the menuconfig target +# mconf-idf: Used for the menuconfig target # Utilizes the lxdialog package # qconf: Used for the xconfig target # Based on Qt which needs to be installed to compile it