uninstalled: Fix meson detection when using meson from a git checkout

This would not trigger on the build bot because there is
special casing in the code for a meson checkout underneath
gst-build. Fix needed as mesonintrospect.py was changed into
'meson.py introspect' in recent meson versions. When using
meson from git to configure the build the uninstalled script
would pick up a system meson instead which then would then
error out parsing the coredata from the newer meson.
This commit is contained in:
Tim-Philipp Müller 2018-06-12 15:03:03 +01:00
parent 3942dc262b
commit 62f1739133

View file

@ -67,7 +67,7 @@ def get_meson():
continue
if os.path.exists (comp):
mesondir = os.path.dirname(comp)
if mesonintrospect.endswith('.py'):
if mesonintrospect.endswith('.py') or mesonintrospect.endswith('.py introspect'):
meson = os.path.join(mesondir, 'meson.py')
else:
meson = os.path.join(mesondir, 'meson')