From: Morgan Deters <mdeters@gmail.com>
Date: Wed, 13 Jun 2012 20:27:58 +0000 (+0000)
Subject: revisions to the "make submission" target
X-Git-Tag: cvc5-1.0.0~8035
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=859dcf3feb5f34689c9423b6ad13030fc8f2e212;p=cvc5.git

revisions to the "make submission" target
---

diff --git a/Makefile b/Makefile
index 7f0dc916d..7537bb97b 100644
--- a/Makefile
+++ b/Makefile
@@ -50,12 +50,11 @@ submission:
 	  exit 1; \
         fi
 	if [ ! -e configure ]; then ./autogen.sh; fi
-	./configure competition --disable-shared --enable-static-binary --with-cln --with-portfolio
+	./configure competition --disable-shared --enable-static-binary --with-cln
 	$(MAKE)
 	strip builds/bin/cvc4
-	$(MAKE) regress1
-	strip builds/bin/pcvc4
-	$(MAKE) regress1 BINARY=pcvc4
+	$(MAKE) check
+	$(MAKE) -C test/regress/regress1 check
 	# main track
 	mkdir -p cvc4-smtcomp-$(YEAR)
 	cp -p builds/bin/cvc4 cvc4-smtcomp-$(YEAR)/cvc4
@@ -63,20 +62,29 @@ submission:
 	  echo 'exec ./cvc4 -L smt2 --no-interactive' ) > cvc4-smtcomp-$(YEAR)/run
 	chmod 755 cvc4-smtcomp-$(YEAR)/run
 	tar cf cvc4-smtcomp-$(YEAR).tar cvc4-smtcomp-$(YEAR)
-	# parallel track
+	# parallel track can't be built with -cln, so it's a separate build
+	make maintainer-clean
+	if [ ! -e configure ]; then ./autogen.sh; fi
+	./configure competition --disable-shared --enable-static-binary --with-gmp --with-portfolio
+	$(MAKE)
+	strip builds/bin/pcvc4
+	$(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
 	( echo '#!/bin/sh'; \
-	  echo 'exec ./pcvc4 -L smt2 --no-interactive' ) > cvc4-parallel-smtcomp-$(YEAR)/run
+	  echo 'exec ./pcvc4 --threads 2 -L smt2 --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)
-	# application track is a separate build
+	# application track is a separate build too :-(
 	make maintainer-clean
 	if [ ! -e configure ]; then ./autogen.sh; fi
 	./configure competition --disable-shared --enable-static-binary --with-cln CXXFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK CFLAGS=-DCVC4_SMTCOMP_APPLICATION_TRACK
 	$(MAKE)
 	strip builds/bin/cvc4
-	$(MAKE) regress1
+	$(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