More make submission stuff

1 files changed, 25 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 4e08075bc..37d4a9bd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# -*-makefile-*-
+#  -*-makefile-*-
 #
 # This makefile is the _source_ directory's makefile, and is static,
 # not generated.  Makefile.am is the automake makefile for the build
@@ -40,16 +40,21 @@ doc: doc-builds
 doc-internals: doc-internals-builds
 
 YEAR := $(shell date +%Y)
+.PHONY: submission submission-main submission-application submission-parallel
 submission:
 	@if [ -d builds-smtcomp ]; then \
+	  echo 'ERROR:' >&2; \
 	  echo 'ERROR: remove the builds-smtcomp directory' >&2; \
+	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
 	@if test -d cvc4-smtcomp-$(YEAR) || test -e cvc4-smtcomp-$(YEAR).zip || \
 	    test -d cvc4-smtcomp-main-$(YEAR) || test -e cvc4-smtcomp-main-$(YEAR).zip || \
 	    test -d cvc4-smtcomp-application-$(YEAR) || test -e cvc4-smtcomp-application-$(YEAR).zip || \
 	    test -d cvc4-smtcomp-parallel-$(YEAR) || test -e cvc4-smtcomp-parallel-$(YEAR).zip; then \
-	  echo 'ERROR: remove cvc4-smtcomp*-$(YEAR) and corresponding zipfiles.' >&2; \
+	  echo 'ERROR:' >&2; \
+	  echo 'ERROR: Please remove cvc4-smtcomp*-$(YEAR) and corresponding zipfiles.' >&2; \
+	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
 	$(MAKE) submission-main
@@ -66,17 +71,19 @@ submission:
 	    cvc4-smtcomp-application-$(YEAR)/starexec_description.txt \
 	    cvc4-smtcomp-parallel-$(YEAR)/starexec_description.txt \
 	    > cvc4-smtcomp-$(YEAR)/starexec_description.txt
-	perl -pi -e 's,\<cvc4\>,cvc4-main,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_default
-	perl -pi -e 's,\<cvc4\>,cvc4-application,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_application
+	perl -pi -e 's,/cvc4\b,/cvc4-main,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_default
+	perl -pi -e 's,/cvc4\b,/cvc4-application,g' cvc4-smtcomp-$(YEAR)/bin/starexec_run_application
 	cd cvc4-smtcomp-$(YEAR) && zip -r ../cvc4-smtcomp-$(YEAR).zip *
 submission-main:
 	@if [ -d builds-smtcomp/main ]; then \
-	  echo 'ERROR: remove the builds-smtcomp/main directory' >&2; \
+	  echo 'ERROR:' >&2; \
+	  echo 'ERROR: Please remove the builds-smtcomp/main directory' >&2; \
+	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
-	@if [ -n "`ls src/parser/*/generated 2>/dev/null`" ]; then \
+	@if [ -e contrib/run-script-smtcomp$(YEAR) ]; then :; else \
 	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please make maintainer-clean first.' >&2; \
+	  echo 'ERROR: Expected contrib/run-script-smtcomp$(YEAR) to exist!' >&2; \
 	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
@@ -96,19 +103,15 @@ submission-main:
 	# main track
 	mkdir -p cvc4-smtcomp-main-$(YEAR)/bin
 	cp -p builds-smtcomp/main/src/main/cvc4 cvc4-smtcomp-main-$(YEAR)/bin/cvc4
-	cp contrib/run-script-smtcomp2014 cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default
+	cp contrib/run-script-smtcomp$(YEAR) cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default
 	chmod 755 cvc4-smtcomp-main-$(YEAR)/bin/starexec_run_default
 	echo "CVC4 for SMT_COMP main track `builds-smtcomp/main/src/main/cvc4 --version | head -1 | sed 's,.*version ,,;s,-,_,g;s,[^a-zA-Z0-9. _],,g'`" > cvc4-smtcomp-main-$(YEAR)/starexec_description.txt
 	cd cvc4-smtcomp-main-$(YEAR) && zip -r ../cvc4-smtcomp-main-$(YEAR).zip *
 submission-application:
 	# application track is a separate build because it has different preprocessor #defines
 	@if [ -d builds-smtcomp/application ]; then \
-	  echo 'ERROR: remove the builds-smtcomp/main directory' >&2; \
-	  exit 1; \
-	fi
-	@if [ -n "`ls src/parser/*/generated 2>/dev/null`" ]; then \
 	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please make maintainer-clean first.' >&2; \
+	  echo 'ERROR: Please remove the builds-smtcomp/main directory' >&2; \
 	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
@@ -118,6 +121,12 @@ submission-application:
 	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
+	@if [ -e contrib/run-script-smtcomp$(YEAR)-application ]; then :; else \
+	  echo 'ERROR:' >&2; \
+	  echo 'ERROR: Expected contrib/run-script-smtcomp$(YEAR)-application to exist!' >&2; \
+	  echo 'ERROR:' >&2; \
+	  exit 1; \
+	fi
 	./autogen.sh
 	mkdir -p builds-smtcomp/application
 	( cd builds-smtcomp/application; \
@@ -128,19 +137,15 @@ submission-application:
 	# package the application track zipfile
 	mkdir -p cvc4-smtcomp-application-$(YEAR)/bin
 	cp -p builds-smtcomp/application/src/main/cvc4 cvc4-smtcomp-application-$(YEAR)/bin/cvc4
-	cp contrib/run-script-smtcomp2014-application cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default
+	cp contrib/run-script-smtcomp$(YEAR)-application cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default
 	chmod 755 cvc4-smtcomp-application-$(YEAR)/bin/starexec_run_default
 	echo "CVC4 for SMT_COMP application track `builds-smtcomp/application/src/main/cvc4 --version | head -1 | sed 's,.*version ,,;s,-,_,g;s,[^a-zA-Z0-9. _],,g'`" > cvc4-smtcomp-application-$(YEAR)/starexec_description.txt
 	cd cvc4-smtcomp-application-$(YEAR) && zip -r ../cvc4-smtcomp-application-$(YEAR).zip *
 submission-parallel:
 	# parallel track can't be built with -cln, so it's a separate build
 	@if [ -d builds-smtcomp/parallel ]; then \
-	  echo 'ERROR: remove the builds-smtcomp/main directory' >&2; \
-	  exit 1; \
-	fi
-	@if [ -n "`ls src/parser/*/generated 2>/dev/null`" ]; then \
 	  echo 'ERROR:' >&2; \
-	  echo 'ERROR: Please make maintainer-clean first.' >&2; \
+	  echo 'ERROR: Please remove the builds-smtcomp/main directory' >&2; \
 	  echo 'ERROR:' >&2; \
 	  exit 1; \
 	fi
@@ -161,7 +166,7 @@ submission-parallel:
 	mkdir -p cvc4-smtcomp-parallel-$(YEAR)/bin
 	cp -p builds-smtcomp/parallel/src/main/pcvc4 cvc4-smtcomp-parallel-$(YEAR)/bin/pcvc4
 	( echo '#!/bin/sh'; \
-	  echo 'exec ./pcvc4 --threads 2 -L smt2 --no-checking --no-interactive "$@"' ) > cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default
+	  echo 'exec ./pcvc4 --threads 2 -L smt2 --no-checking --no-interactive --no-wait-to-join "$@"' ) > cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default
 	chmod 755 cvc4-smtcomp-parallel-$(YEAR)/bin/starexec_run_default
 	echo "CVC4 for SMT_COMP parallel track `builds-smtcomp/parallel/src/main/pcvc4 --version | head -1 | sed 's,.*version ,,;s,-,_,g;s,[^a-zA-Z0-9. _],,g'`" > cvc4-smtcomp-parallel-$(YEAR)/starexec_description.txt
 	cd cvc4-smtcomp-parallel-$(YEAR) && zip -r ../cvc4-smtcomp-parallel-$(YEAR).zip *