[glib/wip/pwithnall/meson-cleanups: 29/31] build: Specify all inputs to concat-files-helper.py




commit a684d078d3a1361169b1918b4c218a2fbd90117c
Author: Philip Withnall <pwithnall endlessos org>
Date:   Thu May 12 11:17:51 2022 +0100

    build: Specify all inputs to concat-files-helper.py
    
    Since Meson 0.52, a list of inputs is correctly supported, so our
    workaround can be removed.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 docs/reference/gio/meson.build | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
index 20e24ba091..723d6a8ddd 100644
--- a/docs/reference/gio/meson.build
+++ b/docs/reference/gio/meson.build
@@ -147,16 +147,11 @@ 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[0],
-    command : [concat_files_helper, '@OUTPUT@'] + sections_files,
+    input : sections_files,
+    command : [concat_files_helper, '@OUTPUT@', '@INPUT@'],
   )
 
   configure_file(


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