Commit c9f993c5 authored by Guillaume Melquiond's avatar Guillaume Melquiond

Fix compilation of why3_js.

parent d2ffe705
......@@ -1702,7 +1702,7 @@ CLEANDIRS += src/trywhy3
# why3webserver and full web/js interface
#########
ifeq (@HASJSOFOCAML,yes)
ifeq (@HASJSOFOCAML@,yes)
JSOCAMLCW=ocamlfind ocamlc -package js_of_ocaml -package js_of_ocaml.ppx \
-I src/ide
......
......@@ -478,16 +478,20 @@ dnl AC_CHECK_PROG(OCAMLWEB,ocamlweb,ocamlweb,true)
# checking for js_of_ocaml
HASJSOFOCAML=no
if test "$USEOCAMLFIND" = yes; then
JSOFOCAML=$(ocamlfind query js_of_ocaml)
if test -z "$JSOFOCAML"; then
HASJSOFOCAML=no
reason_jsofocaml=" (js_of_ocaml not found)"
else
HASJSOFOCAML=yes
JSOFOCAMLPPX=$(ocamlfind query js_of_ocaml.ppx)
if test -z "$JSOFOCAMLPPX"; then
reason_jsofocaml=" (js_of_ocaml.ppx not found)"
else
HASJSOFOCAML=yes
fi
fi
else
HASJSOFOCAML=no
reason_jsofocaml=" (ocamlfind not available)"
fi
......
......@@ -562,7 +562,7 @@ let interpNotif (n: notification) =
| Proof_error (_nid, s) ->
PE.error_print_msg
(Format.asprintf "Proof error on selected node: \"%s\"" s)
| Transf_error (_nid, s) ->
| Transf_error (_ids, _tr, _args, _loc, s, _d) ->
PE.error_print_msg
(Format.asprintf "Transformation error on selected node: \"%s\"" s)
| Strat_error (_nid, s) ->
......@@ -589,7 +589,6 @@ let interpNotif (n: notification) =
| Node_change (nid, up) ->
begin
match up with
| Obsolete _ -> assert false (* TODO *)
| Proved true -> TaskList.update_status `Valid (string_of_int nid)
| Proved false -> TaskList.update_status `Unknown (string_of_int nid)
| Proof_status_change (c, _obsolete, _rl) ->
......
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