removes unsound cases, adds unrolling

[cvc5.git] / Makefile

diff --git a/Makefile b/Makefile
index 2d1d86ce3062bf667a297f6f2144f8504aae945e..923d6afe6d381264b02c1bb88d0db991807cf371 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ all install examples install-examples .DEFAULT:
                cd $(builddir); \
                echo $(MAKE) $@; \
                $(MAKE) $@ || exit 1; \
+               $(MAKE) show-config; \
        else \
                echo; \
                echo 'Run configure first, or type "make" in a configured build directory.'; \
@@ -47,7 +48,7 @@ submission submission-main:
          exit 1; \
         fi
        ./autogen.sh
-       ./configure competition --disable-shared --enable-static-binary --with-cln
+       ./configure competition --disable-shared --enable-static-binary --with-cln --with-glpk
        $(MAKE)
        strip builds/bin/cvc4
        $(MAKE) check
@@ -55,9 +56,9 @@ submission submission-main:
        # main track
        mkdir -p cvc4-smteval-$(YEAR)
        cp -p builds/bin/cvc4 cvc4-smteval-$(YEAR)/cvc4
-       cp contrib/run-script-smteval2013 cvc4-smtcomp-$(YEAR)/run
+       cp contrib/run-script-smteval2013 cvc4-smteval-$(YEAR)/run
        chmod 755 cvc4-smteval-$(YEAR)/run
-       tar cf cvc4-smteval-$(YEAR).tar cvc4-smtcomp-$(YEAR)
+       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 \
@@ -67,7 +68,7 @@ submission-application:
          exit 1; \
         fi
        ./autogen.sh
-       ./configure competition --disable-shared --enable-static-binary --with-cln 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
@@ -78,7 +79,7 @@ submission-application:
        ( echo '#!/bin/sh'; \
          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-smtcomp-$(YEAR)
+       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 \
@@ -88,7 +89,7 @@ submission-parallel:
          exit 1; \
         fi
        ./autogen.sh
-       ./configure competition --disable-shared --enable-static-binary --with-gmp --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)
@@ -100,4 +101,4 @@ submission-parallel:
        ( echo '#!/bin/sh'; \
          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-smtcomp-$(YEAR)
+       tar cf cvc4-parallel-smteval-$(YEAR).tar cvc4-parallel-smteval-$(YEAR)