diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-01 20:31:48 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-05 00:48:22 +0300 |
| commit | 2ff69b20df0864182fdf2b146d29dc67d0cb9a5b (patch) | |
| tree | 9484afc57816b7a801fd44fd7164c4e68695b669 /mesonbuild | |
| parent | 1c6b8b72cb2b55a65d0a0784bb16acef58dc66c4 (diff) | |
| download | meson-2ff69b20df0864182fdf2b146d29dc67d0cb9a5b.zip meson-2ff69b20df0864182fdf2b146d29dc67d0cb9a5b.tar.gz meson-2ff69b20df0864182fdf2b146d29dc67d0cb9a5b.tar.bz2 | |
Fix handling generated .desktop files. Closes #4304.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/i18n.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 0fc052b..8b5e181 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -82,17 +82,19 @@ class I18nModule(ExtensionModule): kwargs['command'] = command inputfile = kwargs['input'] - if isinstance(inputfile, str): - inputfile = mesonlib.File.from_source_file(state.environment.source_dir, + if hasattr(inputfile, 'held_object'): + ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, state.subproject, kwargs) + else: + if isinstance(inputfile, str): + inputfile = mesonlib.File.from_source_file(state.environment.source_dir, state.subdir, inputfile) - output = kwargs['output'] - ifile_abs = inputfile.absolute_path(state.environment.source_dir, - state.environment.build_dir) - values = mesonlib.get_filenames_templates_dict([ifile_abs], None) - outputs = mesonlib.substitute_values([output], values) - output = outputs[0] - - ct = build.CustomTarget(output + '_' + state.subdir + '_merge', state.subdir, state.subproject, kwargs) + output = kwargs['output'] + ifile_abs = inputfile.absolute_path(state.environment.source_dir, + state.environment.build_dir) + values = mesonlib.get_filenames_templates_dict([ifile_abs], None) + outputs = mesonlib.substitute_values([output], values) + output = outputs[0] + ct = build.CustomTarget(output + '_' + state.subdir + '_merge', state.subdir, state.subproject, kwargs) return ModuleReturnValue(ct, [ct]) @FeatureNewKwargs('i18n.gettext', '0.37.0', ['preset']) |