From b519c7d3dc6c49c49b2e2c749f3ed502e33633fa Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 7 Dec 2015 21:53:09 +0100 Subject: [PATCH] rename iface/ as spot-if/ So that instead of having to do #incluce for using installed the installed header, and #incluce for using the non-installed version, we now do #incluce 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. --- Makefile.am | 2 +- NEWS | 5 ++++- README | 16 +++++++++------- configure.ac | 6 +++--- debian/libspot-dev.install | 1 + doc/Doxyfile.in | 6 ++---- {iface => spot-if}/.gitignore | 0 {iface => spot-if}/Makefile.am | 0 {iface => spot-if}/ltsmin/.gitignore | 0 {iface => spot-if}/ltsmin/Makefile.am | 2 +- {iface => spot-if}/ltsmin/README | 0 {iface => spot-if}/ltsmin/beem-peterson.4.dve | 0 {iface => spot-if}/ltsmin/check.test | 0 {iface => spot-if}/ltsmin/defs.in | 0 {iface => spot-if}/ltsmin/elevator2.1.pm | 0 {iface => spot-if}/ltsmin/finite.dve | 0 {iface => spot-if}/ltsmin/finite.pm | 0 {iface => spot-if}/ltsmin/finite.test | 0 {iface => spot-if}/ltsmin/finite2.test | 0 {iface => spot-if}/ltsmin/kripke.test | 0 {iface => spot-if}/ltsmin/ltsmin.cc | 2 +- {iface => spot-if}/ltsmin/ltsmin.hh | 0 {iface => spot-if}/ltsmin/modelcheck.cc | 2 +- spot/sanity/80columns.test | 2 +- spot/sanity/style.test | 4 ++-- 25 files changed, 26 insertions(+), 22 deletions(-) rename {iface => spot-if}/.gitignore (100%) rename {iface => spot-if}/Makefile.am (100%) rename {iface => spot-if}/ltsmin/.gitignore (100%) rename {iface => spot-if}/ltsmin/Makefile.am (97%) rename {iface => spot-if}/ltsmin/README (100%) rename {iface => spot-if}/ltsmin/beem-peterson.4.dve (100%) rename {iface => spot-if}/ltsmin/check.test (100%) rename {iface => spot-if}/ltsmin/defs.in (100%) rename {iface => spot-if}/ltsmin/elevator2.1.pm (100%) rename {iface => spot-if}/ltsmin/finite.dve (100%) rename {iface => spot-if}/ltsmin/finite.pm (100%) rename {iface => spot-if}/ltsmin/finite.test (100%) rename {iface => spot-if}/ltsmin/finite2.test (100%) rename {iface => spot-if}/ltsmin/kripke.test (100%) rename {iface => spot-if}/ltsmin/ltsmin.cc (99%) rename {iface => spot-if}/ltsmin/ltsmin.hh (100%) rename {iface => spot-if}/ltsmin/modelcheck.cc (99%) diff --git a/Makefile.am b/Makefile.am index c02cd3836..21df37bc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ if NEVER NEVER_SUBDIRS = bench elisp 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/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h diff --git a/NEWS b/NEWS index 071178a2b..8c17eecfc 100644 --- a/NEWS +++ b/NEWS @@ -18,7 +18,10 @@ New in spot 1.99.6a (not yet released) Inside the source distribution, the subdirectory src/ has been 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 - 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: diff --git a/README b/README index 3cb83cce2..e93c1ff76 100644 --- a/README +++ b/README @@ -124,7 +124,7 @@ Some documentation can be found in the doc/ directory. "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 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. gtec/ Couvreur's Emptiness-Check. sanity/ Sanity tests for the whole project. -doc/ Documentation for libspot. +doc/ Documentation for Spot. org/ Source of userdoc/ as org-mode files. tl/ Documentation of the Temporal Logic operators. userdoc/ HTML documentation about the command-line tools. @@ -163,13 +163,13 @@ bench/ Benchmarks for ... ltlcounter/ ... translation of a class of LTL formulas, ltlclasses/ ... translation of more classes of LTL formulas, spin13/ ... compositional suspension and other improvements, + stutter/ ... stutter-invariance checking algorithms, wdba/ ... WDBA minimization (for obligation properties). - stutter/ ... stutter-invariance checking algorithms 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. -iface/ Interfaces to other libraries. +spot-if/ Interfaces between Spot and other libraries. ltsmin/ Interface with DiVinE2 and SpinS. Third party software @@ -197,9 +197,11 @@ End: 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: 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: 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: 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 diff --git a/configure.ac b/configure.ac index d3738332a..54f2c7851 100644 --- a/configure.ac +++ b/configure.ac @@ -198,9 +198,6 @@ AC_CONFIG_FILES([ doc/org/.dir-locals.el doc/org/init.el elisp/Makefile - iface/ltsmin/defs - iface/ltsmin/Makefile - iface/Makefile lib/Makefile spot/bin/Makefile spot/bin/man/Makefile @@ -220,6 +217,9 @@ AC_CONFIG_FILES([ spot/twaalgos/gtec/Makefile spot/twaalgos/Makefile spot/twa/Makefile + spot-if/ltsmin/defs + spot-if/ltsmin/Makefile + spot-if/Makefile wrap/Makefile wrap/python/ajax/Makefile wrap/python/Makefile diff --git a/debian/libspot-dev.install b/debian/libspot-dev.install index 1042d0eeb..6a2a917d7 100644 --- a/debian/libspot-dev.install +++ b/debian/libspot-dev.install @@ -1,3 +1,4 @@ usr/include/spot +usr/include/spot-if usr/lib/*-*/libspot.so usr/lib/*-*/libspotltsmin.so diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index a467c227a..7fc573296 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -153,7 +153,6 @@ FULL_PATH_NAMES = YES # This tag requires that the tag FULL_PATH_NAMES is set to YES. STRIP_FROM_PATH = @top_srcdir@/ \ - @top_srcdir@/iface/ \ @srcdir@ # 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 # using the -I flag. -STRIP_FROM_INC_PATH = @top_srcdir@/ \ - @top_srcdir@/iface/ +STRIP_FROM_INC_PATH = @top_srcdir@/ # 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 @@ -763,7 +761,7 @@ WARN_LOGFILE = INPUT = @srcdir@/mainpage.dox \ @top_srcdir@/spot \ - @top_srcdir@/iface + @top_srcdir@/spot-if # 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 diff --git a/iface/.gitignore b/spot-if/.gitignore similarity index 100% rename from iface/.gitignore rename to spot-if/.gitignore diff --git a/iface/Makefile.am b/spot-if/Makefile.am similarity index 100% rename from iface/Makefile.am rename to spot-if/Makefile.am diff --git a/iface/ltsmin/.gitignore b/spot-if/ltsmin/.gitignore similarity index 100% rename from iface/ltsmin/.gitignore rename to spot-if/ltsmin/.gitignore diff --git a/iface/ltsmin/Makefile.am b/spot-if/ltsmin/Makefile.am similarity index 97% rename from iface/ltsmin/Makefile.am rename to spot-if/ltsmin/Makefile.am index 636dfbf74..9f7319f71 100644 --- a/iface/ltsmin/Makefile.am +++ b/spot-if/ltsmin/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \ $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl AM_CXXFLAGS = $(WARNING_CXXFLAGS) -ltsmindir = $(pkgincludedir)/iface/ltsmin +ltsmindir = $(includedir)/spot-if/ltsmin ltsmin_HEADERS = ltsmin.hh diff --git a/iface/ltsmin/README b/spot-if/ltsmin/README similarity index 100% rename from iface/ltsmin/README rename to spot-if/ltsmin/README diff --git a/iface/ltsmin/beem-peterson.4.dve b/spot-if/ltsmin/beem-peterson.4.dve similarity index 100% rename from iface/ltsmin/beem-peterson.4.dve rename to spot-if/ltsmin/beem-peterson.4.dve diff --git a/iface/ltsmin/check.test b/spot-if/ltsmin/check.test similarity index 100% rename from iface/ltsmin/check.test rename to spot-if/ltsmin/check.test diff --git a/iface/ltsmin/defs.in b/spot-if/ltsmin/defs.in similarity index 100% rename from iface/ltsmin/defs.in rename to spot-if/ltsmin/defs.in diff --git a/iface/ltsmin/elevator2.1.pm b/spot-if/ltsmin/elevator2.1.pm similarity index 100% rename from iface/ltsmin/elevator2.1.pm rename to spot-if/ltsmin/elevator2.1.pm diff --git a/iface/ltsmin/finite.dve b/spot-if/ltsmin/finite.dve similarity index 100% rename from iface/ltsmin/finite.dve rename to spot-if/ltsmin/finite.dve diff --git a/iface/ltsmin/finite.pm b/spot-if/ltsmin/finite.pm similarity index 100% rename from iface/ltsmin/finite.pm rename to spot-if/ltsmin/finite.pm diff --git a/iface/ltsmin/finite.test b/spot-if/ltsmin/finite.test similarity index 100% rename from iface/ltsmin/finite.test rename to spot-if/ltsmin/finite.test diff --git a/iface/ltsmin/finite2.test b/spot-if/ltsmin/finite2.test similarity index 100% rename from iface/ltsmin/finite2.test rename to spot-if/ltsmin/finite2.test diff --git a/iface/ltsmin/kripke.test b/spot-if/ltsmin/kripke.test similarity index 100% rename from iface/ltsmin/kripke.test rename to spot-if/ltsmin/kripke.test diff --git a/iface/ltsmin/ltsmin.cc b/spot-if/ltsmin/ltsmin.cc similarity index 99% rename from iface/ltsmin/ltsmin.cc rename to spot-if/ltsmin/ltsmin.cc index 271b8a660..1fd60ca23 100644 --- a/iface/ltsmin/ltsmin.cc +++ b/spot-if/ltsmin/ltsmin.cc @@ -30,7 +30,7 @@ # define WEXITSTATUS(x) ((x) & 0xff) #endif -#include +#include #include #include #include diff --git a/iface/ltsmin/ltsmin.hh b/spot-if/ltsmin/ltsmin.hh similarity index 100% rename from iface/ltsmin/ltsmin.hh rename to spot-if/ltsmin/ltsmin.hh diff --git a/iface/ltsmin/modelcheck.cc b/spot-if/ltsmin/modelcheck.cc similarity index 99% rename from iface/ltsmin/modelcheck.cc rename to spot-if/ltsmin/modelcheck.cc index 2d3cd1d2b..1abdb4230 100644 --- a/iface/ltsmin/modelcheck.cc +++ b/spot-if/ltsmin/modelcheck.cc @@ -17,7 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include +#include #include #include #include diff --git a/spot/sanity/80columns.test b/spot/sanity/80columns.test index c8a3f3138..6a0b7fe57 100755 --- a/spot/sanity/80columns.test +++ b/spot/sanity/80columns.test @@ -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" # 81x -for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do +for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do find "$dir" \( -name "${1-*}.hh" \ -o -name "${1-*}.hxx" \ diff --git a/spot/sanity/style.test b/spot/sanity/style.test index 68784ea2f..d9465165f 100755 --- a/spot/sanity/style.test +++ b/spot/sanity/style.test @@ -52,7 +52,7 @@ export LC_ALL tmp=incltest.tmp -for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do +for dir in "${INCDIR-..}" "${INCDIR-..}"/../spot-if; do find "$dir" \( -name "${1-*}.hh" \ -o -name "${1-*}.hxx" \ @@ -326,7 +326,7 @@ done # 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 | while read file; do