Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gettext: Add ability to set GETTEXTDATADIRS 

Some projects use this to allow using local its files
This commit is contained in:
Patrick Griffis 2016-10-15 19:30:55 -04:00 committed by Jussi Pakkanen
parent a417efdf24
commit f30be6fb92
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/modules/i18n.py
View File

@ -24,8 +24,12 @@ class I18nModule:
languages = mesonlib.stringlistify(kwargs.get('languages', []))
if len(languages) == 0:
raise coredata.MesonException('List of languages empty.')
datadirs = mesonlib.stringlistify(kwargs.get('data_dirs', []))
extra_args = mesonlib.stringlistify(kwargs.get('args', []))
potargs = [state.environment.get_build_command(), '--internal', 'gettext', 'pot', packagename] + extra_args
potargs = [state.environment.get_build_command(), '--internal', 'gettext', 'pot', packagename]
if datadirs:
potargs.append('--datadirs=' + ':'.join(datadirs))
potargs += extra_args
pottarget = build.RunTarget(packagename + '-pot', sys.executable, potargs, [], state.subdir)
gmoargs = [state.environment.get_build_command(), '--internal', 'gettext', 'gen_gmo'] + languages
gmotarget = build.RunTarget(packagename + '-gmo', sys.executable, gmoargs, [], state.subdir)

14
mesonbuild/scripts/gettext.py
View File

@ -15,7 +15,7 @@
import os, subprocess, shutil
from mesonbuild.scripts import destdir_join
def run_potgen(src_sub, pkgname, args):
def run_potgen(src_sub, pkgname, datadirs, args):
listfile = os.path.join(src_sub, 'POTFILES')
if not os.path.exists(listfile):
listfile = os.path.join(src_sub, 'POTFILES.in')
@ -23,9 +23,14 @@ def run_potgen(src_sub, pkgname, args):
print('Could not find file POTFILES in %s' % src_sub)
return 1
child_env = os.environ.copy()
if datadirs:
child_env['GETTEXTDATADIRS'] = datadirs
ofile = os.path.join(src_sub, pkgname + '.pot')
return subprocess.call(['xgettext', '--package-name=' + pkgname, '-p', src_sub, '-f', listfile,
'-D', os.environ['MESON_SOURCE_ROOT'], '-k_', '-o', ofile] + args)
'-D', os.environ['MESON_SOURCE_ROOT'], '-k_', '-o', ofile] + args,
env=child_env)
def gen_gmo(src_sub, bld_sub, langs):
for l in langs:
@ -47,9 +52,12 @@ def do_install(src_sub, bld_sub, dest, pkgname, langs):
def run(args):
subcmd = args[0]
if subcmd == 'pot':
pkgname = args[1]
datadirs = args[2][11:] if args[2].startswith('--datadirs=') else None
extra_args = args[3:] if datadirs is not None else args[2:]
src_sub = os.path.join(os.environ['MESON_SOURCE_ROOT'], os.environ['MESON_SUBDIR'])
bld_sub = os.path.join(os.environ['MESON_BUILD_ROOT'], os.environ['MESON_SUBDIR'])
return run_potgen(src_sub, args[1], args[2:])
return run_potgen(src_sub, pkgname, datadirs, extra_args)
elif subcmd == 'gen_gmo':
src_sub = os.path.join(os.environ['MESON_SOURCE_ROOT'], os.environ['MESON_SUBDIR'])
bld_sub = os.path.join(os.environ['MESON_BUILD_ROOT'], os.environ['MESON_SUBDIR'])