aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-05-06 20:09:49 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-05-06 20:25:16 +0530
commitc1f275bfa644beafab9f8572351d4b64d61c148b (patch)
tree5e426407e55b89d51db50f131e1c29631f0ce5b9 /test cases
parentc5865c50c444912afd92c2feb94d8739874a62b2 (diff)
downloadmeson-c1f275bfa644beafab9f8572351d4b64d61c148b.zip
meson-c1f275bfa644beafab9f8572351d4b64d61c148b.tar.gz
meson-c1f275bfa644beafab9f8572351d4b64d61c148b.tar.bz2
gnome.gtkdoc: Allow passing file objects as xml_files
If we pass a source files() object, we will look for it in the build directory, which is wrong. If we pass a build files() object (from configure_file()), we will find it in the build directory, and then try to copy it on top of itself in gtkdochelper.py getting a SameFileError. Add a test for it, and also properly iterate custom target outputs when adding to content files.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/frameworks/10 gtk-doc/doc/meson.build7
1 files changed, 4 insertions, 3 deletions
diff --git a/test cases/frameworks/10 gtk-doc/doc/meson.build b/test cases/frameworks/10 gtk-doc/doc/meson.build
index 7aeb98d..60a494d 100644
--- a/test cases/frameworks/10 gtk-doc/doc/meson.build
+++ b/test cases/frameworks/10 gtk-doc/doc/meson.build
@@ -1,10 +1,11 @@
cdata = configuration_data()
cdata.set('VERSION', '1.0')
-configure_file(input : 'version.xml.in',
- output : 'version.xml',
- configuration : cdata)
+version_xml = configure_file(input : 'version.xml.in',
+ output : 'version.xml',
+ configuration : cdata)
gnome.gtkdoc('foobar',
+ version_xml,
src_dir : inc,
main_sgml : 'foobar-docs.sgml',
content_files : docbook,