diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-28 18:56:54 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-29 23:33:21 +0200 |
| commit | fe3efe0bc6f0bb0f282a2d1f7db4e72f16a3f51c (patch) | |
| tree | d9a447a0f8657b2bff9cb07ea0204277e461bd19 | |
| parent | a52cd31a6ccc784cdcacebdb33719b223202f35d (diff) | |
| download | meson-fe3efe0bc6f0bb0f282a2d1f7db4e72f16a3f51c.zip meson-fe3efe0bc6f0bb0f282a2d1f7db4e72f16a3f51c.tar.gz meson-fe3efe0bc6f0bb0f282a2d1f7db4e72f16a3f51c.tar.bz2 | |
Fix merge file using an array. Closes #4424.
| -rw-r--r-- | mesonbuild/modules/i18n.py | 4 | ||||
| -rw-r--r-- | test cases/frameworks/6 gettext/data/meson.build | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index cde548f..aeab813 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -85,6 +85,10 @@ class I18nModule(ExtensionModule): 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 0a7811b..d78c19e 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', |