removes unsound cases, adds unrolling

[cvc5.git] / Makefile

diff --git a/Makefile b/Makefile
index 5b1acecbd83a12e256a6a1f22f34eb73c7990ee3..923d6afe6d381264b02c1bb88d0db991807cf371 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,14 @@
 #
 builddir = builds
 
-.PHONY: all
-all .DEFAULT:
+.PHONY: all install examples install-examples
+all install examples install-examples .DEFAULT:
        @if test -d $(builddir); then \
                echo cd $(builddir); \
                cd $(builddir); \
                echo $(MAKE) $@; \
                $(MAKE) $@ || exit 1; \
+               $(MAKE) show-config; \
        else \
                echo; \
                echo 'Run configure first, or type "make" in a configured build directory.'; \
@@ -34,12 +35,9 @@ distclean maintainerclean:
 .PHONY: test
 test: check
 
-.PHONY: doc
+.PHONY: doc doc-internals
 doc: doc-builds
-
-.PHONY: examples
-examples: all
-       (cd examples && $(MAKE) $(AM_MAKEFLAGS))
+doc-internals: doc-internals-builds
 
 YEAR := $(shell date +%Y)
 submission submission-main:
@@ -50,17 +48,17 @@ submission submission-main:
          exit 1; \
         fi
        ./autogen.sh
-       ./configure competition --disable-shared --enable-static-binary --with-cln --without-cudd
+       ./configure competition --disable-shared --enable-static-binary --with-cln --with-glpk
        $(MAKE)
        strip builds/bin/cvc4
        $(MAKE) check
        $(MAKE) -C test/regress/regress1 check
        # main track
-       mkdir -p cvc4-smtcomp-$(YEAR)
-       cp -p builds/bin/cvc4 cvc4-smtcomp-$(YEAR)/cvc4
-       cp contrib/run-script-smtcomp2012 cvc4-smtcomp-$(YEAR)/run
-       chmod 755 cvc4-smtcomp-$(YEAR)/run
-       tar cf cvc4-smtcomp-$(YEAR).tar cvc4-smtcomp-$(YEAR)
+       mkdir -p cvc4-smteval-$(YEAR)
+       cp -p builds/bin/cvc4 cvc4-smteval-$(YEAR)/cvc4
+       cp contrib/run-script-smteval2013 cvc4-smteval-$(YEAR)/run
+       chmod 755 cvc4-smteval-$(YEAR)/run
+       tar cf cvc4-smteval-$(YEAR).tar cvc4-smteval-$(YEAR)
 submission-application:
        # application track is a separate build because it has different preprocessor #defines
        @if [ -n "`ls src/parser/*/generated 2>/dev/null`" ]; then \
@@ -70,18 +68,18 @@ submission-application:
          exit 1; \
         fi
        ./autogen.sh
-       ./configure competition --disable-shared --enable-static-binary --with-cln --without-cudd CXXFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK CFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK
+       ./configure competition --disable-shared --enable-static-binary --with-cln --with-glpk CXXFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK CFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK
        $(MAKE)
        strip builds/bin/cvc4
        $(MAKE) check
        $(MAKE) -C test/regress/regress1 check
        # package the application track tarball
-       mkdir -p cvc4-application-smtcomp-$(YEAR)
-       cp -p builds/bin/cvc4 cvc4-application-smtcomp-$(YEAR)/cvc4
+       mkdir -p cvc4-application-smteval-$(YEAR)
+       cp -p builds/bin/cvc4 cvc4-application-smteval-$(YEAR)/cvc4
        ( echo '#!/bin/sh'; \
-         echo 'exec ./cvc4 -L smt2 --no-checking --no-interactive --incremental' ) > cvc4-application-smtcomp-$(YEAR)/run
-       chmod 755 cvc4-application-smtcomp-$(YEAR)/run
-       tar cf cvc4-application-smtcomp-$(YEAR).tar cvc4-application-smtcomp-$(YEAR)
+         echo 'exec ./cvc4 -L smt2 --no-checking --no-interactive --incremental' ) > cvc4-application-smteval-$(YEAR)/run
+       chmod 755 cvc4-application-smteval-$(YEAR)/run
+       tar cf cvc4-application-smteval-$(YEAR).tar cvc4-application-smteval-$(YEAR)
 submission-parallel:
        # parallel track can't be built with -cln, so it's a separate build
        @if [ -n "`ls src/parser/*/generated 2>/dev/null`" ]; then \
@@ -91,16 +89,16 @@ submission-parallel:
          exit 1; \
         fi
        ./autogen.sh
-       ./configure competition --disable-shared --enable-static-binary --with-gmp --without-cudd --with-portfolio
+       ./configure competition --disable-shared --enable-static-binary --with-gmp --with-portfolio --with-glpk
        $(MAKE)
        strip builds/bin/pcvc4
        # some test cases fail (and are known to fail)
        -$(MAKE) check BINARY=pcvc4
        $(MAKE) -C test/regress/regress1 check BINARY=pcvc4
        # package the parallel track tarball
-       mkdir -p cvc4-parallel-smtcomp-$(YEAR)
-       cp -p builds/bin/pcvc4 cvc4-parallel-smtcomp-$(YEAR)/pcvc4
+       mkdir -p cvc4-parallel-smteval-$(YEAR)
+       cp -p builds/bin/pcvc4 cvc4-parallel-smteval-$(YEAR)/pcvc4
        ( echo '#!/bin/sh'; \
-         echo 'exec ./pcvc4 --threads 2 -L smt2 --no-checking --no-interactive' ) > cvc4-parallel-smtcomp-$(YEAR)/run
-       chmod 755 cvc4-parallel-smtcomp-$(YEAR)/run
-       tar cf cvc4-parallel-smtcomp-$(YEAR).tar cvc4-parallel-smtcomp-$(YEAR)
+         echo 'exec ./pcvc4 --threads 2 -L smt2 --no-checking --no-interactive' ) > cvc4-parallel-smteval-$(YEAR)/run
+       chmod 755 cvc4-parallel-smteval-$(YEAR)/run
+       tar cf cvc4-parallel-smteval-$(YEAR).tar cvc4-parallel-smteval-$(YEAR)