From 9ddbcd301a601ffb7a271ff583f0ef16464114f5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 29 Apr 2020 09:58:51 -0400 Subject: ExternalProgram: Do special windows tricks even when name is provided Closes: #7051 --- mesonbuild/dependencies/base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index c0ec089db..95a3956d9 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1800,6 +1800,10 @@ class ExternalProgram: self.name = name if command is not None: self.command = listify(command) + if mesonlib.is_windows(): + cmd = self.command[0] + args = self.command[1:] + self.command = self._search_windows_special_cases(name, cmd) + args else: all_search_dirs = [search_dir] if extra_search_dirs: -- cgit v1.2.3 From 4929547b535462f976c88912f7e941195d533183 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 29 Apr 2020 10:01:09 -0400 Subject: gnome: Print proper error when 'nsversion' or 'namespace' are missing --- mesonbuild/modules/gnome.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 14cb4c4c3..7629f1879 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -732,8 +732,12 @@ class GnomeModule(ExtensionModule): gir_dep, giscanner, gicompiler = self._get_gir_dep(state) - ns = kwargs.pop('namespace') - nsversion = kwargs.pop('nsversion') + ns = kwargs.get('namespace') + if not ns: + raise MesonException('Missing "namespace" keyword argument') + nsversion = kwargs.get('nsversion') + if not nsversion: + raise MesonException('Missing "nsversion" keyword argument') libsources = mesonlib.extract_as_list(kwargs, 'sources', pop=True) girfile = '%s-%s.gir' % (ns, nsversion) srcdir = os.path.join(state.environment.get_source_dir(), state.subdir) -- cgit v1.2.3