rename wrap/python/ to python/

* wrap/python/: Rename to...
* python/: ... this.
* wrap/: Delete.
* Makefile.am, README, configure.ac, debian/python3-spot.examples,
debian/rules, doc/org/.dir-locals.el.in, doc/org/init.el.in,
spot/sanity/ipynb.test: Adjust.

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

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
-   python/        Python bindings for Spot and BuDDy
+   tests/         Tests for these bindings
-      tests/      Tests for these bindings
+   ajax/          LTL-to-TGBA translator with web interface, using Javascript.
-      ajax/       LTL-to-TGBA translator with web interface, using Ajax.
 spot-if/          Interfaces between Spot and other libraries.
    ltsmin/        Interface with DiVinE2 and SpinS.
 

configure.ac

@@ -220,15 +220,14 @@ AC_CONFIG_FILES([
   spot-if/ltsmin/defs
   spot-if/ltsmin/Makefile
   spot-if/Makefile
-  wrap/Makefile
+  python/ajax/Makefile
-  wrap/python/ajax/Makefile
+  python/Makefile
-  wrap/python/Makefile
+  python/tests/Makefile
-  wrap/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

debian/python3-spot.examples

@@ -1,2 +1,2 @@
-wrap/python/tests/*.ipynb
+python/tests/*.ipynb
-wrap/python/tests/*.html
+python/tests/*.html

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 python clean;		\
-	  dh_auto_build -- -C wrap/python all;		\
+	  dh_auto_build -- -C python all;		\
-	  dh_auto_install -- -C wrap/python;		\
+	  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

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]")

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"

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";

wrap/.gitignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

wrap/Makefile.am

@@ -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 <http://www.gnu.org/licenses/>.
-
-if USE_PYTHON
-SUBDIRS = python
-endif