scripts: accept the path of the gettext commands to run as an argument

Don't assume itstool, msgfmt et al. are just magically on the path.
Normally for commands being processed in build.ninja we'd look up the
program in order to run it. Offer the same guarantee for programs being
passed through an awkward script wrapper.

1 files changed, 5 insertions, 2 deletions

diff --git a/mesonbuild/scripts/itstool.py b/mesonbuild/scripts/itstool.py
index fa3b0fa..72ac3e5 100644
--- a/mesonbuild/scripts/itstool.py
+++ b/mesonbuild/scripts/itstool.py
@@ -24,11 +24,13 @@ parser.add_argument('command')
 parser.add_argument('--build-dir', default='')
 parser.add_argument('-i', '--input', default='')
 parser.add_argument('-o', '--output', default='')
+parser.add_argument('--itstool', default='itstool')
 parser.add_argument('--its', action='append', default=[])
 parser.add_argument('mo_files', nargs='+')
 
 
-def run_join(build_dir: str, its_files: T.List[str], mo_files: T.List[str], in_fname: str, out_fname: str) -> int:
+def run_join(build_dir: str, itstool: str, its_files: T.List[str], mo_files: T.List[str],
+             in_fname: str, out_fname: str) -> int:
     if not mo_files:
         print('No mo files specified to use for translation.')
         return 1
@@ -53,7 +55,7 @@ def run_join(build_dir: str, its_files: T.List[str], mo_files: T.List[str], in_f
             shutil.copy(mo_file, tmp_mo_fname)
             locale_mo_files.append(tmp_mo_fname)
 
-        cmd = ['itstool']
+        cmd = [itstool]
         if its_files:
             for fname in its_files:
                 cmd.extend(['-i', fname])
@@ -73,6 +75,7 @@ def run(args: T.List[str]) -> int:
 
     if command == 'join':
         return run_join(build_dir,
+                        options.itstool,
                         options.its,
                         options.mo_files,
                         options.input,