Mercurial > pytave
changeset 137:e803c9927dd9
build: Drop unused alternate build systems
* configure.ac: Drop substitutions for Jamfile, project-root.jam, and
setup.py.
* Makefile.am (EXTRA_DIST): Remove project-root.jam from the list.
* .hgignore: Remove Jamfile, project-root.jam, and setup.py.
* Jamfile.in, project-root.jam.in, setup.py.in: Delete.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 04 Apr 2016 15:59:32 -0700 |
| parents | e247e53ef774 |
| children | 8b9b31acf632 |
| files | .hgignore Jamfile.in Makefile.am configure.ac project-root.jam.in setup.py.in |
| diffstat | 5 files changed, 3 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Apr 04 15:30:03 2016 -0700 +++ b/.hgignore Mon Apr 04 15:59:32 2016 -0700 @@ -16,7 +16,6 @@ ^depcomp$ ^.deps$ ^install-sh$ -^Jamfile$ ^.libs$ ^libtool$ ^ltmain.sh$ @@ -25,8 +24,6 @@ ^Makefile$ ^Makefile.in$ ^missing$ -^project-root.jam$ ^py\.oct$ ^_pytave?la*$ -^setup.py$ ^stamp-h1$
--- a/Jamfile.in Mon Apr 04 15:30:03 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# @configure_input@ - -# Building with bjam is no longer supported - this script probably -# does not work. - -project py : - requirements - <library>/usr/lib/lib@BOOST_PYTHON_LIB@.so - <library>@JAM_LIBOCTAVE@ - <library>@JAM_LIBCRUFT@ - <library>@JAM_LIBOCTINTERP@ -# <include>@PYTHON_INCLUDE_DIR@ # FIXME - <include>@OCTAVE_INCLUDEDIR@ - <include>@abs_srcdir@ - <include>@abs_builddir@ - <define>"HAVE_CONFIG_H" - <linkflags>"-Wl,-rpath -Wl,@PYTAVE_OCTAVE_RPATH@" - <cxxflags>"-Wall" -; - -python-extension _pytave : @srcdir@/octave_to_python.cc @srcdir@/pytave.cc @srcdir@/exceptions.cc @srcdir@/python_to_octave.cc @srcdir@/arrayobjectdefs.h @abs_builddir@/config.h @srcdir@/octave_to_python.h @srcdir@/pytavedefs.h @srcdir@/exceptions.h @srcdir@/python_to_octave.h ; -
--- a/Makefile.am Mon Apr 04 15:30:03 2016 -0700 +++ b/Makefile.am Mon Apr 04 15:59:32 2016 -0700 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_lib_LTLIBRARIES = _pytave.la -EXTRA_DIST = test/test.py test/exceptions.py project-root.jam \ +EXTRA_DIST = test/test.py test/exceptions.py \ package/__init__.py package/pytave.py EXTRA_libdir = @PYTAVE_MODULE_INSTALL_PATH@
--- a/configure.ac Mon Apr 04 15:30:03 2016 -0700 +++ b/configure.ac Mon Apr 04 15:59:32 2016 -0700 @@ -117,21 +117,10 @@ PYTAVE_MODULE_INSTALL_PATH=${prefix} ]) -# Substitutes for the Makefile/Jamfile -#AC_SUBST(OCTAVE_INCLUDEDIR) -#AC_SUBST(OCTAVE_LIBRARYDIR) PYTAVE_OCTAVE_RPATH="$OCTAVE_LIBRARYDIR" AC_SUBST(PYTAVE_OCTAVE_RPATH) AC_SUBST(PYTAVE_MODULE_INSTALL_PATH) -# Substitutes for the Jamfile. XXX: Replace lib*.so with OS independent name. -AC_SUBST(JAM_LIBOCTAVE, $OCTAVE_LIBRARYDIR/liboctave.so) -AC_SUBST(JAM_LIBCRUFT, $OCTAVE_LIBRARYDIR/libcruft.so) -AC_SUBST(JAM_LIBOCTINTERP, $OCTAVE_LIBRARYDIR/liboctinterp.so) - -# setup.py -AC_SUBST(PYTHON) - msg="One or more library dependencies could not be resolved. Missing dependencies: @@ -140,10 +129,8 @@ AS_IF(test -z "$pytave_missing_libs", [ -# Substitute in these files, copy project-root.jam to VPATH too -AC_OUTPUT([Makefile Jamfile setup.py project-root.jam]) +AC_OUTPUT([Makefile]) -chmod u+x "setup.py" msg='Pytave is configured with the following setup' ]) @@ -175,4 +162,4 @@ AS_IF(test -n "$pytave_missing_libs", [ AC_MSG_ERROR([[Configuration failure. Halt.]]) -]) \ No newline at end of file +])
--- a/setup.py.in Mon Apr 04 15:30:03 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -#!@PYTHON@ -# -*- coding: utf-8; c-basic-offset: 3; indent-tabs-mode: nil; tab-width: 3; -*- -# @configure_input@ - -from distutils.core import setup, Extension - -setup( - name = 'pytave', - version = '@PACKAGE_VERSION@', - author = '@PACKAGE_NAME@ team', - author_email = '@PACKAGE_BUGREPORT@', - package_dir = {'pytave' : '@srcdir@/package'}, - packages = ['pytave'], - ext_modules = [ - Extension('pytave/_pytave', - language = "c++", - sources = [ - '@srcdir@/octave_to_python.cc', - '@srcdir@/pytave.cc', - '@srcdir@/exceptions.cc', - '@srcdir@/python_to_octave.cc', - ], - depends = [ - '@srcdir@/arrayobjectdefs.h', - '@abs_builddir@/config.h', - '@srcdir@/octave_to_python.h', - '@srcdir@/pytavedefs.h', - '@srcdir@/exceptions.h', - '@srcdir@/python_to_octave.h' - ], - - # Python always included, so don't bother. - # TODO: Check whether paths work on Windows or not. - # The file separator might be wrong. (Must be / in setup.cfg) - include_dirs = ['@OCTAVE_INCLUDEDIR@', - '@NUMPY_INCLUDEDIR@', - '@abs_builddir@', - '@srcdir@', - ], - define_macros = [('HAVE_CONFIG_H', '1')], - library_dirs = ['@OCTAVE_LIBRARYDIR@'], - runtime_library_dirs = ['@PYTAVE_OCTAVE_RPATH@'], - libraries = ['octinterp', 'octave', 'cruft', '@BOOST_PYTHON_LIB@'] - ) - ] -)