Merge gettextarg branch.

mesonbuild/interpreter.py

@@ -1052,7 +1052,6 @@ class Interpreter():
                     raise InterpreterException('Tried to create target %s which already exists.' % v.name)
                 self.build.targets[v.name] = v
             elif isinstance(v, build.InstallScript):
-                print('x')
                 self.build.install_scripts.append(v)
             elif isinstance(v, build.Data):
                 self.build.data.append(v)

mesonbuild/modules/i18n.py

@@ -24,7 +24,8 @@ class I18nModule:
         languages = mesonlib.stringlistify(kwargs.get('languages', []))
         if len(languages) == 0:
             raise coredata.MesonException('List of languages empty.')
-        potargs = [state.environment.get_build_command(), '--internal', 'gettext', 'pot', packagename]
+        extra_args = mesonlib.stringlistify(kwargs.get('args', []))
+        potargs = [state.environment.get_build_command(), '--internal', 'gettext', 'pot', packagename] + 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)

mesonbuild/scripts/gettext.py

@@ -16,11 +16,11 @@
 
 import os, subprocess, shutil
 
-def run_potgen(src_sub, pkgname, langs):
+def run_potgen(src_sub, pkgname, args):
     listfile = os.path.join(src_sub, 'POTFILES')
     ofile = os.path.join(src_sub, pkgname + '.pot')
-    return subprocess.call(['xgettext', '--package-name=' + pkgname, '-p', src_sub, listfile,
-                            '-D', os.environ['MESON_SOURCE_ROOT'], '-k_', '-o', ofile])
+    return subprocess.call(['xgettext', '--package-name=' + pkgname, '-p', src_sub, '-f', listfile,
+                            '-D', os.environ['MESON_SOURCE_ROOT'], '-k_', '-o', ofile] + args)
 
 def gen_gmo(src_sub, bld_sub, langs):
     for l in langs: