[glib/glib-2-62: 1/2] Fix doc build on Windows



commit c89a8efe1afa9b10dfffe1b468316cad87d00242
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Fri Sep 6 16:21:03 2019 -0400

    Fix doc build on Windows
    
    This is a work around for this Meson bug:
    https://github.com/mesonbuild/meson/issues/5893
    
    Closes: #1888

 docs/reference/gio/meson.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index 860ab4d08..f8805a575 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -141,11 +141,16 @@ if get_option('gtk_doc')
     configuration: version_conf
   )
 
+  # FIXME: configure_file() does not support more than one file in input
+  # argument. If input argument is omitted then meson checks that all items in
+  # the command array are strings. But if we have an input then extra files
+  # can be passed in command array.
+  # See https://github.com/mesonbuild/meson/issues/5893
   concat_files_helper = find_program('concat-files-helper.py')
   configure_file(
     output : 'gio-sections.txt',
-    input : sections_files,
-    command : [concat_files_helper, '@OUTPUT@', '@INPUT@'],
+    input : sections_files[0],
+    command : [concat_files_helper, '@OUTPUT@'] + sections_files,
   )
 
   configure_file(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]