diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2018-04-12 20:06:44 (GMT) |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2018-04-12 20:06:44 (GMT) |
| commit | 56b55490167e165b70dd591da13468cdace315b8 (patch) | |
| tree | 0282666683cf4251e9bf61a77b48e13f99c781e7 /src/engine/SCons/Tool/msgmerge.py | |
| parent | bb90373027f3da405f5c5bde4094565dd8c5de06 (diff) | |
| download | SCons-56b55490167e165b70dd591da13468cdace315b8.zip SCons-56b55490167e165b70dd591da13468cdace315b8.tar.gz SCons-56b55490167e165b70dd591da13468cdace315b8.tar.bz2 | |
updated gettext tools to work on windows cygwin and mingw environments.
Diffstat (limited to 'src/engine/SCons/Tool/msgmerge.py')
| -rw-r--r-- | src/engine/SCons/Tool/msgmerge.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/msgmerge.py b/src/engine/SCons/Tool/msgmerge.py index 11d7b48..76661d2 100644 --- a/src/engine/SCons/Tool/msgmerge.py +++ b/src/engine/SCons/Tool/msgmerge.py @@ -68,8 +68,21 @@ def _POUpdateBuilderWrapper(env, target=None, source=_null, **kw): ############################################################################# def generate(env,**kw): - """ Generate the `xgettext` tool """ + """ Generate the `msgmerge` tool """ + import sys + import os + import SCons.Tool from SCons.Tool.GettextCommon import _detect_msgmerge + from SCons.Platform.mingw import MINGW_DEFAULT_PATHS + from SCons.Platform.cygwin import CYGWIN_DEFAULT_PATHS + + if sys.platform == 'win32': + msgmerge = SCons.Tool.find_program_path(env, 'msgmerge', default_paths=MINGW_DEFAULT_PATHS + CYGWIN_DEFAULT_PATHS ) + if msgmerge: + msgmerge_bin_dir = os.path.dirname(msgmerge) + env.AppendENVPath('PATH', msgmerge_bin_dir) + else: + SCons.Warnings.Warning('msgmerge tool requested, but binary not found in ENV PATH') try: env['MSGMERGE'] = _detect_msgmerge(env) except: |