From e1b138a21b45fe9b55f3bb7d9b1e0bbbd45a7609 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Tue, 13 Mar 2018 21:01:09 +0100 Subject: Implement a generic python module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With contributions from Håvard Graff --- test cases/python/1 extmodule/blaster.py | 14 +++++ test cases/python/1 extmodule/ext/meson.build | 6 +++ test cases/python/1 extmodule/ext/tachyon_module.c | 59 ++++++++++++++++++++++ test cases/python/1 extmodule/meson.build | 23 +++++++++ test cases/python/1 extmodule/meson_options.txt | 3 ++ 5 files changed, 105 insertions(+) create mode 100755 test cases/python/1 extmodule/blaster.py create mode 100644 test cases/python/1 extmodule/ext/meson.build create mode 100644 test cases/python/1 extmodule/ext/tachyon_module.c create mode 100644 test cases/python/1 extmodule/meson.build create mode 100644 test cases/python/1 extmodule/meson_options.txt (limited to 'test cases/python') diff --git a/test cases/python/1 extmodule/blaster.py b/test cases/python/1 extmodule/blaster.py new file mode 100755 index 000000000..163b6d426 --- /dev/null +++ b/test cases/python/1 extmodule/blaster.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python + +import sys +import tachyon + +result = tachyon.phaserize('shoot') + +if not isinstance(result, int): + print('Returned result not an integer.') + sys.exit(1) + +if result != 1: + print('Returned result {} is not 1.'.format(result)) + sys.exit(1) diff --git a/test cases/python/1 extmodule/ext/meson.build b/test cases/python/1 extmodule/ext/meson.build new file mode 100644 index 000000000..b13bb326f --- /dev/null +++ b/test cases/python/1 extmodule/ext/meson.build @@ -0,0 +1,6 @@ +pylib = py.extension_module('tachyon', + 'tachyon_module.c', + dependencies : py_dep, +) + +pypathdir = meson.current_build_dir() diff --git a/test cases/python/1 extmodule/ext/tachyon_module.c b/test cases/python/1 extmodule/ext/tachyon_module.c new file mode 100644 index 000000000..68eda5380 --- /dev/null +++ b/test cases/python/1 extmodule/ext/tachyon_module.c @@ -0,0 +1,59 @@ +/* + Copyright 2018 The Meson development team + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +/* A very simple Python extension module. */ + +#include +#include + +static PyObject* phaserize(PyObject *self, PyObject *args) { + const char *message; + int result; + + if(!PyArg_ParseTuple(args, "s", &message)) + return NULL; + + result = strcmp(message, "shoot") ? 0 : 1; +#if PY_VERSION_HEX < 0x03000000 + return PyInt_FromLong(result); +#else + return PyLong_FromLong(result); +#endif +} + +static PyMethodDef TachyonMethods[] = { + {"phaserize", phaserize, METH_VARARGS, + "Shoot tachyon cannons."}, + {NULL, NULL, 0, NULL} +}; + +#if PY_VERSION_HEX < 0x03000000 +PyMODINIT_FUNC inittachyon(void) { + Py_InitModule("tachyon", TachyonMethods); +} +#else +static struct PyModuleDef tachyonmodule = { + PyModuleDef_HEAD_INIT, + "tachyon", + NULL, + -1, + TachyonMethods +}; + +PyMODINIT_FUNC PyInit_tachyon(void) { + return PyModule_Create(&tachyonmodule); +} +#endif diff --git a/test cases/python/1 extmodule/meson.build b/test cases/python/1 extmodule/meson.build new file mode 100644 index 000000000..0e24a70d9 --- /dev/null +++ b/test cases/python/1 extmodule/meson.build @@ -0,0 +1,23 @@ +project('Python extension module', 'c', + default_options : ['buildtype=release']) + +py_mod = import('python') + +py = py_mod.find(get_option('python'), required : false) + +if py.found() + py_dep = py.dependency() + + if py_dep.found() + subdir('ext') + + test('extmod', + py, + args : files('blaster.py'), + env : ['PYTHONPATH=' + pypathdir]) + else + error('MESON_SKIP_TEST: Python libraries not found, skipping test.') + endif +else + error('MESON_SKIP_TEST: Python not found, skipping test.') +endif diff --git a/test cases/python/1 extmodule/meson_options.txt b/test cases/python/1 extmodule/meson_options.txt new file mode 100644 index 000000000..b8f645d09 --- /dev/null +++ b/test cases/python/1 extmodule/meson_options.txt @@ -0,0 +1,3 @@ +option('python', type: 'string', + description: 'Name of or path to the python executable' +) -- cgit v1.2.3 From 33abe0cf5576a094c565560e3e34a6457c14ad5e Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Mon, 9 Apr 2018 02:15:45 +0200 Subject: [fixup]: Rename find to find_installation --- mesonbuild/modules/python.py | 8 ++++---- test cases/python/1 extmodule/meson.build | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'test cases/python') diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 473465452..e4f2ce83e 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -224,7 +224,7 @@ print (json.dumps(sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', ' ''' -class PythonHolder(ExternalProgramHolder, InterpreterObject): +class PythonInstallation(ExternalProgramHolder, InterpreterObject): def __init__(self, interpreter, python): InterpreterObject.__init__(self) ExternalProgramHolder.__init__(self, python) @@ -365,7 +365,7 @@ class PythonHolder(ExternalProgramHolder, InterpreterObject): class PythonModule(ExtensionModule): def __init__(self): super().__init__() - self.snippets.add('find') + self.snippets.add('find_installation') # https://www.python.org/dev/peps/pep-0397/ def _get_win_pythonpath(self, name_or_path): @@ -381,7 +381,7 @@ class PythonModule(ExtensionModule): return None @permittedSnippetKwargs(['required']) - def find(self, interpreter, state, args, kwargs): + def find_installation(self, interpreter, state, args, kwargs): required = kwargs.get('required', True) if not isinstance(required, bool): raise InvalidArguments('"required" argument must be a boolean.') @@ -428,7 +428,7 @@ class PythonModule(ExtensionModule): if not version: res = ExternalProgramHolder(NonExistingExternalProgram()) else: - res = PythonHolder(interpreter, python) + res = PythonInstallation(interpreter, python) return res diff --git a/test cases/python/1 extmodule/meson.build b/test cases/python/1 extmodule/meson.build index 0e24a70d9..479865482 100644 --- a/test cases/python/1 extmodule/meson.build +++ b/test cases/python/1 extmodule/meson.build @@ -3,7 +3,7 @@ project('Python extension module', 'c', py_mod = import('python') -py = py_mod.find(get_option('python'), required : false) +py = py_mod.find_installation(get_option('python'), required : false) if py.found() py_dep = py.dependency() -- cgit v1.2.3