rename iface/ as spot-if/

So that instead of having to do
  #incluce <spot/iface/ltsmin/ltsmin.hh>
for using installed the installed header, and
  #incluce <iface/ltsmin/ltsmin.hh>
for using the non-installed version, we now do
  #incluce <spot-if/ltsmin/ltsmin.hh>
in both cases.

* iface/: Rename as...
* spot-if/: ... this.
* doc/Doxyfile.in, README, configure.ac, Makefile.am,
spot/sanity/80columns.test, spot/sanity/style.test: Adjust.
* NEWS: Mention the change.
* spot-if/ltsmin/Makefile.am: Install headers in $includedir/spot-if.
* debian/libspot-dev.install: Distribute that directory as well.
This commit is contained in:
Alexandre Duret-Lutz 2015-12-07 21:53:09 +01:00
parent 690b8f51c7
commit b519c7d3dc
25 changed files with 26 additions and 22 deletions

View file

@ -28,7 +28,7 @@ if NEVER
NEVER_SUBDIRS = bench elisp NEVER_SUBDIRS = bench elisp
endif endif
SUBDIRS = buddy lib spot wrap ltdl iface doc $(NEVER_SUBDIRS) SUBDIRS = buddy lib spot wrap ltdl spot-if doc $(NEVER_SUBDIRS)
UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \ UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h \
utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h

5
NEWS
View file

@ -18,7 +18,10 @@ New in spot 1.99.6a (not yet released)
Inside the source distribution, the subdirectory src/ has been Inside the source distribution, the subdirectory src/ has been
renamed to spot/, so that the root of the source tree can also be renamed to spot/, so that the root of the source tree can also be
put on the preprocessor's search path to compile against a put on the preprocessor's search path to compile against a
non-installed version of Spot. non-installed version of Spot. Similarly, iface/ has been renamed
to spot-if/ and is now installed in $includedir/spot-if/ instead
of $includedir/spot/iface/, so that installed and non-installed
directories can be used similarly.
Python: Python:

16
README
View file

@ -124,7 +124,7 @@ Some documentation can be found in the doc/ directory.
"make install" will install man pages for command-line tools. (These "make install" will install man pages for command-line tools. (These
man pages can also be found in the spot/bin/man/ subdirectory of the man pages can also be found in the spot/bin/man/ subdirectory of the
source tree.) Additional documentation about these tools can be found source tree.) Additional documentation about these tools can be found
in doc/userdoc/, or on-line at http://spot.lrde.lip6.fr/tools.html in doc/userdoc/, or online at https://spot.lrde.epita.fr/tools.html
@ -151,7 +151,7 @@ spot/ Sources for libspot.
twaalgos/ Algorithms on TωA. twaalgos/ Algorithms on TωA.
gtec/ Couvreur's Emptiness-Check. gtec/ Couvreur's Emptiness-Check.
sanity/ Sanity tests for the whole project. sanity/ Sanity tests for the whole project.
doc/ Documentation for libspot. doc/ Documentation for Spot.
org/ Source of userdoc/ as org-mode files. org/ Source of userdoc/ as org-mode files.
tl/ Documentation of the Temporal Logic operators. tl/ Documentation of the Temporal Logic operators.
userdoc/ HTML documentation about the command-line tools. userdoc/ HTML documentation about the command-line tools.
@ -163,13 +163,13 @@ bench/ Benchmarks for ...
ltlcounter/ ... translation of a class of LTL formulas, ltlcounter/ ... translation of a class of LTL formulas,
ltlclasses/ ... translation of more classes of LTL formulas, ltlclasses/ ... translation of more classes of LTL formulas,
spin13/ ... compositional suspension and other improvements, spin13/ ... compositional suspension and other improvements,
stutter/ ... stutter-invariance checking algorithms,
wdba/ ... WDBA minimization (for obligation properties). wdba/ ... WDBA minimization (for obligation properties).
stutter/ ... stutter-invariance checking algorithms
wrap/ Wrappers for other languages. 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 Ajax. ajax/ LTL-to-TGBA translator with web interface, using Ajax.
iface/ Interfaces to other libraries. spot-if/ Interfaces between Spot and other libraries.
ltsmin/ Interface with DiVinE2 and SpinS. ltsmin/ Interface with DiVinE2 and SpinS.
Third party software Third party software
@ -197,9 +197,11 @@ End:
LocalWords: Python's BuDDy LBTT LTL Büchi lbtt gspn DIR GreatSPN Soheib Yann LocalWords: Python's BuDDy LBTT LTL Büchi lbtt gspn DIR GreatSPN Soheib Yann
LocalWords: Baarir Thierry Mieg CVS Università di Torino devel src libspot ac LocalWords: Baarir Thierry Mieg CVS Università di Torino devel src libspot ac
LocalWords: ltlast ltlenv ltlparse ltlvisit misc tgba TGBA tgbaalgos LocalWords: ltlast ltlenv ltlparse ltlvisit misc tgba TGBA tgbaalgos
LocalWords: gtec Tarjan doc html PDF spotref pdf cgi ELTL LocalWords: gtec Tarjan doc html PDF spotref pdf cgi ELTL LRDE tl
LocalWords: CGI ltl iface BDD Couvreur's emptchk kripke Kripke saba vm LocalWords: CGI ltl iface BDD Couvreur's emptchk kripke Kripke saba vm
LocalWords: eltlparse eltltest SABA sabaalgos sabatest ssp ltlcouter scc SCC LocalWords: eltlparse eltltest SABA sabaalgos sabatest ssp ltlcouter scc SCC
LocalWords: optimizations kripkeparse Automata LocalWords: optimizations kripkeparse Automata IPython subdirectory
LocalWords: neverparse ltlcounter ltlclasses parallelizing automata LocalWords: neverparse ltlcounter ltlclasses parallelizing automata
LocalWords: wdba WDBA ajax dve DiVinE ltdl Libtool's dlopen LocalWords: wdba WDBA ajax dve DiVinE ltdl Libtool's dlopen userdoc
LocalWords: parseaut parsetl priv TGTA taalgos twa twaalgos dtgbasat
LocalWords: DTGBA compositional invariance ltsmin SpinS Gnulib's

View file

@ -198,9 +198,6 @@ AC_CONFIG_FILES([
doc/org/.dir-locals.el doc/org/.dir-locals.el
doc/org/init.el doc/org/init.el
elisp/Makefile elisp/Makefile
iface/ltsmin/defs
iface/ltsmin/Makefile
iface/Makefile
lib/Makefile lib/Makefile
spot/bin/Makefile spot/bin/Makefile
spot/bin/man/Makefile spot/bin/man/Makefile
@ -220,6 +217,9 @@ AC_CONFIG_FILES([
spot/twaalgos/gtec/Makefile spot/twaalgos/gtec/Makefile
spot/twaalgos/Makefile spot/twaalgos/Makefile
spot/twa/Makefile spot/twa/Makefile
spot-if/ltsmin/defs
spot-if/ltsmin/Makefile
spot-if/Makefile
wrap/Makefile wrap/Makefile
wrap/python/ajax/Makefile wrap/python/ajax/Makefile
wrap/python/Makefile wrap/python/Makefile

View file

@ -1,3 +1,4 @@
usr/include/spot usr/include/spot
usr/include/spot-if
usr/lib/*-*/libspot.so usr/lib/*-*/libspot.so
usr/lib/*-*/libspotltsmin.so usr/lib/*-*/libspotltsmin.so

View file

@ -153,7 +153,6 @@ FULL_PATH_NAMES = YES
# This tag requires that the tag FULL_PATH_NAMES is set to YES. # This tag requires that the tag FULL_PATH_NAMES is set to YES.
STRIP_FROM_PATH = @top_srcdir@/ \ STRIP_FROM_PATH = @top_srcdir@/ \
@top_srcdir@/iface/ \
@srcdir@ @srcdir@
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
@ -163,8 +162,7 @@ STRIP_FROM_PATH = @top_srcdir@/ \
# specify the list of include paths that are normally passed to the compiler # specify the list of include paths that are normally passed to the compiler
# using the -I flag. # using the -I flag.
STRIP_FROM_INC_PATH = @top_srcdir@/ \ STRIP_FROM_INC_PATH = @top_srcdir@/
@top_srcdir@/iface/
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
# less readable) file names. This can be useful is your file systems doesn't # less readable) file names. This can be useful is your file systems doesn't
@ -763,7 +761,7 @@ WARN_LOGFILE =
INPUT = @srcdir@/mainpage.dox \ INPUT = @srcdir@/mainpage.dox \
@top_srcdir@/spot \ @top_srcdir@/spot \
@top_srcdir@/iface @top_srcdir@/spot-if
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

View file

@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
$(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl
AM_CXXFLAGS = $(WARNING_CXXFLAGS) AM_CXXFLAGS = $(WARNING_CXXFLAGS)
ltsmindir = $(pkgincludedir)/iface/ltsmin ltsmindir = $(includedir)/spot-if/ltsmin
ltsmin_HEADERS = ltsmin.hh ltsmin_HEADERS = ltsmin.hh

View file

@ -30,7 +30,7 @@
# define WEXITSTATUS(x) ((x) & 0xff) # define WEXITSTATUS(x) ((x) & 0xff)
#endif #endif
#include <iface/ltsmin/ltsmin.hh> #include <spot-if/ltsmin/ltsmin.hh>
#include <spot/misc/hashfunc.hh> #include <spot/misc/hashfunc.hh>
#include <spot/misc/fixpool.hh> #include <spot/misc/fixpool.hh>
#include <spot/misc/mspool.hh> #include <spot/misc/mspool.hh>

View file

@ -17,7 +17,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iface/ltsmin/ltsmin.hh> #include <spot-if/ltsmin/ltsmin.hh>
#include <spot/twaalgos/dot.hh> #include <spot/twaalgos/dot.hh>
#include <spot/tl/defaultenv.hh> #include <spot/tl/defaultenv.hh>
#include <spot/tl/parse.hh> #include <spot/tl/parse.hh>

View file

@ -42,7 +42,7 @@ fi
x="$x$x$x$x$x$x$x$x$x" # 9x x="$x$x$x$x$x$x$x$x$x" # 9x
x="$x$x$x$x$x$x$x$x$x" # 81x x="$x$x$x$x$x$x$x$x$x" # 81x
for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do
find "$dir" \( -name "${1-*}.hh" \ find "$dir" \( -name "${1-*}.hh" \
-o -name "${1-*}.hxx" \ -o -name "${1-*}.hxx" \

View file

@ -52,7 +52,7 @@ export LC_ALL
tmp=incltest.tmp tmp=incltest.tmp
for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do
find "$dir" \( -name "${1-*}.hh" \ find "$dir" \( -name "${1-*}.hh" \
-o -name "${1-*}.hxx" \ -o -name "${1-*}.hxx" \
@ -326,7 +326,7 @@ done
# Rules for Makefiles. # Rules for Makefiles.
for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do
find "$dir" -name "Makefile.am" -a -type f -a -print | find "$dir" -name "Makefile.am" -a -type f -a -print |
while read file; do while read file; do