From fe3efe0bc6f0bb0f282a2d1f7db4e72f16a3f51c Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 28 Oct 2018 18:56:54 +0200 Subject: [PATCH] Fix merge file using an array. Closes #4424. --- mesonbuild/modules/i18n.py | 4 ++++ test cases/frameworks/6 gettext/data/meson.build | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index cde548fd2f99..aeab8132d907 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -85,6 +85,10 @@ def merge_file(self, state, args, kwargs): if hasattr(inputfile, 'held_object'): ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, state.subproject, kwargs) else: + if isinstance(inputfile, list): + # We only use this input file to create a name of the custom target. + # Thus we can ignore the other entries. + inputfile = inputfile[0] if isinstance(inputfile, str): inputfile = mesonlib.File.from_source_file(state.environment.source_dir, state.subdir, inputfile) diff --git a/test cases/frameworks/6 gettext/data/meson.build b/test cases/frameworks/6 gettext/data/meson.build index 0a7811bda240..d78c19e6a5d7 100644 --- a/test cases/frameworks/6 gettext/data/meson.build +++ b/test cases/frameworks/6 gettext/data/meson.build @@ -10,7 +10,7 @@ i18n.merge_file( # Use filename substitution for another file i18n.merge_file( - input: 'test2.desktop.in', + input: files('test2.desktop.in'), output: '@BASENAME@', type: 'desktop', po_dir: '../po',