diff --git a/containers-data.opam b/containers-data.opam index 281a00e6..f50e954d 100644 --- a/containers-data.opam +++ b/containers-data.opam @@ -11,7 +11,7 @@ build: [ ] depends: [ "ocaml" { >= "4.03.0" } - "dune" { >= "1.1" } + "dune" { >= "1.4" } "containers" { = version } "seq" "qtest" { with-test } diff --git a/containers-thread.opam b/containers-thread.opam index d0d4baab..a2d3dd0f 100644 --- a/containers-thread.opam +++ b/containers-thread.opam @@ -11,7 +11,7 @@ build: [ ] depends: [ "ocaml" { >= "4.03.0" } - "dune" { >= "1.1" } + "dune" { >= "1.4" } "base-threads" "dune-configurator" "containers" { = version } diff --git a/containers.opam b/containers.opam index 14002208..7da8de9a 100644 --- a/containers.opam +++ b/containers.opam @@ -12,7 +12,7 @@ build: [ ] depends: [ "ocaml" { >= "4.03.0" } - "dune" { >= "1.1" } + "dune" { >= "1.4" } "dune-configurator" "seq" "qtest" { with-test } diff --git a/dune-project b/dune-project index 7655de07..f9337290 100644 --- a/dune-project +++ b/dune-project @@ -1 +1 @@ -(lang dune 1.1) +(lang dune 1.4) diff --git a/examples/ccparse_irclogs.ml b/examples/ccparse_irclogs_real.cond.ml similarity index 100% rename from examples/ccparse_irclogs.ml rename to examples/ccparse_irclogs_real.cond.ml diff --git a/examples/dune b/examples/dune index 2b0405bc..13b6e613 100644 --- a/examples/dune +++ b/examples/dune @@ -2,10 +2,7 @@ (executables (names id_sexp ccparse_sexp ccparse_irclogs) (libraries containers) - ;(modules id_sexp) - (flags :standard -warn-error -a+8 -safe-string -color always) - (ocamlopt_flags :standard -O3 -color always - -unbox-closures -unbox-closures-factor 20)) + (flags :standard -warn-error -a+8)) (alias (name runtest) @@ -23,6 +20,16 @@ (ignore-stdout (run ./ccparse_sexp.exe test_data/benchpress.sexp)))) +(rule + (targets ccparse_irclogs.ml) + (enabled_if (>= %{ocaml_version} "4.08")) + (action (copy ccparse_irclogs_real.cond.ml %{targets}))) + +(rule + (targets ccparse_irclogs.ml) + (enabled_if (< %{ocaml_version} "4.08")) + (action (with-stdout-to %{targets} (run echo "let() = print_endline {|ok|}")))) + (alias (name runtest) (locks /ctest)