From 6eeecb8585aed84759f968efb315e97db0cc8e52 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 1 Nov 2016 11:59:59 +0000 Subject: [PATCH] gtkdochelper: Add 'overrides.txt' to the content files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a `-overrides.txt` file exists in the docs directory it means it's intended to be used in place of the one gtk-doc generates. GLib and GTK+, for instance, ship with one because some of the types they provide — like the thread primitives, or the platform macros — contain architecture-dependent fields that should not be accessed directly. This commit should close the last bit of issue #550. --- mesonbuild/scripts/gtkdochelper.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 53b1c320c..4f8a9a50a 100755 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -69,6 +69,10 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdir, if os.path.exists(sections): content_files.append(sections) + overrides = os.path.join(doc_src, module + "-overrides.txt") + if os.path.exists(overrides): + content_files.append(overrides) + # Copy files to build directory for f in content_files: f_abs = os.path.join(doc_src, f)