diff options
| author | Sergey Shatunov <me@prok.pw> | 2018-05-15 23:30:14 +0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-26 23:29:05 +0200 |
| commit | c07e5124bcb2eb5f4a078fe537d42c5ff64e60af (patch) | |
| tree | 06d99171a9a9404213e5a06e2200ed21026a570c | |
| parent | 28edc7ef61f6c4cdc74f68128a4b3f97bda060a6 (diff) | |
| download | meson-c07e5124bcb2eb5f4a078fe537d42c5ff64e60af.zip meson-c07e5124bcb2eb5f4a078fe537d42c5ff64e60af.tar.gz meson-c07e5124bcb2eb5f4a078fe537d42c5ff64e60af.tar.bz2 | |
Add install_dir to i18n.gettext
| -rw-r--r-- | docs/markdown/i18n-module.md | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/i18n.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/markdown/i18n-module.md b/docs/markdown/i18n-module.md index 88f059b..9053edc 100644 --- a/docs/markdown/i18n-module.md +++ b/docs/markdown/i18n-module.md @@ -29,6 +29,7 @@ argument which is the name of the gettext module. [source](https://github.com/mesonbuild/meson/blob/master/mesonbuild/modules/i18n.py) for for their value * `install`: (*Added 0.43.0*) if false, do not install the built translations. +* `install_dir`: (*Added 0.50.0*) override default install location, default is `localedir` This function also defines targets for maintainers to use: **Note**: These output to the source directory diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index aeab813..4deb437 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -102,7 +102,8 @@ class I18nModule(ExtensionModule): return ModuleReturnValue(ct, [ct]) @FeatureNewKwargs('i18n.gettext', '0.37.0', ['preset']) - @permittedKwargs({'po_dir', 'data_dirs', 'type', 'languages', 'args', 'preset', 'install'}) + @FeatureNewKwargs('i18n.gettext', '0.50.0', ['install_dir']) + @permittedKwargs({'po_dir', 'data_dirs', 'type', 'languages', 'args', 'preset', 'install', 'install_dir'}) def gettext(self, state, args, kwargs): if len(args) != 1: raise coredata.MesonException('Gettext requires one positional argument (package name).') @@ -151,10 +152,11 @@ class I18nModule(ExtensionModule): install = kwargs.get('install', True) if install: + install_dir = kwargs.get('install_dir', state.environment.coredata.get_builtin_option('localedir')) script = state.environment.get_build_command() args = ['--internal', 'gettext', 'install', '--subdir=' + state.subdir, - '--localedir=' + state.environment.coredata.get_builtin_option('localedir'), + '--localedir=' + install_dir, pkg_arg] if lang_arg: args.append(lang_arg) |