From: Marin <marin.jurjevic@hotmail.com>
Date: Tue, 15 Sep 2020 14:30:26 +0000 (+0200)
Subject: Fix doxygen base path resolution.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=49186598c89d739ebe1b149e460cf38f8bd360fb;p=blog.git

Fix doxygen base path resolution.

Use top-level doxygen path as base path. In case of recursive descent,
don't allow base path to be overriden.
---

diff --git a/documentation/doxygen.py b/documentation/doxygen.py
index 4ca2e45b..2276e412 100755
--- a/documentation/doxygen.py
+++ b/documentation/doxygen.py
@@ -3354,7 +3354,10 @@ def parse_index_xml(state: State, xml):
     return parsed
 
 def parse_doxyfile(state: State, doxyfile, values = None):
-    state.basedir = os.path.dirname(doxyfile)
+    # Use top-level Doxyfile path as base, don't let it get overriden by
+    # subsequently @INCLUDE'd Doxyfile
+    if not state.basedir:
+        state.basedir = os.path.dirname(doxyfile)
 
     logging.debug("Parsing configuration from {}".format(doxyfile))