diff --git a/dune b/dune index e050833653910b419781a69ee47e687cfd4169b8..72ae34f610ab6573699952dc799137c9773a4945 100644 --- a/dune +++ b/dune @@ -20,8 +20,6 @@ ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(env - (trace-menhir (menhir_flags --trace))) (alias (name default) (deps (alias install))) (dirs bin headers man share src tools tests) diff --git a/dune-project b/dune-project index 5e9fd2575eede1acaf1c4fd4714072c992219576..3753ddb00b59533058be4a2fa729d0058942980e 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.13) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; ;; This file is part of Frama-C. ;; @@ -21,6 +21,6 @@ ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(using menhir 2.1) +(using menhir 3.0) (using dune_site 0.1) (package (name frama-c) (sites (share share) (libexec lib) (lib plugins) (lib plugins_gui))) diff --git a/opam b/opam index 60109c9163215412e25199285a52e50819a9d4c5..c1145cbfe92bdd2eefb1c607906b5659613433c8 100644 --- a/opam +++ b/opam @@ -122,14 +122,9 @@ run-test: [ ] depends: [ - "dune" { >= "3.7.0" - & != "3.13.0" # performance problem - } + "dune" { > "3.13.0" } "dune-configurator" - "dune-site" { >= "3.7.0" - & != "3.13.0" # performance problem - } - + "dune-site" { > "3.13.0" } ( "alt-ergo-free" | "alt-ergo" ) "conf-graphviz" { post } "conf-time" { with-test } diff --git a/src/kernel_internals/parsing/dune b/src/kernel_internals/parsing/dune index 121f1903b0cf152504e517f1c829e190ba54bf54..bd740a0e89939cc51af5fca4069b96c7085e698f 100644 --- a/src/kernel_internals/parsing/dune +++ b/src/kernel_internals/parsing/dune @@ -27,11 +27,11 @@ (menhir (modules logic_parser) ; "--fixed-exception" fixes compatibility with ocamlyacc Parsing.Parse_error - (flags :standard --fixed-exception --explain --dump --comment) + (flags :standard --fixed-exception --dump --comment) ) (menhir (modules cparser) ; "--fixed-exception" fixes compatibility with ocamlyacc Parsing.Parse_error - (flags --fixed-exception --explain --dump --comment) + (flags --fixed-exception --dump --comment) )