meson: use the new 'python' module instead of the 'python3' one. Closes #1455

The new python module, added with 0.46, works with Python 2 and 3 and
allows to pass a path for the interpreter to use, if the need arises.

Previously the meson build set PYTHON, used in the shebang line of
the scripts installed by glib, to the full path of the interpreter.
The new meson module doesn't expose that atm, but we should set it to
a executable name anyway, and not a full path.
This commit is contained in:
Christoph Reiter 2018-07-18 17:03:22 +02:00
parent ed6a29a5b9
commit 631c3534b7
4 changed files with 7 additions and 8 deletions

View File

@ -10,7 +10,7 @@ gdbus_codegen_files = [
gdbus_codegen_conf = configuration_data()
gdbus_codegen_conf.set('VERSION', glib_version)
gdbus_codegen_conf.set('PYTHON', python.path())
gdbus_codegen_conf.set('PYTHON', python_name)
gdbus_codegen_conf.set('DATADIR', glib_datadir)
# Install gdbus-codegen executable

View File

@ -92,7 +92,7 @@ python_tools = [
python_tools_conf = configuration_data()
python_tools_conf.set('VERSION', glib_version)
python_tools_conf.set('PYTHON', python.path())
python_tools_conf.set('PYTHON', python_name)
foreach tool: python_tools
tool_bin = configure_file(

View File

@ -1,6 +1,3 @@
py3_mod = import('python3')
py3 = py3_mod.find_python()
gobject_tests = [
'qdata',
'boxed',
@ -82,8 +79,8 @@ test('signals', exe, env : test_env, suite : ['gobject'])
test(
'mkenums.py',
py3,
python,
args: files('mkenums.py'),
env: test_env,
suite: ['gobject'],
)
)

View File

@ -1800,7 +1800,9 @@ elif meson.get_cross_property('have_strlcpy', false)
glib_conf.set('HAVE_STRLCPY', 1)
endif
python = import('python3').find_python()
python = import('python').find_installation('python3')
# used for '#!/usr/bin/env <name>'
python_name = 'python3'
# Determine which user environment-dependent files that we want to install
have_bash = find_program('bash', required : false).found() # For completion scripts