From 44e4535c903f005ebf9c3eca4a9db29d0d45ade0 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 14 Sep 2018 09:42:57 +1000 Subject: [PATCH] docs: Set a default IDF_PATH in docs build (needed for RTD) RTD builds don't set IDF_PATH, mqtt component uses this variable. --- docs/conf_common.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/conf_common.py b/docs/conf_common.py index e90762623..1ff9d351d 100644 --- a/docs/conf_common.py +++ b/docs/conf_common.py @@ -27,10 +27,17 @@ import shlex from local_util import run_cmd_get_output, copy_if_modified -builddir = '_build' -builddir = builddir -if 'BUILDDIR' in os.environ: + +try: builddir = os.environ['BUILDDIR'] +except KeyError: + builddir = '_build' + +# Fill in a default IDF_PATH if it's missing (ie when Read The Docs is building the docs) +try: + idf_path = os.environ['IDF_PATH'] +except KeyError: + idf_path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..')) def call_with_python(cmd): # using sys.executable ensures that the scripts are called with the same Python interpreter @@ -62,6 +69,7 @@ confgen_args = [sys.executable, "--create-config-if-missing", "--env", "COMPONENT_KCONFIGS={}".format(kconfigs), "--env", "COMPONENT_KCONFIGS_PROJBUILD={}".format(kconfig_projbuilds), + "--env", "IDF_PATH={}".format(idf_path), "--output", "docs", kconfig_inc_path + '.in' ] subprocess.check_call(confgen_args)