diff --git a/Makefile.am b/Makefile.am index 21df37bc3..e6f98b50d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,11 @@ if NEVER NEVER_SUBDIRS = bench elisp endif -SUBDIRS = buddy lib spot wrap ltdl spot-if doc $(NEVER_SUBDIRS) +if USE_PYTHON + PYTHON_SUBDIR = python +endif + +SUBDIRS = buddy lib ltdl spot spot-if $(PYTHON_SUBDIR) doc $(NEVER_SUBDIRS) UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \ utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h diff --git a/README b/README index e93c1ff76..7b2ec8094 100644 --- a/README +++ b/README @@ -165,10 +165,9 @@ bench/ Benchmarks for ... spin13/ ... compositional suspension and other improvements, stutter/ ... stutter-invariance checking algorithms, wdba/ ... WDBA minimization (for obligation properties). -wrap/ Wrappers for other languages. - python/ Python bindings for Spot and BuDDy - tests/ Tests for these bindings - ajax/ LTL-to-TGBA translator with web interface, using Ajax. +python/ Python bindings for Spot and BuDDy + tests/ Tests for these bindings + ajax/ LTL-to-TGBA translator with web interface, using Javascript. spot-if/ Interfaces between Spot and other libraries. ltsmin/ Interface with DiVinE2 and SpinS. diff --git a/configure.ac b/configure.ac index 54f2c7851..16aab263e 100644 --- a/configure.ac +++ b/configure.ac @@ -220,15 +220,14 @@ AC_CONFIG_FILES([ spot-if/ltsmin/defs spot-if/ltsmin/Makefile spot-if/Makefile - wrap/Makefile - wrap/python/ajax/Makefile - wrap/python/Makefile - wrap/python/tests/Makefile + python/ajax/Makefile + python/Makefile + python/tests/Makefile tools/x-to-1 ]) AC_CONFIG_FILES([doc/org/g++wrap], [chmod +x doc/org/g++wrap]) AC_CONFIG_FILES([doc/dot], [chmod +x doc/dot]) -AC_CONFIG_FILES([wrap/python/tests/run], [chmod +x wrap/python/tests/run]) +AC_CONFIG_FILES([python/tests/run], [chmod +x python/tests/run]) AC_OUTPUT case $VERSION:$enable_devel in diff --git a/debian/python3-spot.examples b/debian/python3-spot.examples index 00c57ff78..0b92304f2 100644 --- a/debian/python3-spot.examples +++ b/debian/python3-spot.examples @@ -1,2 +1,2 @@ -wrap/python/tests/*.ipynb -wrap/python/tests/*.html +python/tests/*.ipynb +python/tests/*.html diff --git a/debian/rules b/debian/rules index dbba40adb..e74ffa02c 100755 --- a/debian/rules +++ b/debian/rules @@ -75,17 +75,17 @@ override_dh_auto_install: fix-mathjax dh_auto_configure -- $(LTOSETUP) \ --disable-devel --enable-optimizations \ --disable-static PYTHON=/usr/bin/$$pyv; \ - dh_auto_build -- -C wrap/python clean; \ - dh_auto_build -- -C wrap/python all; \ - dh_auto_install -- -C wrap/python; \ + dh_auto_build -- -C python clean; \ + dh_auto_build -- -C python all; \ + dh_auto_install -- -C python; \ done find debian/tmp -name '*.la' -exec rm -rv {} ';' override_dh_python3: dh_python3 -p python3-spot override_dh_auto_build: dh_auto_build - $(MAKE) -C wrap/python/tests nb-html + $(MAKE) -C python/tests nb-html fix-mathjax: perl -pi -e 's|http://orgmode.org/mathjax/MathJax.js|file:///usr/share/javascript/mathjax/MathJax.js|' doc/userdoc/*.html - perl -pi -e 's|https://cdn.mathjax.org/mathjax/latest/MathJax.js|file:///usr/share/javascript/mathjax/MathJax.js|' wrap/python/tests/*.html + perl -pi -e 's|https://cdn.mathjax.org/mathjax/latest/MathJax.js|file:///usr/share/javascript/mathjax/MathJax.js|' python/tests/*.html diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in index 12314a43d..747db14fa 100644 --- a/doc/org/.dir-locals.el.in +++ b/doc/org/.dir-locals.el.in @@ -10,10 +10,10 @@ path-separator (getenv "PATH"))) (setenv "PYTHONPATH" - (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:" + (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/python:@abs_top_srcdir@/python:" (getenv "PYTHONPATH"))) (setenv "DYLD_LIBRARY_PATH" - (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" + (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" (getenv "DYLD_LIBRARY_PATH"))) (setenv "SPOT_DOTDEFAULT" "Brf(Lato)") (setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"] edge[arrowhead=vee, arrowsize=.7]") diff --git a/doc/org/init.el.in b/doc/org/init.el.in index ce8b2f25c..eb7a4148f 100644 --- a/doc/org/init.el.in +++ b/doc/org/init.el.in @@ -33,10 +33,10 @@ (setenv "PATH" (concat "@abs_top_builddir@/spot/bin" path-separator (getenv "PATH"))) (setenv "PYTHONPATH" - (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:" + (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/python:@abs_top_srcdir@/python:" (getenv "PYTHONPATH"))) (setenv "DYLD_LIBRARY_PATH" - (concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" + (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" (getenv "DYLD_LIBRARY_PATH"))) (setenv "SPOT_DOTDEFAULT" "Brf(Lato)") (setenv "SPOT_DOTEXTRA" diff --git a/wrap/python/.gitignore b/python/.gitignore similarity index 100% rename from wrap/python/.gitignore rename to python/.gitignore diff --git a/wrap/python/Makefile.am b/python/Makefile.am similarity index 100% rename from wrap/python/Makefile.am rename to python/Makefile.am diff --git a/wrap/python/ajax/Makefile.am b/python/ajax/Makefile.am similarity index 100% rename from wrap/python/ajax/Makefile.am rename to python/ajax/Makefile.am diff --git a/wrap/python/ajax/README b/python/ajax/README similarity index 100% rename from wrap/python/ajax/README rename to python/ajax/README diff --git a/wrap/python/ajax/css/loading.gif b/python/ajax/css/loading.gif similarity index 100% rename from wrap/python/ajax/css/loading.gif rename to python/ajax/css/loading.gif diff --git a/wrap/python/ajax/css/tipTip.css b/python/ajax/css/tipTip.css similarity index 100% rename from wrap/python/ajax/css/tipTip.css rename to python/ajax/css/tipTip.css diff --git a/wrap/python/ajax/css/trans.css b/python/ajax/css/trans.css similarity index 100% rename from wrap/python/ajax/css/trans.css rename to python/ajax/css/trans.css diff --git a/wrap/python/ajax/js/jquery.ba-bbq.min.js b/python/ajax/js/jquery.ba-bbq.min.js similarity index 100% rename from wrap/python/ajax/js/jquery.ba-bbq.min.js rename to python/ajax/js/jquery.ba-bbq.min.js diff --git a/wrap/python/ajax/js/jquery.ba-dotimeout.min.js b/python/ajax/js/jquery.ba-dotimeout.min.js similarity index 100% rename from wrap/python/ajax/js/jquery.ba-dotimeout.min.js rename to python/ajax/js/jquery.ba-dotimeout.min.js diff --git a/wrap/python/ajax/js/jquery.tipTip.minified.js b/python/ajax/js/jquery.tipTip.minified.js similarity index 100% rename from wrap/python/ajax/js/jquery.tipTip.minified.js rename to python/ajax/js/jquery.tipTip.minified.js diff --git a/wrap/python/ajax/logos/lip6sys64.png b/python/ajax/logos/lip6sys64.png similarity index 100% rename from wrap/python/ajax/logos/lip6sys64.png rename to python/ajax/logos/lip6sys64.png diff --git a/wrap/python/ajax/logos/lrde64.png b/python/ajax/logos/lrde64.png similarity index 100% rename from wrap/python/ajax/logos/lrde64.png rename to python/ajax/logos/lrde64.png diff --git a/wrap/python/ajax/logos/mail.png b/python/ajax/logos/mail.png similarity index 100% rename from wrap/python/ajax/logos/mail.png rename to python/ajax/logos/mail.png diff --git a/wrap/python/ajax/logos/spot64s.png b/python/ajax/logos/spot64s.png similarity index 100% rename from wrap/python/ajax/logos/spot64s.png rename to python/ajax/logos/spot64s.png diff --git a/wrap/python/ajax/protocol.txt b/python/ajax/protocol.txt similarity index 100% rename from wrap/python/ajax/protocol.txt rename to python/ajax/protocol.txt diff --git a/wrap/python/ajax/spotcgi.in b/python/ajax/spotcgi.in similarity index 100% rename from wrap/python/ajax/spotcgi.in rename to python/ajax/spotcgi.in diff --git a/wrap/python/ajax/trans.html b/python/ajax/trans.html similarity index 100% rename from wrap/python/ajax/trans.html rename to python/ajax/trans.html diff --git a/wrap/python/buddy.i b/python/buddy.i similarity index 100% rename from wrap/python/buddy.i rename to python/buddy.i diff --git a/wrap/python/spot.py b/python/spot.py similarity index 100% rename from wrap/python/spot.py rename to python/spot.py diff --git a/wrap/python/spot_impl.i b/python/spot_impl.i similarity index 100% rename from wrap/python/spot_impl.i rename to python/spot_impl.i diff --git a/wrap/python/tests/.gitignore b/python/tests/.gitignore similarity index 100% rename from wrap/python/tests/.gitignore rename to python/tests/.gitignore diff --git a/wrap/python/tests/Makefile.am b/python/tests/Makefile.am similarity index 100% rename from wrap/python/tests/Makefile.am rename to python/tests/Makefile.am diff --git a/wrap/python/tests/acc_cond.ipynb b/python/tests/acc_cond.ipynb similarity index 100% rename from wrap/python/tests/acc_cond.ipynb rename to python/tests/acc_cond.ipynb diff --git a/wrap/python/tests/accparse.ipynb b/python/tests/accparse.ipynb similarity index 100% rename from wrap/python/tests/accparse.ipynb rename to python/tests/accparse.ipynb diff --git a/wrap/python/tests/accparse2.py b/python/tests/accparse2.py similarity index 100% rename from wrap/python/tests/accparse2.py rename to python/tests/accparse2.py diff --git a/wrap/python/tests/alarm.py b/python/tests/alarm.py similarity index 100% rename from wrap/python/tests/alarm.py rename to python/tests/alarm.py diff --git a/wrap/python/tests/automata-io.ipynb b/python/tests/automata-io.ipynb similarity index 100% rename from wrap/python/tests/automata-io.ipynb rename to python/tests/automata-io.ipynb diff --git a/wrap/python/tests/automata.ipynb b/python/tests/automata.ipynb similarity index 100% rename from wrap/python/tests/automata.ipynb rename to python/tests/automata.ipynb diff --git a/wrap/python/tests/bddnqueen.py b/python/tests/bddnqueen.py similarity index 100% rename from wrap/python/tests/bddnqueen.py rename to python/tests/bddnqueen.py diff --git a/wrap/python/tests/decompose.ipynb b/python/tests/decompose.ipynb similarity index 100% rename from wrap/python/tests/decompose.ipynb rename to python/tests/decompose.ipynb diff --git a/wrap/python/tests/formulas.ipynb b/python/tests/formulas.ipynb similarity index 100% rename from wrap/python/tests/formulas.ipynb rename to python/tests/formulas.ipynb diff --git a/wrap/python/tests/implies.py b/python/tests/implies.py similarity index 100% rename from wrap/python/tests/implies.py rename to python/tests/implies.py diff --git a/wrap/python/tests/interdep.py b/python/tests/interdep.py similarity index 100% rename from wrap/python/tests/interdep.py rename to python/tests/interdep.py diff --git a/wrap/python/tests/ipnbdoctest.py b/python/tests/ipnbdoctest.py similarity index 100% rename from wrap/python/tests/ipnbdoctest.py rename to python/tests/ipnbdoctest.py diff --git a/wrap/python/tests/ltl2tgba.py b/python/tests/ltl2tgba.py similarity index 100% rename from wrap/python/tests/ltl2tgba.py rename to python/tests/ltl2tgba.py diff --git a/wrap/python/tests/ltl2tgba.test b/python/tests/ltl2tgba.test similarity index 100% rename from wrap/python/tests/ltl2tgba.test rename to python/tests/ltl2tgba.test diff --git a/wrap/python/tests/ltlparse.py b/python/tests/ltlparse.py similarity index 100% rename from wrap/python/tests/ltlparse.py rename to python/tests/ltlparse.py diff --git a/wrap/python/tests/ltlsimple.py b/python/tests/ltlsimple.py similarity index 100% rename from wrap/python/tests/ltlsimple.py rename to python/tests/ltlsimple.py diff --git a/wrap/python/tests/minato.py b/python/tests/minato.py similarity index 100% rename from wrap/python/tests/minato.py rename to python/tests/minato.py diff --git a/wrap/python/tests/optionmap.py b/python/tests/optionmap.py similarity index 100% rename from wrap/python/tests/optionmap.py rename to python/tests/optionmap.py diff --git a/wrap/python/tests/parsetgba.py b/python/tests/parsetgba.py similarity index 100% rename from wrap/python/tests/parsetgba.py rename to python/tests/parsetgba.py diff --git a/wrap/python/tests/piperead.ipynb b/python/tests/piperead.ipynb similarity index 100% rename from wrap/python/tests/piperead.ipynb rename to python/tests/piperead.ipynb diff --git a/wrap/python/tests/product.ipynb b/python/tests/product.ipynb similarity index 100% rename from wrap/python/tests/product.ipynb rename to python/tests/product.ipynb diff --git a/wrap/python/tests/randaut.ipynb b/python/tests/randaut.ipynb similarity index 100% rename from wrap/python/tests/randaut.ipynb rename to python/tests/randaut.ipynb diff --git a/wrap/python/tests/randgen.py b/python/tests/randgen.py similarity index 100% rename from wrap/python/tests/randgen.py rename to python/tests/randgen.py diff --git a/wrap/python/tests/randltl.ipynb b/python/tests/randltl.ipynb similarity index 100% rename from wrap/python/tests/randltl.ipynb rename to python/tests/randltl.ipynb diff --git a/wrap/python/tests/relabel.py b/python/tests/relabel.py similarity index 100% rename from wrap/python/tests/relabel.py rename to python/tests/relabel.py diff --git a/wrap/python/tests/remfin.py b/python/tests/remfin.py similarity index 100% rename from wrap/python/tests/remfin.py rename to python/tests/remfin.py diff --git a/wrap/python/tests/run.in b/python/tests/run.in similarity index 100% rename from wrap/python/tests/run.in rename to python/tests/run.in diff --git a/wrap/python/tests/satmin.py b/python/tests/satmin.py similarity index 100% rename from wrap/python/tests/satmin.py rename to python/tests/satmin.py diff --git a/wrap/python/tests/setxor.py b/python/tests/setxor.py similarity index 100% rename from wrap/python/tests/setxor.py rename to python/tests/setxor.py diff --git a/wrap/python/tests/testingaut.ipynb b/python/tests/testingaut.ipynb similarity index 100% rename from wrap/python/tests/testingaut.ipynb rename to python/tests/testingaut.ipynb diff --git a/spot/sanity/ipynb.test b/spot/sanity/ipynb.test index c5aee7353..fea777d88 100755 --- a/spot/sanity/ipynb.test +++ b/spot/sanity/ipynb.test @@ -33,7 +33,7 @@ my $top_srcdir = $ENV{top_srcdir} || "../../"; my $top_srcdir_len = length($top_srcdir) + 1; my $tut = "$top_srcdir/doc/org/tut.org"; -my $dir = "$top_srcdir/wrap/python/tests"; +my $dir = "$top_srcdir/python/tests"; unless (-f $tut) { print STDERR "$tut not found"; diff --git a/wrap/.gitignore b/wrap/.gitignore deleted file mode 100644 index 282522db0..000000000 --- a/wrap/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/wrap/Makefile.am b/wrap/Makefile.am deleted file mode 100644 index 270539cd4..000000000 --- a/wrap/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Copyright (C) 2012 Laboratoire de Recherche et Developpement de -## l'Epita (LRDE). -## Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), -## département Systèmes Répartis Coopératifs (SRC), Université Pierre -## et Marie Curie. -## -## This file is part of Spot, a model checking library. -## -## Spot 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. -## -## Spot 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 . - -if USE_PYTHON -SUBDIRS = python -endif