use dune 1.4 and build ccparse_irclogs only on >= 4.08

This commit is contained in:
Simon Cruanes 2021-06-07 00:24:39 -04:00
parent 5c67fb51ab
commit b9828375e1
6 changed files with 15 additions and 8 deletions

View file

@ -11,7 +11,7 @@ build: [
] ]
depends: [ depends: [
"ocaml" { >= "4.03.0" } "ocaml" { >= "4.03.0" }
"dune" { >= "1.1" } "dune" { >= "1.4" }
"containers" { = version } "containers" { = version }
"seq" "seq"
"qtest" { with-test } "qtest" { with-test }

View file

@ -11,7 +11,7 @@ build: [
] ]
depends: [ depends: [
"ocaml" { >= "4.03.0" } "ocaml" { >= "4.03.0" }
"dune" { >= "1.1" } "dune" { >= "1.4" }
"base-threads" "base-threads"
"dune-configurator" "dune-configurator"
"containers" { = version } "containers" { = version }

View file

@ -12,7 +12,7 @@ build: [
] ]
depends: [ depends: [
"ocaml" { >= "4.03.0" } "ocaml" { >= "4.03.0" }
"dune" { >= "1.1" } "dune" { >= "1.4" }
"dune-configurator" "dune-configurator"
"seq" "seq"
"qtest" { with-test } "qtest" { with-test }

View file

@ -1 +1 @@
(lang dune 1.1) (lang dune 1.4)

View file

@ -2,10 +2,7 @@
(executables (executables
(names id_sexp ccparse_sexp ccparse_irclogs) (names id_sexp ccparse_sexp ccparse_irclogs)
(libraries containers) (libraries containers)
;(modules id_sexp) (flags :standard -warn-error -a+8))
(flags :standard -warn-error -a+8 -safe-string -color always)
(ocamlopt_flags :standard -O3 -color always
-unbox-closures -unbox-closures-factor 20))
(alias (alias
(name runtest) (name runtest)
@ -23,6 +20,16 @@
(ignore-stdout (ignore-stdout
(run ./ccparse_sexp.exe test_data/benchpress.sexp)))) (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 (alias
(name runtest) (name runtest)
(locks /ctest) (locks /ctest)