Commit e4a44aed authored by Guillaume Melquiond's avatar Guillaume Melquiond

Store why3-cpulimit and why3-call-pvs in libdir.

As a side effect, provers-detection-data.conf no longer needs to be preprocessed.
parent 68a287c5
......@@ -31,12 +31,6 @@ why3.conf
/why3regtests.out
/META
# /lib/why3/
/lib/why3/META
/lib/why3/why3.cm*
/lib/why3/why3.a
/lib/why3/why3.o
# /bench/
/bench/programs/good/booleans/
/bench/programs/good/exceptions/
......@@ -56,8 +50,6 @@ why3.conf
/bin/why3ide.byte
/bin/why3ide.opt
/bin/why3ide
/bin/why3-cpulimit
/bin/why3-cpulimit.exe
/bin/why3config.byte
/bin/why3config.opt
/bin/why3config
......@@ -114,8 +106,17 @@ why3.conf
/doc/apidoc/
/doc/stdlibdoc/
# /lib
/lib/why3-cpulimit
/lib/why3-cpulimit.exe
# /lib/why3/
/lib/why3/META
/lib/why3/why3.cm*
/lib/why3/why3.a
/lib/why3/why3.o
# /share/
/share/provers-detection-data.conf
/share/emacs/semantic.cache
# /src/
......@@ -209,4 +210,4 @@ pvsbin/
/src/jessie/ptests_local_config.ml
/src/jessie/tests/basic/result/*.log
/src/jessie/tests/demo/result/*.log
/trash
\ No newline at end of file
/trash
......@@ -1061,19 +1061,20 @@ endif
# tools
#######
TOOLS = bin/why3-cpulimit$(EXE)
TOOLS = lib/why3-cpulimit$(EXE)
byte opt: $(TOOLS)
bin/why3-cpulimit$(EXE): src/tools/@CPULIMIT@.c
lib/why3-cpulimit$(EXE): src/tools/@CPULIMIT@.c
$(CC) -Wall -o $@ $^
clean::
rm -f bin/why3-cpulimit$(EXE) src/tools/*~
rm -f lib/why3-cpulimit$(EXE) src/tools/*~
install_no_local::
cp -f bin/why3-cpulimit$(EXE) $(BINDIR)/why3-cpulimit$(EXE)
cp -f bin/why3-call-pvs $(BINDIR)/why3-call-pvs
mkdir -p $(LIBDIR)/why3
cp -f lib/why3-cpulimit$(EXE) $(LIBDIR)/why3/why3-cpulimit$(EXE)
cp -f lib/why3-call-pvs $(LIBDIR)/why3/why3-call-pvs
#########
# why3doc
......@@ -1534,7 +1535,7 @@ DISTRIB_FILES = Version Makefile.in configure.in configure \
modules/*.mlw \
lib/coq/*.v lib/coq/*/*.v lib/coq-tactic/*.v \
lib/pvs/*/*.pvs lib/pvs/*/*.prf \
share/provers-detection-data.conf.in \
share/provers-detection-data.conf \
share/why3session.dtd \
share/javascript/*.js share/javascript/*.css \
share/javascript/themes/default/*.gif \
......@@ -1661,16 +1662,10 @@ clean::
doc/version.tex: doc/version.tex.in config.status
./config.status chmod --file $@
share/provers-detection-data.conf: share/provers-detection-data.conf.in config.status
./config.status chmod --file $@
# We want it to be always up-ot-date
Makefile : share/provers-detection-data.conf
config.status: configure Version
./config.status --recheck
opt byte: lib/why3/META share/provers-detection-data.conf
opt byte: lib/why3/META
lib/why3/META: lib/why3/META.in config.status
./config.status chmod --file $@
......
......@@ -579,10 +579,8 @@ fi
if test "$enable_local" = no; then
LOCALDIR=''
LOCALBIN=''
else
LOCALDIR="${PWD}"
LOCALBIN="${PWD}/bin/"
fi
#For the META
......@@ -667,7 +665,6 @@ AC_SUBST(FRAMAC_LIBDIR)
AC_SUBST(enable_local)
AC_SUBST(LOCALDIR)
AC_SUBST(LOCALBIN)
AC_SUBST(enable_relocation)
......@@ -677,7 +674,7 @@ dnl AC_SUBST(PDFVIEWER)
# Finally create the Makefile from Makefile.in
dnl AC_OUTPUT(Makefile)
AC_CONFIG_FILES(Makefile src/config.sh doc/version.tex)
AC_CONFIG_FILES(share/provers-detection-data.conf lib/why3/META)
AC_CONFIG_FILES(lib/why3/META)
AC_CONFIG_FILES(src/jessie/Makefile)
AC_CONFIG_COMMANDS([chmod],
chmod a-w Makefile src/config.sh doc/version.tex;
......
......@@ -132,7 +132,6 @@ let call_on_file ~command ?(timelimit=0) ?(memlimit=0)
?(cleanup=false) ?(inplace=false) fin =
let arglist = Cmdline.cmdline_split command in
let command = List.hd arglist in
let use_stdin = ref true in
let on_timelimit = ref false in
let cmd_regexp = Str.regexp "%\\(.\\)" in
......@@ -158,6 +157,7 @@ let call_on_file ~command ?(timelimit=0) ?(memlimit=0)
raise e
in
let arglist = List.map subst arglist in
let command = List.hd arglist in
Debug.dprintf debug "@[<hov 2>Call_provers: command is: %a@]@."
(Pp.print_list Pp.space pp_print_string) arglist;
let argarray = Array.of_list arglist in
......
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