summaryrefslogtreecommitdiff
path: root/mesonbuild/mintro.py
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-05-06 20:12:17 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-05-06 20:25:16 +0530
commit26aeef7bf5243b9003648b272b956ff760f21f35 (patch)
treedc88cc8506a669ee7efdacf15bd18507348c49f2 /mesonbuild/mintro.py
parentc1f275bfa644beafab9f8572351d4b64d61c148b (diff)
downloadmeson-nirbheek/fix-gtkdoc-content-files-File.tar.gz
gnome.gdbus_codegen: Fix output file list for docbook custom targetsnirbheek/fix-gtkdoc-content-files-File
We were setting it to a totally wrong name, while the output of gtkdoc is very predictable. Also add a test for it, and fix a bug in meson introspect found while adding the test. The test will only work with glib 2.56.2, so it will be skipped on the CI. I ran it manually to verify that it works.
Diffstat (limited to 'mesonbuild/mintro.py')
-rw-r--r--mesonbuild/mintro.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index 5a9d4cfa9..81c70ed07 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -21,6 +21,7 @@ project files and don't need this info."""
import json
from . import build, mtest, coredata as cdata
+from . import mesonlib
from .backend import ninjabackend
import argparse
import sys, os
@@ -118,8 +119,12 @@ def list_target_files(target_name, coredata, builddata):
except KeyError:
print("Unknown target %s." % target_name)
sys.exit(1)
- sources = [os.path.join(i.subdir, i.fname) for i in sources]
- print(json.dumps(sources))
+ out = []
+ for i in sources:
+ if isinstance(i, mesonlib.File):
+ i = os.path.join(i.subdir, i.fname)
+ out.append(i)
+ print(json.dumps(out))
def list_buildoptions(coredata, builddata):
optlist = []