Commit ad8d2422 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

buddy: rename libbdd to libbddx

* buddy/src/bdd.h, buddy/src/bvec.h, buddy/src/fdd.h: Rename as...
* buddy/src/bddx.h, buddy/src/bvecx.h, buddy/src/fddx.h: ... these.
* buddy/src/Makefile.am: Build libbddx.la instead of libbdd.la.
* buddy/examples/Makefile.def: Use it.
* Makefile.am, buddy/src/bddtest.cxx, buddy/src/bvec.c,
buddy/src/cppext.cxx, buddy/src/fdd.c, buddy/src/imatrix.h,
buddy/src/kernel.h, buddy/examples/adder/adder.cxx,
buddy/examples/bddcalc/parser_.h, buddy/examples/bddtest/bddtest.cxx,
buddy/examples/cmilner/cmilner.c, buddy/examples/fdd/fdd.cxx,
buddy/examples/milner/milner.cxx, buddy/examples/money/money.cxx,
buddy/examples/queen/queen.cxx, buddy/examples/solitare/solitare.cxx,
m4/buddy.m4, src/ltlvisit/apcollect.hh, src/ltlvisit/simplify.hh,
src/misc/bddlt.hh, src/misc/bddop.hh, src/misc/minato.hh,
src/priv/acccompl.hh, src/priv/accconv.hh, src/priv/accmap.hh,
src/priv/bddalloc.cc, src/tgba/bdddict.hh, src/tgba/bddprint.hh,
src/tgba/tgbamask.hh, src/tgba/tgbasafracomplement.cc,
src/tgbaalgos/emptiness.hh, src/tgbaalgos/gtec/sccstack.hh,
src/tgbaalgos/neverclaim.cc, src/tgbaalgos/powerset.cc,
src/tgbaalgos/sccfilter.hh, src/tgbaalgos/sccinfo.hh,
src/tgbaalgos/weight.hh, wrap/python/buddy.i: Adjust.
* NEWS, README: Document it.
parent f35be908
## -*- coding: utf-8 -*- ## -*- coding: utf-8 -*-
## Copyright (C) 2011, 2012, 2013 Laboratoire de Recherche et Développement ## Copyright (C) 2011, 2012, 2013, 2014 Laboratoire de Recherche et Développement
## de l'Epita (LRDE). ## de l'Epita (LRDE).
## Copyright (C) 2003, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), ## Copyright (C) 2003, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## département Systèmes Répartis Coopératifs (SRC), Université Pierre
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
## 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/>.
if WITH_INCLUDED_BUDDY
MAYBE_BUDDY = buddy
endif WITH_INCLUDED_BUDDY
if NEVER if NEVER
# For Automake a conditional directory # For Automake a conditional directory
# is conditionally built, but unconditionally distributed. # is conditionally built, but unconditionally distributed.
...@@ -31,7 +28,7 @@ if NEVER ...@@ -31,7 +28,7 @@ if NEVER
NEVER_BENCH = bench NEVER_BENCH = bench
endif endif
SUBDIRS = $(MAYBE_BUDDY) $(NEVER_BENCH) lib src wrap ltdl iface doc SUBDIRS = buddy lib src wrap ltdl iface doc $(NEVER_BENCH)
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
......
...@@ -2,6 +2,10 @@ New in spot 1.99a (not yet released) ...@@ -2,6 +2,10 @@ New in spot 1.99a (not yet released)
* Major changes (including backward incompatible changes): * Major changes (including backward incompatible changes):
- The curstomized version of BuDDy (libbdd) used by Spot has be
renamed as (libbddx) to avoid issues with copies of BuDDy
already installed on the system.
- ltlgrind is a new tool that mutates LTL or PSL formulas. If you - ltlgrind is a new tool that mutates LTL or PSL formulas. If you
have a tool that is bogus on some formula that is tool large to have a tool that is bogus on some formula that is tool large to
debug, you can use ltlgrind to generate smaller derived formulas debug, you can use ltlgrind to generate smaller derived formulas
......
...@@ -28,18 +28,21 @@ Installation ...@@ -28,18 +28,21 @@ Installation
Requirements Requirements
------------ ------------
Spot requires a complete installation of Python (version 2.0 or Spot requires a C++11-compliant compiler.
later). Especially, Python's headers files should be installed. If
you don't have Python installed, you should run configure with
the --disable-python option (see below).
Spot expects a complete installation of Python (version 2.0 or later).
Especially, Python's headers files should be installed. If you don't
have Python installed, and do NOT want to install it, you should run
configure with the --disable-python option (see below).
Third-party dependencies Optional third-party dependencies
------------------------ ----------------------------------
Spot also uses a modified version of BuDDy (a binary decision diagram
library), that is already included in the buddy/ directory. So you
do not need to install it yourself. If the SAT-solver glucose is found on your system, it will
be used by our test suite to test our SAT-based minimization
algorithm.
Spot used to distribute a modified version of LBTT (an LTL to Büchi Spot used to distribute a modified version of LBTT (an LTL to Büchi
test bench), mostly fixing errors reported by recent compilers. test bench), mostly fixing errors reported by recent compilers.
...@@ -61,15 +64,6 @@ should read the file INSTALL for generic instructions. ...@@ -61,15 +64,6 @@ should read the file INSTALL for generic instructions.
In addition to its usual options, ./configure will accept some In addition to its usual options, ./configure will accept some
flags specific to Spot: flags specific to Spot:
--with-included-buddy
After you have installed Spot the first time, a modified version
of BuDDy will be installed. The next time you reconfigure Spot,
configure will detect that this version is already installed, and
will attempt to use it directly (this is in case you had to modify
one of these yourself for another purpose). This option will
*force* the use, build, and installation of the included version
of BuDDy, even when a compatible version is already installed.
--disable-python --disable-python
Turn off the compilation of Python bindings. These bindings are Turn off the compilation of Python bindings. These bindings are
currently used to run a couple of tests, and to build the CGI currently used to run a couple of tests, and to build the CGI
...@@ -190,7 +184,7 @@ iface/ Interfaces to other libraries. ...@@ -190,7 +184,7 @@ iface/ Interfaces to other libraries.
Third party software Third party software
-------------------- --------------------
buddy/ A patched version of BuDDy 2.3 (a BDD library). buddy/ A customized version of BuDDy 2.3 (a BDD library).
ltdl/ Libtool's portable dlopen() wrapper library. ltdl/ Libtool's portable dlopen() wrapper library.
lib/ Gnulib's portability modules. lib/ Gnulib's portability modules.
utf8/ Nemanja Trifunovic's utf-8 routines. utf8/ Nemanja Trifunovic's utf-8 routines.
......
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir) AM_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
LDADD = $(top_builddir)/src/libbdd.la LDADD = $(top_builddir)/src/libbddx.la
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <iostream> #include <iostream>
#include "bdd.h" #include "bddx.h"
using namespace std; using namespace std;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#define _PARSER_H #define _PARSER_H
#include <stdio.h> #include <stdio.h>
#include "bdd.h" #include "bddx.h"
#define MAXIDLEN 32 /* Max. number of allowed characters in an identifier */ #define MAXIDLEN 32 /* Max. number of allowed characters in an identifier */
......
#include <iomanip> #include <iomanip>
#include <stdlib.h> #include <stdlib.h>
#include <bdd.h> #include <bddx.h>
static const int varnum = 5; static const int varnum = 5;
......
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "bdd.h" #include "bddx.h"
int N; /* Number of cyclers */ int N; /* Number of cyclers */
int *normvar; /* Current state variables */ int *normvar; /* Current state variables */
...@@ -289,4 +289,3 @@ int main(int argc, char** argv) ...@@ -289,4 +289,3 @@ int main(int argc, char** argv)
return 0; return 0;
} }
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> -> 7 -> 0 * 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> -> 7 -> 0
*/ */
#include "fdd.h" #include "fddx.h"
/* Use the transition relation "transRel" to iterate through the statespace /* Use the transition relation "transRel" to iterate through the statespace
*/ */
......
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "bdd.h" #include "bddx.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
...@@ -176,4 +176,3 @@ int main(int argc, char** argv) ...@@ -176,4 +176,3 @@ int main(int argc, char** argv)
bdd_done(); bdd_done();
return 0; return 0;
} }
#include "bvec.h" #include "bvecx.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
**************************************************************************/ **************************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
#include "bdd.h" #include "bddx.h"
using namespace std; using namespace std;
int N; /* Size of the chess board */ int N; /* Size of the chess board */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
#include "bdd.h" #include "bddx.h"
using std::cout; using std::cout;
using std::endl; using std::endl;
using std::flush; using std::flush;
...@@ -217,4 +217,3 @@ int main(void) ...@@ -217,4 +217,3 @@ int main(void)
system("ps aux | grep \"./solitare\" | grep -v \"grep\""); system("ps aux | grep \"./solitare\" | grep -v \"grep\"");
} }
include_HEADERS = bddx.h fddx.h bvecx.h
include_HEADERS = bdd.h fdd.h bvec.h
BUDDY_FLAGS = -I$(top_builddir) -DVERSION=23 -DBUDDY_DLL_EXPORTS -DBUDDY_DLL BUDDY_FLAGS = -I$(top_builddir) -DVERSION=23 -DBUDDY_DLL_EXPORTS -DBUDDY_DLL
lib_LTLIBRARIES = libbdd.la lib_LTLIBRARIES = libbddx.la
# See the `Updating version info' node of the Libtool manual before # See the `Updating version info' node of the Libtool manual before
# changing this. # changing this.
libbdd_la_LDFLAGS = -no-undefined -version-info 0:0:0 libbddx_la_LDFLAGS = -no-undefined -version-info 0:0:0
libbdd_la_CPPFLAGS = $(BUDDY_FLAGS) libbddx_la_CPPFLAGS = $(BUDDY_FLAGS)
libbdd_la_SOURCES = \ libbddx_la_SOURCES = \
bddio.c \ bddio.c \
bddop.c \ bddop.c \
bddtree.h \ bddtree.h \
...@@ -30,4 +29,4 @@ libbdd_la_SOURCES = \ ...@@ -30,4 +29,4 @@ libbdd_la_SOURCES = \
check_PROGRAMS = bddtest check_PROGRAMS = bddtest
bddtest_SOURCES = bddtest.cxx bddtest_SOURCES = bddtest.cxx
bddtest_CPPFLAGS = -I$(top_builddir) bddtest_CPPFLAGS = -I$(top_builddir)
bddtest_LDADD = ./libbdd.la bddtest_LDADD = ./libbddx.la
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include <string> #include <string>
#include <cstdlib> #include <cstdlib>
#include "bdd.h" #include "bddx.h"
#include "bvec.h" #include "bvecx.h"
using namespace std; using namespace std;
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
DATE: (C) feb 1997 DATE: (C) feb 1997
*************************************************************************/ *************************************************************************/
#ifndef _BDD_H #ifndef _BDDX_H
#define _BDD_H #define _BDDX_H
#if __GNUC__ >= 3 #if __GNUC__ >= 3
#define __purefn __attribute__((__pure__)) #define __purefn __attribute__((__pure__))
...@@ -1046,6 +1046,6 @@ BUDDY_API bddstrmhandler bdd_strm_hook(bddstrmhandler); ...@@ -1046,6 +1046,6 @@ BUDDY_API bddstrmhandler bdd_strm_hook(bddstrmhandler);
#endif /* CPLUSPLUS */ #endif /* CPLUSPLUS */
#endif /* _BDD_H */ #endif /* _BDDX_H */
/* EOF */ /* EOF */
/*======================================================================== /*========================================================================
Copyright (C) 1996-2002 by Jorn Lind-Nielsen Copyright (C) 1996-2002, 2014 by Jorn Lind-Nielsen
All rights reserved All rights reserved
Permission is hereby granted, without written agreement and without Permission is hereby granted, without written agreement and without
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
*************************************************************************/ *************************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include "kernel.h" #include "kernel.h"
#include "bvec.h" #include "bvecx.h"
#define DEFAULT(v) { v.bitnum=0; v.bitvec=NULL; } #define DEFAULT(v) { v.bitnum=0; v.bitvec=NULL; }
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
DATE: (C) may 1999 DATE: (C) may 1999
*************************************************************************/ *************************************************************************/
#ifndef _BVEC_H #ifndef _BVECX_H
#define _BVEC_H #define _BVECX_H
#include "fdd.h" #include "fddx.h"
/* Boolean (BDD) vector */ /* Boolean (BDD) vector */
/* /*
...@@ -295,6 +295,6 @@ inline bdd bvec_neq(const bvec &left, const bvec &right) ...@@ -295,6 +295,6 @@ inline bdd bvec_neq(const bvec &left, const bvec &right)
#endif /* CPLUSPLUS */ #endif /* CPLUSPLUS */
#endif /* _BVEC_H */ #endif /* _BVECX_H */
/* EOF */ /* EOF */
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <iomanip> #include <iomanip>
#include "kernel.h" #include "kernel.h"
#include "bvec.h" #include "bvecx.h"
using namespace std; using namespace std;
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "kernel.h" #include "kernel.h"
#include "fdd.h" #include "fddx.h"
static void fdd_printset_rec(FILE *, int, int *); static void fdd_printset_rec(FILE *, int, int *);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment