diff options
| author | Patrick Griffis <tingping@tingping.se> | 2017-04-07 20:57:52 -0400 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2017-04-29 04:05:20 -0400 |
| commit | 82492f5d765b70cc87385fb887008df89fac878e (patch) | |
| tree | 710ea8d1d61e53607abc3e870980aea3c062fef6 /mesonbuild/modules/i18n.py | |
| parent | 3e2c3c9ff052736a05554fb8f14cf21e05c3bab5 (diff) | |
| download | meson-82492f5d765b70cc87385fb887008df89fac878e.zip meson-82492f5d765b70cc87385fb887008df89fac878e.tar.gz meson-82492f5d765b70cc87385fb887008df89fac878e.tar.bz2 | |
i18n: Add data_dirs kwarg to merge_file()
For parity with gettext()
Fixes #1565
Diffstat (limited to 'mesonbuild/modules/i18n.py')
| -rw-r--r-- | mesonbuild/modules/i18n.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 5738cb3..78112fc 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -60,8 +60,15 @@ class I18nModule(ExtensionModule): if file_type not in VALID_TYPES: raise MesonException('i18n: "{}" is not a valid type {}'.format(file_type, VALID_TYPES)) - kwargs['command'] = ['msgfmt', '--' + file_type, - '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@'] + datadirs = mesonlib.stringlistify(kwargs.pop('data_dirs', [])) + datadirs = '--datadirs=' + ':'.join(datadirs) if datadirs else None + + command = [state.environment.get_build_command(), '--internal', 'msgfmthelper', + '@INPUT@', '@OUTPUT@', file_type, podir] + if datadirs: + command.append(datadirs) + + kwargs['command'] = command ct = build.CustomTarget(kwargs['output'] + '_merge', state.subdir, kwargs) return ModuleReturnValue(ct, [ct]) |