alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make spot.py a python package instead of a module

Browse source 
* python/spot.py, python/spot_impl.i: Rename as...
* python/spot/__init__.py, python/spot/impl.i: ... these.
* python/Makefile.am, tests/run.in: Adjust for new paths.
* tests/python/automata-io.ipynb, tests/python/automata.ipynb,
tests/python/decompose.ipynb, tests/python/piperead.ipynb,
tests/python/testingaut.ipynb: Adjust messages to refer to spot.impl
instead of spot_impl.
This commit is contained in:
Alexandre Duret-Lutz 2016-01-24 16:45:10 +01:00
parent 727d4cc678
commit 215fcb799a
9 changed files with 83 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

27
python/Makefile.am
View file

@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
## Copyright (C) 2010, 2011, 2013, 2014, 2015 Laboratoire de Recherche
## Copyright (C) 2010, 2011, 2013, 2014, 2015, 2016 Laboratoire de Recherche
## et Development de l'Epita (LRDE).
## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -32,25 +32,28 @@ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_builddir) -I$(top_srcdir) \
# this.
SWIGFLAGS = -c++ -python -py3 -O -nofastproxy
EXTRA_DIST = spot_impl.i buddy.i
python_PYTHON = $(srcdir)/spot_impl.py $(srcdir)/buddy.py spot.py
pyexec_LTLIBRARIES = _spot_impl.la _buddy.la
EXTRA_DIST = spot/impl.i buddy.i
python_PYTHON = \
$(srcdir)/spot/__init__.py \
$(srcdir)/spot/impl.py \
$(srcdir)/buddy.py
pyexec_LTLIBRARIES = spot/_impl.la _buddy.la
MAINTAINERCLEANFILES = \
$(srcdir)/spot_impl_wrap.cxx $(srcdir)/spot_impl.py \
$(srcdir)/spot/impl_wrap.cxx $(srcdir)/spot/impl.py \
$(srcdir)/buddy_wrap.cxx $(srcdir)/buddy.py
## spot
_spot_impl_la_SOURCES = $(srcdir)/spot_impl_wrap.cxx
_spot_impl_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
_spot_impl_la_LIBADD = $(top_builddir)/spot/libspot.la
spot__impl_la_SOURCES = $(srcdir)/spot/impl_wrap.cxx
spot__impl_la_LDFLAGS = -avoid-version -module $(SYMBOLIC_LDFLAGS)
spot__impl_la_LIBADD = $(top_builddir)/spot/libspot.la
$(srcdir)/spot_impl_wrap.cxx: $(srcdir)/spot_impl.i
$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot_impl.i
$(srcdir)/spot/impl_wrap.cxx: $(srcdir)/spot/impl.i
$(SWIG) $(SWIGFLAGS) -I$(srcdir) -I$(top_srcdir) $(srcdir)/spot/impl.i
$(srcdir)/spot_impl.py: $(srcdir)/spot_impl.i
$(MAKE) $(AM_MAKEFLAGS) spot_impl_wrap.cxx
$(srcdir)/spot/impl.py: $(srcdir)/spot/impl.i
$(MAKE) $(AM_MAKEFLAGS) spot/impl_wrap.cxx
## buddy

2
python/spot.py → python/spot/__init__.py
View file

@ -25,7 +25,7 @@ if sys.hexversion < 0x03030000:
sys.exit("This module requires Python 3.3 or newer")
from spot_impl import *
from spot.impl import *
import subprocess
import os
import signal

3
python/spot_impl.i → python/spot/impl.i
View file

@ -26,7 +26,8 @@
#include <cstddef>
%}
%module(director="1") spot_impl
%module(package="spot", director="1") impl
%include "std_shared_ptr.i"
%include "std_vector.i"