updated build script for smt-comp submission

2 files changed, 34 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index e720e2db8..d0e7b2ebc 100644
--- a/Makefile
+++ b/Makefile
@@ -42,15 +42,15 @@ examples: all
 	(cd examples && $(MAKE) $(AM_MAKEFLAGS))
 
 YEAR := $(shell date +%Y)
-submission:
+submission submission-main:
 	@if [ -n "`ls src/parser/*/generated`" ]; then \
 	  echo 'ERROR:' >&2; \
 	  echo 'ERROR: Please make maintainer-clean first.' >&2; \
 	  echo 'ERROR:' >&2; \
 	  exit 1; \
         fi
-	if [ ! -e configure ]; then ./autogen.sh; fi
-	./configure competition --disable-shared --enable-static-binary --with-cln
+	./autogen.sh
+	./configure competition --disable-shared --enable-static-binary --with-cln --without-cudd
 	$(MAKE)
 	strip builds/bin/cvc4
 	$(MAKE) check
@@ -62,10 +62,16 @@ submission:
 	  echo 'exec ./cvc4 -L smt2 --no-checking --no-interactive' ) > cvc4-smtcomp-$(YEAR)/run
 	chmod 755 cvc4-smtcomp-$(YEAR)/run
 	tar cf cvc4-smtcomp-$(YEAR).tar cvc4-smtcomp-$(YEAR)
-	# 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
+submission-application:
+	# application track is a separate build because it has different preprocessor #defines
+	@if [ -n "`ls src/parser/*/generated`" ]; then \
+	  echo 'ERROR:' >&2; \
+	  echo 'ERROR: Please make maintainer-clean first.' >&2; \
+	  echo 'ERROR:' >&2; \
+	  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
 	$(MAKE)
 	strip builds/bin/cvc4
 	$(MAKE) check
@@ -77,10 +83,16 @@ submission:
 	  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)
+submission-parallel:
 	# 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
+	@if [ -n "`ls src/parser/*/generated`" ]; then \
+	  echo 'ERROR:' >&2; \
+	  echo 'ERROR: Please make maintainer-clean first.' >&2; \
+	  echo 'ERROR:' >&2; \
+	  exit 1; \
+        fi
+	./autogen.sh
+	./configure competition --disable-shared --enable-static-binary --with-gmp --without-cudd --with-portfolio
 	$(MAKE)
 	strip builds/bin/pcvc4
 	# some test cases fail (and are known to fail)
diff --git a/contrib/cut-release b/contrib/cut-release
index 8f707dcc3..ec5ee9c87 100755
--- a/contrib/cut-release
+++ b/contrib/cut-release
@@ -43,10 +43,10 @@ if echo "$version" | grep '[^a-zA-Z0-9_.+(){}^%#-]' &>/dev/null; then
   exit 1
 fi
 
-vs=($(echo "$version" | sed 's,^\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\?\(.*\),\1 \2 \4 \5,'))
+eval "declare -a vs=($(echo "$version" | sed 's,^\([0-9]*\)\.\([0-9]*\)\(\.\([0-9]*\)\)\?\(.*\),[0]=\1 [1]=\2 [2]=\4 [3]=\5,'))"
 major=${vs[0]}
-minor=${vs[1]}
-release=${vs[2]-0}
+minor=${vs[1]}; if [ -z "$minor" ]; then minor=0; fi
+release=${vs[2]}; if [ -z "$release" ]; then release=0; fi
 extra=${vs[3]}
 echo
 echo "Major  : $major"
@@ -149,14 +149,14 @@ echo "Building and checking distribution \`cvc4-$version'..."
 if ! $SHELL -c '\
 	version="'$version'"; \
 	set -ex; \
-	./autogen.sh; \
+	./autogen.sh || echo "autoconf failed; does library_versions have something to match $version?"; \
 	mkdir "release-$version"; \
 	cd "release-$version"; \
-	../configure production-cln-staticbinary --disable-shared --enable-unit-testing --with-cudd --with-readline; \
+	../configure production-cln-staticbinary --disable-shared --enable-unit-testing --with-gmp --without-cudd --with-readline --with-portfolio; \
 	make dist "$@"; \
 	tar xf "cvc4-$version.tar.gz"; \
 	cd "cvc4-$version"; \
-	./configure production-cln-staticbinary --disable-shared --enable-unit-testing --with-cudd --with-readline; \
+	./configure production-cln-staticbinary --disable-shared --enable-unit-testing --with-gmp --without-cudd --with-readline --with-portfolio; \
 	make check "$@"; \
 	make distcheck "$@"; \
 '; then
@@ -192,11 +192,16 @@ cp -p "release-$version/cvc4-$version.tar.gz" .
 gpg -b --armor "cvc4-$version.tar.gz"
 
 echo
-echo "Signing binary..."
+echo "Signing cvc4 binary..."
 cp -p "release-$version/src/main/cvc4" "cvc4-$version"
 gpg -b --armor "cvc4-$version"
 
 echo
+echo "Signing pcvc4 binary..."
+cp -p "release-$version/src/main/pcvc4" "pcvc4-$version"
+gpg -b --armor "pcvc4-$version"
+
+echo
 echo "About to run: svn commit -m \"Cutting release $version.\""
 isthatright
 $dryrun || svn commit -m "Cutting release $version."