Build: Use dune 3.19

Author: hhugo

.github/workflows/build-wasm_of_ocaml.yml

@@ -97,13 +97,6 @@ jobs:
       - run: opam install conf-pkg-config conf-mingw-w64-gcc-i686 conf-mingw-w64-g++-x86_64
         if: runner.os == 'Windows'
 
-      - name: Pin dune
-        if: runner.os == 'Windows'
-        run: opam pin add -n dune https://github.com/hhugo/dune.git#jsoo-effects
-
-      - name: Install dune
-        run: opam install dune
-
       - name: Pin wasm_of_ocaml
         working-directory: ./wasm_of_ocaml
         run: opam pin . -n --with-version dev

CHANGES.md

@@ -2,6 +2,7 @@
 
 ## Features/Changes
 * Misc: drop support for OCaml 4.12 and bellow
+* Misc: switch to dune.3.19
 * Compiler: use a Wasm text files preprocessor (#1822)
 * Compiler: support for OCaml 4.14.3+trunk (#1844)
 * Compiler: optimize compilation of switches

benchmarks/benchmark-fiat-crypto/Makefile

@@ -6,7 +6,7 @@ SHELL=/bin/bash -o pipefail
 
 bench:
 	@date -u +"%FT%TZ - $(NAME): starting"
-	$(MAKE) perform COMPILER=js_of_ocaml EXTRA_ARGS="--enable effects" KIND=js
+	$(MAKE) perform COMPILER=js_of_ocaml EXTRA_ARGS="--effects cps" KIND=js
 	$(MAKE) perform COMPILER=wasm_of_ocaml EXTRA_ARGS="" KIND=wasm
 	@date -u +"%FT%TZ - $(NAME): done"
 

compiler/tests-dynlink-js/effects_flags.ml

@@ -3,9 +3,9 @@ let () =
   let effects_flags l =
     match l, major >= 5 with
     | [ "with-effects-double-translation" ], true -> [ "--effects"; "double-translation" ]
-    | [ "with-effects" ], true -> [ "--enable"; "effects" ]
-    | _, true -> [ "--disable"; "effects" ]
-    | _, false -> [ "--disable"; "effects" ]
+    | [ "with-effects" ], true -> [ "--effects"; "cps" ]
+    | _, true -> []
+    | _, false -> []
   in
   match Sys.argv |> Array.to_list |> List.tl with
   | "txt" :: rest -> List.iter print_endline (effects_flags rest)

compiler/tests-jsoo/lib-effects/dune

@@ -4,7 +4,7 @@
  (_
   (js_of_ocaml
    (flags
-    (:standard --enable effects)))))
+    (:standard --effects cps)))))
 
 (library
  (name jsoo_testsuite_effect)

compiler/tests-ocaml/effect-syntax/dune

@@ -4,7 +4,7 @@
  (_
   (js_of_ocaml
    (flags
-    (:standard --enable effects)))))
+    (:standard --effects cps)))))
 
 (tests
  (names

compiler/tests-ocaml/effects/dune

@@ -4,7 +4,7 @@
  (_
   (js_of_ocaml
    (flags
-    (:standard --enable effects)))))
+    (:standard --effects cps)))))
 
 (tests
  (build_if

dune

@@ -9,11 +9,11 @@
   (js_of_ocaml
    (compilation_mode separate)
    (flags
-    (:standard --enable effects)))
+    (:standard --effects cps)))
   (wasm_of_ocaml
    (compilation_mode separate)
    (flags
-    (:standard --enable effects)))
+    (:standard --effects cps)))
   (binaries
    (tools/node_wrapper.exe as node)
    (tools/node_wrapper.exe as node.exe)))

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.17)
+(lang dune 3.19)
 (using menhir 3.0)
 (name js_of_ocaml)
 (generate_opam_files true)

dune-workspace

@@ -1,4 +1,4 @@
-(lang dune 3.17)
+(lang dune 3.19)
 
 (env
  (_

dune-workspace.dev

@@ -1,4 +1,4 @@
-(lang dune 3.17)
+(lang dune 3.19)
 
 ;; Install the following opam switches, copy this file as
 ;; dune-workspace and run:

js_of_ocaml-compiler.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13" & < "5.4"}
   "num" {with-test}
   "ppx_expect" {>= "v0.16.1" & with-test}
@@ -33,6 +33,7 @@ conflicts: [
   "js_of_ocaml" {< "3.0"}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

js_of_ocaml-lwt.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-ppx" {= version}
@@ -25,6 +25,7 @@ depends: [
 ]
 depopts: ["graphics" "lwt_log"]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

js_of_ocaml-ppx.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
   "ppxlib" {>= "0.15"}
@@ -23,6 +23,7 @@ depends: [
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

js_of_ocaml-ppx_deriving_json.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
   "ppxlib" {>= "0.15"}
@@ -22,6 +22,7 @@ depends: [
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

js_of_ocaml-toplevel.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml-compiler" {= version}
   "ocamlfind" {>= "1.5.1"}
@@ -24,6 +24,7 @@ depends: [
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

js_of_ocaml-tyxml.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-ppx" {= version}
@@ -26,6 +26,7 @@ depends: [
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

js_of_ocaml.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml-compiler" {= version}
   "ppxlib" {>= "0.15"}
@@ -22,6 +22,7 @@ depends: [
   "odoc" {with-doc}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"

toplevel/examples/lwt_toplevel/effects_flags.ml

@@ -3,8 +3,9 @@ let () =
   let effects_flags l =
     match l, major >= 5 with
     | [ "with-effects-double-translation" ], true -> [ "--effects"; "double-translation" ]
-    | _, true -> [ "--enable"; "effects" ]
-    | _, false -> [ "--disable"; "effects" ]
+    | [ "with-effects" ], true -> [ "--effects"; "cps" ]
+    | _, true -> [ "--effects"; "cps" ]
+    | _, false -> []
   in
   match Sys.argv |> Array.to_list |> List.tl with
   | "txt" :: rest -> List.iter print_endline (effects_flags rest)

wasm_of_ocaml-compiler.opam

@@ -12,7 +12,7 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
 bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
 depends: [
-  "dune" {>= "3.17"}
+  "dune" {>= "3.19"}
   "ocaml" {>= "4.14"}
   "js_of_ocaml" {= version}
   "num" {with-test}
@@ -35,6 +35,7 @@ conflicts: [
   "js_of_ocaml" {< "3.0"}
 ]
 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
+x-maintenance-intent: ["(latest)"]
 build: [
   [
     "dune"