Updated dune support

ocsigen · Sep 11, 2024 · e15a9bc · e15a9bc
1 parent 1f38221
commit e15a9bc
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-wasm_of_ocaml.yml b/.github/workflows/build-wasm_of_ocaml.yml
@@ -123,7 +123,7 @@ jobs:
 
       - name: Pin dune
         run: |
-          opam pin add -n dune.3.13 https://github.com/ocaml-wasm/dune.git#wasm-separate-compilation
+          opam pin add -n dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml
 
       - name: Pin wasm_of_ocaml
         working-directory: ./wasm_of_ocaml
@@ -137,7 +137,7 @@ jobs:
         run: opam exec -- ocaml wasm_of_ocaml/tools/ci_setup.ml
 
       - name: Update test dependencies
-        run: opam install num cohttp-lwt-unix ppx_expect
+        run: opam install num cohttp-lwt-unix ppx_expect cstruct
 
       - name: Install wasm_of_ocaml
         working-directory: ./wasm_of_ocaml

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ The following commands will perform a minimal installation:
 ```
 git clone https://github.com/ocaml-wasm/wasm_of_ocaml
 cd wasm_of_ocaml
-opam pin add dune.3.13 https://github.com/ocaml-wasm/dune.git#wasm
+opam pin add dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml
 opam pin add -n --with-version 5.3.0-wasm .
 opam install wasm_of_ocaml-compiler
 ```

diff --git a/dune b/dune
@@ -14,15 +14,15 @@
    (tools/node_wrapper.sh as node))
   (js_of_ocaml
    (compilation_mode separate)
-   (targets wasm)))
+   (submodes wasm)))
  (wasm-effects
   (binaries
    (tools/node_wrapper.sh as node))
   (js_of_ocaml
    (compilation_mode separate)
    (flags
     (:standard --enable effects))
-   (targets wasm)))
+   (submodes wasm)))
  (bench_no_debug
   (flags
    (:standard \ -g))

diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 3.11)
+(lang dune 3.17)
 (using menhir 2.0)
 (name js_of_ocaml)
 

diff --git a/js_of_ocaml-compiler.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08" & < "5.1"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}

diff --git a/js_of_ocaml-lwt.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-ppx" {= version}

diff --git a/js_of_ocaml-ppx.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08"}
   "js_of_ocaml" {= version}
   "ppxlib" {>= "0.15.0"}

diff --git a/js_of_ocaml-ppx_deriving_json.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08"}
   "js_of_ocaml" {= version}
   "ppxlib" {>= "0.15"}

diff --git a/js_of_ocaml-toplevel.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08"}
   "js_of_ocaml-compiler" {= version}
   "ocamlfind" {>= "1.5.1"}

diff --git a/js_of_ocaml-tyxml.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08"}
   "js_of_ocaml" {= version}
   "js_of_ocaml-ppx" {= version}

diff --git a/js_of_ocaml.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08"}
   "js_of_ocaml-compiler" {= version}
   "ppxlib" {>= "0.15"}

diff --git a/tools/ci_setup.ml b/tools/ci_setup.ml
@@ -25,11 +25,11 @@ let do_pin = StringSet.of_list [ "base"; "ppx_expect"; "ppx_inline_test"; "time_
 let aliases = [ "ocaml-cstruct", "cstruct" ]
 
 let dune_workspace =
-  {|(lang dune 3.13)
+  {|(lang dune 3.17)
 (env
  (_
   (env-vars (TESTING_FRAMEWORK inline-test))
-  (js_of_ocaml (targets wasm))
+  (js_of_ocaml (submodes wasm))
   (flags :standard -warn-error -8-32-34-49-52-55 -w -67-69)))
 |}
 

diff --git a/wasm_of_ocaml-compiler.opam b/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.11"}
+  "dune" {>= "3.17"}
   "ocaml" {>= "4.08" & < "5.1"}
   "js_of_ocaml" {= version}
   "num" {with-test}