From 5d054f7b5cfdfbaa1e4d17bdd8697a2c46d25b91 Mon Sep 17 00:00:00 2001 From: Patrick Ferris Date: Wed, 8 Mar 2023 11:12:08 +0000 Subject: [PATCH] Use dune.3.7.0 --- eio_browser.opam | 4 +--- lib_eio_js/browser/example/dune | 12 ++---------- lib_eio_js/browser/test/dune | 9 ++------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/eio_browser.opam b/eio_browser.opam index 88d7298c6..b1b333d1e 100644 --- a/eio_browser.opam +++ b/eio_browser.opam @@ -10,7 +10,7 @@ homepage: "https://github.com/ocaml-multicore/eio" doc: "https://ocaml-multicore.github.io/eio/" bug-reports: "https://github.com/ocaml-multicore/eio/issues" depends: [ - "dune" {>= "2.9"} + "dune" {>= "3.7"} "eio" {= version} "brr" {>= "0.0.4"} "alcotest" {>= "1.6.0" & with-test} @@ -26,11 +26,9 @@ build: [ name "-j" jobs - "--promote-install-files=false" "@install" "@runtest" {with-test} "@doc" {with-doc} ] - ["dune" "install" "-p" name "--create-install-files" name] ] dev-repo: "git+https://github.com/ocaml-multicore/eio.git" diff --git a/lib_eio_js/browser/example/dune b/lib_eio_js/browser/example/dune index 2648526ac..30b040256 100644 --- a/lib_eio_js/browser/example/dune +++ b/lib_eio_js/browser/example/dune @@ -1,17 +1,9 @@ -; We compile by hand because dune is a little broken w.r.t to -; separate compilation, js_of_ocaml and effects. (executable (name index) - (modes byte) - (js_of_ocaml (flags --target-env=nodejs --enable=effects --debug-info --source-map --pretty)) + (modes js) + (js_of_ocaml (flags --enable=effects)) (libraries eio_browser)) -(rule - (alias runtest) - (deps index.bc) - (targets index.bc.js) - (action (run %{bin:js_of_ocaml} -o %{targets} --enable=effects %{lib:eio_browser:runtime.js} %{dep:index.bc}))) - (rule (alias runtest) (deps index.html index.bc.js) diff --git a/lib_eio_js/browser/test/dune b/lib_eio_js/browser/test/dune index 29db75b48..06794dbfd 100644 --- a/lib_eio_js/browser/test/dune +++ b/lib_eio_js/browser/test/dune @@ -6,15 +6,10 @@ (executable (name test) (modules test) - (modes byte) + (modes js) + (js_of_ocaml (flags --enable=effects --setenv=ALCOTEST_COLOR=always)) (libraries alcotest ansi eio_test eio_browser)) -(rule - (alias runtest) - (deps test.bc) - (targets test.bc.js) - (action (run %{bin:js_of_ocaml} -o %{targets} --enable=effects --setenv=ALCOTEST_COLOR=always %{lib:eio_browser:runtime.js} +alcotest/runtime.js %{dep:test.bc}))) - (rule (alias runtest) (deps index.html test.bc.js)