Commit d600fbf4 authored by Andrei Paskevich's avatar Andrei Paskevich
Browse files

look for why3-cpulimit in LOCALDIR/bin for local installation

parent cdce5089
...@@ -361,8 +361,10 @@ fi ...@@ -361,8 +361,10 @@ fi
if test "$enable_local" = no; then if test "$enable_local" = no; then
LOCALDIR='None' LOCALDIR='None'
LOCALBIN=''
else else
LOCALDIR='Some \"$PWD\"' LOCALDIR='Some \"$PWD\"'
LOCALBIN="${PWD}/bin/"
fi fi
#For the META #For the META
...@@ -440,15 +442,18 @@ AC_SUBST(RUBBER) ...@@ -440,15 +442,18 @@ AC_SUBST(RUBBER)
AC_SUBST(enable_local) AC_SUBST(enable_local)
AC_SUBST(LOCALDIR) AC_SUBST(LOCALDIR)
AC_SUBST(LOCALBIN)
dnl AC_SUBST(PSVIEWER) dnl AC_SUBST(PSVIEWER)
dnl AC_SUBST(PDFVIEWER) dnl AC_SUBST(PDFVIEWER)
# Finally create the Makefile from Makefile.in # Finally create the Makefile from Makefile.in
dnl AC_OUTPUT(Makefile) dnl AC_OUTPUT(Makefile)
AC_CONFIG_FILES(Makefile src/config.sh doc/version.tex META) AC_CONFIG_FILES(Makefile src/config.sh doc/version.tex)
AC_CONFIG_FILES(share/provers-detection-data.conf META)
AC_CONFIG_COMMANDS([chmod], AC_CONFIG_COMMANDS([chmod],
chmod a-w Makefile src/config.sh doc/version.tex; chmod a-w Makefile src/config.sh doc/version.tex;
chmod a-w share/provers-detection-data.conf META;
chmod u+x src/config.sh) chmod u+x src/config.sh)
AC_OUTPUT AC_OUTPUT
......
...@@ -11,7 +11,7 @@ version_ok = "0.92" ...@@ -11,7 +11,7 @@ version_ok = "0.92"
version_ok = "0.91" version_ok = "0.91"
version_old = "0.9" version_old = "0.9"
version_old = "0.8" version_old = "0.8"
command = "why3-cpulimit %t %m -s %e %f 2>&1" command = "@LOCALBIN@why3-cpulimit %t %m -s %e %f 2>&1"
driver = "drivers/alt_ergo.drv" driver = "drivers/alt_ergo.drv"
[ATP cvc3] [ATP cvc3]
...@@ -21,7 +21,7 @@ version_switch = "-version" ...@@ -21,7 +21,7 @@ version_switch = "-version"
version_regexp = "This is CVC3 version \\([^ \n]+\\)" version_regexp = "This is CVC3 version \\([^ \n]+\\)"
version_ok = "2.2" version_ok = "2.2"
version_old = "2.1" version_old = "2.1"
command = "why3-cpulimit 0 %m -s %e -timeout %t -lang smt %f 2>&1" command = "@LOCALBIN@why3-cpulimit 0 %m -s %e -timeout %t -lang smt %f 2>&1"
driver = "drivers/cvc3.drv" driver = "drivers/cvc3.drv"
[ATP yices] [ATP yices]
...@@ -32,7 +32,7 @@ version_regexp = "[Yices ]*\\([^ \n]+\\)" ...@@ -32,7 +32,7 @@ version_regexp = "[Yices ]*\\([^ \n]+\\)"
version_ok = "1.0.27" version_ok = "1.0.27"
version_old = "1.0.17" version_old = "1.0.17"
version_old = "1.0.24" version_old = "1.0.24"
command = "why3-cpulimit %t %m -s %e -smt 2>&1" command = "@LOCALBIN@why3-cpulimit %t %m -s %e -smt 2>&1"
driver = "drivers/yices.drv" driver = "drivers/yices.drv"
[ATP eprover] [ATP eprover]
...@@ -40,7 +40,7 @@ name = "Eprover" ...@@ -40,7 +40,7 @@ name = "Eprover"
exec = "eprover" exec = "eprover"
version_switch = "--version" version_switch = "--version"
version_regexp = "E \\([^\n]+\\)" version_regexp = "E \\([^\n]+\\)"
command = "why3-cpulimit 0 %m -s %e -s -R -xAuto -tAuto --cpu-limit=%t --tstp-in %f 2>&1" command = "@LOCALBIN@why3-cpulimit 0 %m -s %e -s -R -xAuto -tAuto --cpu-limit=%t --tstp-in %f 2>&1"
driver = "drivers/tptp.drv" driver = "drivers/tptp.drv"
[ATP gappa] [ATP gappa]
...@@ -54,7 +54,7 @@ version_old = "0.12.2" ...@@ -54,7 +54,7 @@ version_old = "0.12.2"
version_old = "0.12.1" version_old = "0.12.1"
version_old = "0.12.0" version_old = "0.12.0"
version_old = "0.11.2" version_old = "0.11.2"
command = "why3-cpulimit %t %m -s %e %f 2>&1" command = "@LOCALBIN@why3-cpulimit %t %m -s %e %f 2>&1"
driver = "drivers/gappa.drv" driver = "drivers/gappa.drv"
[ATP simplify] [ATP simplify]
...@@ -67,7 +67,7 @@ version_switch = "-version" ...@@ -67,7 +67,7 @@ version_switch = "-version"
version_regexp = "Simplify version \\([^ \n,]+\\)" version_regexp = "Simplify version \\([^ \n,]+\\)"
version_ok = "1.5.5" version_ok = "1.5.5"
version_ok = "1.5.4" version_ok = "1.5.4"
command = "why3-cpulimit %t %m -s %e %f 2>&1" command = "@LOCALBIN@why3-cpulimit %t %m -s %e %f 2>&1"
driver = "drivers/simplify.drv" driver = "drivers/simplify.drv"
[ATP spass] [ATP spass]
...@@ -75,7 +75,7 @@ name = "Spass" ...@@ -75,7 +75,7 @@ name = "Spass"
exec = "SPASS" exec = "SPASS"
version_switch = "-TPTP || true" version_switch = "-TPTP || true"
version_regexp = "SPASS V \\([^ \n\t]+\\)" version_regexp = "SPASS V \\([^ \n\t]+\\)"
command = "why3-cpulimit 0 %m -s %e -TPTP -PGiven=0 -PProblem=0 -TimeLimit=%t %f 2>&1" command = "@LOCALBIN@why3-cpulimit 0 %m -s %e -TPTP -PGiven=0 -PProblem=0 -TimeLimit=%t %f 2>&1"
driver = "drivers/tptp.drv" driver = "drivers/tptp.drv"
[ATP verit] [ATP verit]
...@@ -84,7 +84,7 @@ exec = "veriT" ...@@ -84,7 +84,7 @@ exec = "veriT"
exec = "verit" exec = "verit"
version_switch = "--help" version_switch = "--help"
version_regexp = "Version: \\([^ \n\r]+\\)" version_regexp = "Version: \\([^ \n\r]+\\)"
command = "why3-cpulimit %t %m -s %e %f 2>&1" command = "@LOCALBIN@why3-cpulimit %t %m -s %e %f 2>&1"
driver = "drivers/verit.drv" driver = "drivers/verit.drv"
[ATP z3] [ATP z3]
...@@ -96,7 +96,7 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)" ...@@ -96,7 +96,7 @@ version_regexp = "Z3 version \\([^ \n\r]+\\)"
version_ok = "2.2" version_ok = "2.2"
version_old = "2.1" version_old = "2.1"
version_old = "1.3" version_old = "1.3"
command = "why3-cpulimit %t %m -s %e -smt %f 2>&1" command = "@LOCALBIN@why3-cpulimit %t %m -s %e -smt %f 2>&1"
driver = "drivers/z3.drv" driver = "drivers/z3.drv"
[ITP coq] [ITP coq]
...@@ -110,7 +110,7 @@ version_ok = "8.2pl1" ...@@ -110,7 +110,7 @@ version_ok = "8.2pl1"
version_ok = "8.2" version_ok = "8.2"
version_old = "8.1" version_old = "8.1"
version_old = "8.0" version_old = "8.0"
command = "why3-cpulimit 0 %m -s %e %f" command = "@LOCALBIN@why3-cpulimit 0 %m -s %e %f"
driver = "drivers/coq.drv" driver = "drivers/coq.drv"
editor = "coqide" editor = "coqide"
......
...@@ -7,7 +7,7 @@ echo "let builddate = \"@BUILDDATE@\"" >> $F ...@@ -7,7 +7,7 @@ echo "let builddate = \"@BUILDDATE@\"" >> $F
echo "let plugins = (\"@enable_plugins@\" = \"yes\")" >> $F echo "let plugins = (\"@enable_plugins@\" = \"yes\")" >> $F
echo "let libdir = \"$LIBDIR/why3\"" >> $F echo "let libdir = \"$LIBDIR/why3\"" >> $F
echo "let datadir = \"$DATADIR/why3\"" >> $F echo "let datadir = \"$DATADIR/why3\"" >> $F
echo "let localdir = @LOCALDIR@" >> $F echo "let localdir = @LOCALDIR@" >> $F
echo " echo "
module Dynlink_ = struct module Dynlink_ = struct
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment