things for competition upload: new "make submission" target

diff --git a/Makefile b/Makefile
index 7e0e0261b1c650cf416a263c61c8ecbcc8833736..f70caefa45e18565a1626c59c615116bcd6ea9d1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,3 +17,12 @@ all %:
 # synonyms for "check"
 .PHONY: regress test
 regress test: check
+
+submission:
+       if [ ! -e configure ]; then ./autogen.sh; fi
+       ./configure competition
+       $(MAKE)
+       mkdir -p cvc4-smtcomp-2010
+       cp -p $(top_builddir)/bin/cvc4 cvc4-smtcomp-2010/cvc4
+       cp -p contrib/run-smtcomp cvc4-smtcomp-2010/run
+       tar cfz cvc4-smtcomp-2010.tgz cvc4-smtcomp-2010

diff --git a/contrib/switch-config b/contrib/switch-config
index ad28464e7097fb8d161dcd15a4087d0bf58fa87c..83351da29e070468344f2874974cba2b6b550dae 100755 (executable)
--- a/contrib/switch-config
+++ b/contrib/switch-config
@@ -51,7 +51,8 @@ if ! [ -d "builds/$arch" ] || ! [ -d "builds/$arch/$build" ] || [ ${#builds[@]}
 fi
 
 function switchto {
-  perl -pi -e 's,^CURRENT_BUILD *= *.*,CURRENT_BUILD = '$arch/$1',' builds/current
+  config/mkbuilddir "$arch" "$1" >/dev/null
+  #perl -pi -e 's,^CURRENT_BUILD *= *.*,CURRENT_BUILD = '$arch/$1',' builds/current
   echo "Current build switched to \`$1'."
 }