* m4/pypath.m4: New file.

* Makefile.am (SUBDIRS): Add wrap.
* wrap/Makefile.am: New file.
* wrap/spot.i: New file.  Preliminary bindings for Python.
* configure.ac: Call adl_CHECK_PYTHON and output wrap/Makefile.

.cvsignore

@@ -5,3 +5,6 @@ config.log
 config.status
 aclocal.m4
 autom4te.cache
+libtool
+*.tar.gz
+*.patch

ChangeLog

+2003-04-30  Alexandre DURET-LUTZ  <aduret@src.lip6.fr>
+
+	* m4/pypath.m4: New file.
+	* Makefile.am (SUBDIRS): Add wrap.
+	* wrap/Makefile.am: New file.
+	* wrap/spot.i: New file.  Preliminary bindings for Python.
+	* configure.ac: Call adl_CHECK_PYTHON and output wrap/Makefile.
+
 2003-04-29  Alexandre DURET-LUTZ  <aduret@src.lip6.fr>
 
 	* configure.ac: Call AC_PROG_LIBTOOL.

Makefile.am

-SUBDIRS = doc src
+SUBDIRS = doc src wrap
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = m4/gccwarn.m4
\ No newline at end of file
+EXTRA_DIST = m4/gccwarn.m4 m4/pypath.m4

configure.ac

@@ -3,6 +3,8 @@ AC_INIT([spot], [0.1])
 AC_CONFIG_AUX_DIR([tools])
 AM_INIT_AUTOMAKE([foreign nostdinc 1.7.3])
 
+adl_CHECK_PYTHON
+
 AC_PROG_CXX
 
 AM_PROG_LEX
@@ -28,5 +30,6 @@ AC_CONFIG_FILES([
   src/ltltest/defs
   src/ltlvisit/Makefile
   src/misc/Makefile
+  wrap/Makefile
 ])
 AC_OUTPUT
\ No newline at end of file

doc/.cvsignore

+Doxyfile
+Makefile
+Makefile.in
+spot.html

m4/pypath.m4

+AC_DEFUN([adl_CHECK_PYTHON], 
+ [AM_PATH_PYTHON([2.0])
+  AC_CACHE_CHECK([for $am_display_PYTHON includes directory],
+    [adl_cv_python_inc],
+    [adl_cv_python_inc=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null`])
+  AC_SUBST([PYTHONINC], [$adl_cv_python_inc])])

src/ltlast/.cvsignore

 .deps
 Makefile
 Makefile.in
+*.lo
+*.la
+.libs

src/ltlenv/.cvsignore

@@ -2,3 +2,6 @@
 Makefile
 Makefile.in
 libltlenv.a
+*.lo
+*.la
+.libs

src/ltlparse/.cvsignore

@@ -9,3 +9,6 @@ ltlscan.cc
 position.hh
 readltl
 stack.hh
+*.lo
+*.la
+.libs

src/ltltest/.cvsignore

@@ -12,3 +12,5 @@ lunabbrev
 tunabbrev
 nenoform
 tunenoform
+.libs
+tostring

src/ltlvisit/.cvsignore

 .deps
 Makefile
 Makefile.in
+*.lo
+*.la
+.libs

tools/.cvsignore

@@ -2,3 +2,7 @@ depcomp
 install-sh
 missing
 mkinstalldirs
+py-compile
+config.guess
+config.sub
+ltmain.sh

wrap/.cvsignore

+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+spot.py*
+*.lo
+*.loT
+spot_wrap.cxx

wrap/Makefile.am

+
+AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/src
+
+python_PYTHON = spot.py
+pyexec_LTLIBRARIES = _spot.la
+
+_spot_la_SOURCES = spot_wrap.cxx
+_spot_la_LDFLAGS = -avoid-version -module 
+_spot_la_LIBADD = \
+  ../src/ltlenv/libltlenv.la \
+  ../src/ltlparse/libltlparse.la \
+  ../src/ltlvisit/libltlvisit.la \
+  ../src/ltlast/libltlast.la
+
+EXTRA_DIST = spot.i
+spot_wrap.cxx: spot.i
+	swig -c++ -python -I$(top_srcdir)/src spot.i
+
+spot.py: spot.i
+	$(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx
+
+MAINTAINERCLEANFILES = spot_wrap.cxx spot.py

wrap/spot.i

+%module spot
+
+%include "std_string.i"
+%include "std_list.i"
+
+%{
+#include "ltlenv/environment.hh"
+#include "ltlenv/defaultenv.hh"
+#include "ltlast/formula.hh"
+#include "ltlparse/public.hh"
+#include "ltlast/visitor.hh"
+
+#include "ltlvisit/clone.hh"
+#include "ltlvisit/dotty.hh"
+#include "ltlvisit/dump.hh"
+#include "ltlvisit/equals.hh"
+#include "ltlvisit/lunabbrev.hh"
+#include "ltlvisit/tunabbrev.hh"
+#include "ltlvisit/nenoform.hh"
+#include "ltlvisit/tostring.hh"
+
+using namespace spot::ltl;
+%}
+
+%include "ltlenv/environment.hh"
+%include "ltlenv/defaultenv.hh"
+%include "ltlast/formula.hh"
+%include "ltlparse/public.hh"
+%include "ltlast/visitor.hh"
+
+%include "ltlvisit/clone.hh"
+%include "ltlvisit/dotty.hh"
+%include "ltlvisit/dump.hh"
+%include "ltlvisit/equals.hh"
+%include "ltlvisit/lunabbrev.hh"
+%include "ltlvisit/tunabbrev.hh"
+%include "ltlvisit/nenoform.hh"
+%include "ltlvisit/tostring.hh"
+
+%inline %{
+
+spot::ltl::parse_error_list 
+empty_parse_error_list()
+{
+  parse_error_list l;
+  return l;
+}
+
+std::ostream& 
+get_cout()
+{
+  return std::cout;
+}
+
+std::ostream& 
+get_cerr()
+{
+  return std::cerr;
+}
+
+void 
+print_on(std::ostream& on, const std::string& what)
+{
+  on << what;
+}
+%}