commit 691d9f968ed78c0553ded464c839bd7697bc8334 Author: vaydheesh Date: Tue Jun 4 00:01:53 2019 +0000 2. Clean build setup.py: removed redundant libraries configure.ac: removed setup.py.in from ac_config to ac_output makefile.am: use $SWIG & $PYTHON diff --git a/configure.ac b/configure.ac index 4214c44..04ecc35 100644 --- a/configure.ac +++ b/configure.ac @@ -143,11 +143,10 @@ static_assert(!is_same::value, "size_t == uint64_t"); AM_PATH_PYTHON([2], [], [AC_MSG_WARN([Can't run 'make test' without Python installed.])]) AC_CONFIG_FILES([ - python/Makefile - python/setup.py - ]) -AX_PKG_SWIG(4.0.0) # check swig version -AX_SWIG_ENABLE_CXX # fill some variable usefull later -AX_SWIG_PYTHON # same - -AC_OUTPUT([Makefile lttoolbox.pc lttoolbox/Makefile]) + python/setup.py + ]) +AX_PKG_SWIG(4.0.0) +AX_SWIG_ENABLE_CXX +AX_SWIG_PYTHON + +AC_OUTPUT([Makefile lttoolbox.pc lttoolbox/Makefile python/Makefile]) diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 new file mode 100644 index 0000000..44dbd83 --- /dev/null +++ b/m4/ax_python_devel.m4 @@ -0,0 +1,327 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_DEVEL([version]) +# +# DESCRIPTION +# +# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it +# in your configure.ac. +# +# This macro checks for Python and tries to get the include path to +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output +# variables. It also exports $(PYTHON_EXTRA_LIBS) and +# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. +# +# You can search for some particular version of Python by passing a +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please +# note that you *have* to pass also an operator along with the version to +# match, and pay special attention to the single quotes surrounding the +# version number. Don't use "PYTHON_VERSION" for this: that environment +# variable is declared as precious and thus reserved for the end-user. +# +# This macro should work for all versions of Python >= 2.1.0. As an end +# user, you can disable the check for the python version by setting the +# PYTHON_NOVERSIONCHECK environment variable to something else than the +# empty string. +# +# If you need to use this macro for an older Python version, please +# contact the authors. We're always open for feedback. +# +# LICENSE +# +# Copyright (c) 2009 Sebastian Huber +# Copyright (c) 2009 Alan W. Irwin +# Copyright (c) 2009 Rafael Laboissiere +# Copyright (c) 2009 Andrew Collier +# Copyright (c) 2009 Matteo Settenvini +# Copyright (c) 2009 Horst Knorr +# Copyright (c) 2013 Daniel Mullner +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 21 + +AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) +AC_DEFUN([AX_PYTHON_DEVEL],[ + # + # Allow the use of a (user set) custom python version + # + AC_ARG_VAR([PYTHON_VERSION],[The installed Python + version to use, for example '2.3'. This string + will be appended to the Python interpreter + canonical name.]) + + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) + if test -z "$PYTHON"; then + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) + PYTHON_VERSION="" + fi + + # + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver >= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([ +This version of the AC@&t@_PYTHON_DEVEL macro +doesn't work properly with versions of Python before +2.1.0. You may need to re-run configure, setting the +variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK +to something else than an empty string. +]) + else + AC_MSG_RESULT([skip at user request]) + fi + else + AC_MSG_RESULT([yes]) + fi + + # + # if the macro parameter ``version'' is set, honour it + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +If you have it installed, but it isn't the default Python +interpreter in your system path, please pass the PYTHON_VERSION +variable to configure. See ``configure --help'' for reference. +]) + PYTHON_VERSION="" + fi + fi + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python module "distutils". +Please check your Python installation. The error was: +$ac_distutils_result]) + PYTHON_VERSION="" + fi + + # + # Check for Python include path + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" + else + python_path="-I$python_path" + fi + fi + PYTHON_CPPFLAGS=$python_path + fi + AC_MSG_RESULT([$PYTHON_CPPFLAGS]) + AC_SUBST([PYTHON_CPPFLAGS]) + + # + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) + if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<]], + [[Py_Initialize();]]) + ],[pythonexists=yes],[pythonexists=no]) + AC_LANG_POP([C]) + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + + AC_MSG_RESULT([$pythonexists]) + + if test ! "x$pythonexists" = "xyes"; then + AC_MSG_FAILURE([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LIBS environment variable. + Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ + ]) + PYTHON_VERSION="" + fi + + # + # all done! + # +]) diff --git a/m4/ax_swig_enable_cxx.m4 b/m4/ax_swig_enable_cxx.m4 new file mode 100644 index 0000000..c3b27f0 --- /dev/null +++ b/m4/ax_swig_enable_cxx.m4 @@ -0,0 +1,55 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_swig_enable_cxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SWIG_ENABLE_CXX +# +# DESCRIPTION +# +# Enable SWIG C++ support. This affects all invocations of $(SWIG). +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([SWIG_ENABLE_CXX], [AX_SWIG_ENABLE_CXX]) +AC_DEFUN([AX_SWIG_ENABLE_CXX],[ + AC_REQUIRE([AX_PKG_SWIG]) + AC_REQUIRE([AC_PROG_CXX]) + if test "z$SWIG" != "z"; then + SWIG="$SWIG -c++" + fi +]) diff --git a/python/Makefile.am b/python/Makefile.am index fe56896..2fc3dff 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -1,7 +1,8 @@ SWIG_SOURCES = analysis.i +# TODO: Check libdivvun to remove call to all all: analysis_wrap.cpp analysis_wrap.cpp: $(SWIG_SOURCES) - $(SWIG) $(AX_SWIG_PYTHON_OPT) -I$(top_srcdir) -c++ -o $@ $< - (python setup.py build) \ No newline at end of file + $(SWIG) $(AX_SWIG_PYTHON_OPT) -I$(top_srcdir) -o $@ $< + $(PYTHON) setup.py build \ No newline at end of file diff --git a/python/notes.md b/python/notes.md deleted file mode 100644 index f4c6cbb..0000000 --- a/python/notes.md +++ /dev/null @@ -1,2 +0,0 @@ -- add python & swig checkers in config.ac from libdivun -- diff --git a/python/setup.py.in b/python/setup.py.in index 800e87e..1ec362f 100644 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -18,28 +18,29 @@ def getenv_list(var_name): def get_sources(): from os import path sources = ['analysis_wrap.cpp'] - cc = 'alphabet.cc compression.cc fst_processor.cc lt_locale.cc node.cc state.cc trans_exe.cc xml_parse_util.cc' + cc = 'alphabet.cc compression.cc fst_processor.cc lt_locale.cc \ + node.cc state.cc trans_exe.cc xml_parse_util.cc' rel_path = '@top_srcdir@/lttoolbox/' sources.extend([path.join(rel_path, f) for f in cc.split()]) return sources analysis_module = Extension( - '_analysis', - sources=get_sources(), - include_dirs=['@top_srcdir@', '/usr/include/libxml2'], - library_dirs=['@top_srcdir@/lttoolbox/.libs', '/usr/include/libxml2'], - extra_compile_args=getenv_list('CPPFLAGS') + getenv_list('CXXFLAGS'), - extra_link_args= (getenv_list('LDFLAGS')) + ['-lxml2']) + '_analysis', + sources=get_sources(), + include_dirs=['@top_srcdir@', '/usr/include/libxml2'], + library_dirs=['/usr/include/libxml2'], + extra_compile_args=getenv_list('CPPFLAGS') + getenv_list('CXXFLAGS'), + extra_link_args=getenv_list('LDFLAGS') + ['-lxml2']) setup(name='python-@PACKAGE@', - version='@PACKAGE_VERSION@', - description='SWIG interface to @PACKAGE_NAME@', - long_description="SWIG interface to @PACKAGE_NAME@ for use in apertium-python", - # TODO: author, maintainer, url - author_email='@PACKAGE_BUGREPORT@', - license='GPL-3.0+', - maintainer_email='@PACKAGE_BUGREPORT@', - py_modules=['analysis'], - ext_modules=[analysis_module]) + version='@PACKAGE_VERSION@', + description='SWIG interface to @PACKAGE_NAME@', + long_description="SWIG interface to @PACKAGE_NAME@ for use in apertium-python", + # TODO: author, maintainer, url + author_email='@PACKAGE_BUGREPORT@', + license='GPL-3.0+', + maintainer_email='@PACKAGE_BUGREPORT@', + py_modules=['analysis'], + ext_modules=[analysis_module])