alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename src/ as spot/ and use include <spot/...>

Browse source 
* NEWS: Mention the change.
* src/: Rename as ...
* spot/: ... this, adjust all headers to include <spot/...> instead of
"...", and adjust all Makefile.am to search headers from the top-level
directory.
* HACKING: Add conventions about #include.
* spot/sanity/style.test: Add a few more grep to catch cases
that do not follow these conventions.
* .gitignore, Makefile.am, README, bench/stutter/Makefile.am,
bench/stutter/stutter_invariance_formulas.cc,
bench/stutter/stutter_invariance_randomgraph.cc, configure.ac,
debian/rules, doc/Doxyfile.in, doc/Makefile.am,
doc/org/.dir-locals.el.in, doc/org/g++wrap.in, doc/org/init.el.in,
doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org,
doc/org/tut10.org, doc/org/tut20.org, doc/org/tut21.org,
doc/org/tut22.org, doc/org/tut30.org, iface/ltsmin/Makefile.am,
iface/ltsmin/kripke.test, iface/ltsmin/ltsmin.cc,
iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc,
wrap/python/Makefile.am, wrap/python/ajax/spotcgi.in,
wrap/python/spot_impl.i, wrap/python/tests/ltl2tgba.py,
wrap/python/tests/randgen.py, wrap/python/tests/run.in: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-12-04 19:42:23 +01:00
parent 1fddfe60ec
commit f120dd3206
529 changed files with 1308 additions and 1262 deletions
Download patch file Download diff file Expand all files Collapse all files

10
iface/ltsmin/Makefile.am
View file

@ -17,7 +17,7 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
$(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl
AM_CXXFLAGS = $(WARNING_CXXFLAGS)
@ -27,7 +27,7 @@ ltsmin_HEADERS = ltsmin.hh
lib_LTLIBRARIES = libspotltsmin.la
libspotltsmin_la_LIBADD = \
$(top_builddir)/src/libspot.la \
$(top_builddir)/spot/libspot.la \
$(top_builddir)/ltdl/libltdlc.la -lpthread
libspotltsmin_la_LDFLAGS = -no-undefined $(SYMBOLIC_LDFLAGS)
libspotltsmin_la_SOURCES = ltsmin.cc
@ -42,10 +42,10 @@ check_SCRIPTS = defs
TESTS = check.test finite.test finite2.test kripke.test
EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve finite.pm
kripke.test: $(top_builddir)/src/tests/parse_print$(EXEEXT)
kripke.test: $(top_builddir)/spot/tests/parse_print$(EXEEXT)
$(top_builddir)/src/tests/parse_print$(EXEEXT):
cd $(top_builddir)/src/tests && \
$(top_builddir)/spot/tests/parse_print$(EXEEXT):
cd $(top_builddir)/spot/tests && \
$(MAKE) $(AM_MAKEFLAGS) parse_print$(EXEEXT)
distclean-local:

4
iface/ltsmin/kripke.test
View file

@ -34,9 +34,9 @@ fi
set -e
run 0 ../modelcheck -gK ${srcdir}/finite.dve 'F("P.a > 5")' > output
run 0 ${top_builddir}/src/tests/parse_print output | tr -d '"' > output2
run 0 ${top_builddir}/spot/tests/parse_print output | tr -d '"' > output2
tr -d '"' < output >outputF
cmp outputF output2
../modelcheck -gK $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")' > outputP
${top_builddir}/src/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'
${top_builddir}/spot/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'

12
iface/ltsmin/ltsmin.cc
View file

@ -30,12 +30,12 @@
# define WEXITSTATUS(x) ((x) & 0xff)
#endif
#include "ltsmin.hh"
#include "misc/hashfunc.hh"
#include "misc/fixpool.hh"
#include "misc/mspool.hh"
#include "misc/intvcomp.hh"
#include "misc/intvcmp2.hh"
#include <iface/ltsmin/ltsmin.hh>
#include <spot/misc/hashfunc.hh>
#include <spot/misc/fixpool.hh>
#include <spot/misc/mspool.hh>
#include <spot/misc/intvcomp.hh>
#include <spot/misc/intvcmp2.hh>
namespace spot
{

4
iface/ltsmin/ltsmin.hh
View file

@ -19,8 +19,8 @@
#pragma once
#include "kripke/kripke.hh"
#include "tl/apcollect.hh"
#include <spot/kripke/kripke.hh>
#include <spot/tl/apcollect.hh>
namespace spot
{

24
iface/ltsmin/modelcheck.cc
View file

@ -17,19 +17,19 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ltsmin.hh"
#include "twaalgos/dot.hh"
#include "tl/defaultenv.hh"
#include "tl/parse.hh"
#include "twaalgos/translate.hh"
#include "twaalgos/emptiness.hh"
#include "twaalgos/postproc.hh"
#include "twa/twaproduct.hh"
#include "misc/timer.hh"
#include "misc/memusage.hh"
#include <iface/ltsmin/ltsmin.hh>
#include <spot/twaalgos/dot.hh>
#include <spot/tl/defaultenv.hh>
#include <spot/tl/parse.hh>
#include <spot/twaalgos/translate.hh>
#include <spot/twaalgos/emptiness.hh>
#include <spot/twaalgos/postproc.hh>
#include <spot/twa/twaproduct.hh>
#include <spot/misc/timer.hh>
#include <spot/misc/memusage.hh>
#include <cstring>
#include "kripke/kripkegraph.hh"
#include "twaalgos/hoa.hh"
#include <spot/kripke/kripkegraph.hh>
#include <spot/twaalgos/hoa.hh>
static void
syntax(char* prog)