Merge pull request #126 from ocaml-wasm/wasm-dune

vouillon · web-flow · commit d7bf42c73108 · 2024-11-06T14:40:10.000+01:00
Revised dune support
diff --git a/.github/workflows/build-wasm_of_ocaml.yml b/.github/workflows/build-wasm_of_ocaml.yml
@@ -148,7 +148,7 @@ jobs:
 
       - name: Pin dune
         run: |
-          opam pin add -n dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml-incremental
+          opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
 
       - name: Pin wasm_of_ocaml
         working-directory: ./wasm_of_ocaml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -114,7 +114,7 @@ jobs:
 
       - name: Pin dune
         run: |
-          opam pin add dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml
+          opam pin add dune.3.17 https://github.com/ocaml/dune.git
 
       - run: opam install conf-pkg-config
         if: runner.os == 'Windows'
@@ -178,7 +178,7 @@ jobs:
           dune-cache: true
       - name: Pin dune
         run: |
-          opam pin add -n dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml
+          opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
       - uses: ocaml/setup-ocaml/lint-opam@v3
 
   lint-fmt:
@@ -193,7 +193,7 @@ jobs:
           dune-cache: true
       - name: Pin dune
         run: |
-          opam pin add -n dune.3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml
+          opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
       - uses: ocaml/setup-ocaml/lint-fmt@v3
 
   lint-runtime:
diff --git a/README.md b/README.md
@@ -24,8 +24,8 @@ 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 -n --with-version 3.17 https://github.com/ocaml-wasm/dune.git#wasm_of_ocaml
-opam pin add -n --with-version 5.3.0-wasm .
+opam pin add -n --with-version 3.17 https://github.com/ocaml/dune.git
+opam pin add -n --with-version 5.8.2-wasm .
 opam install wasm_of_ocaml-compiler
 ```
 You may want to install additional packages. For instance:
diff --git a/compiler/tests-env/dune b/compiler/tests-env/dune
@@ -1,9 +1,5 @@
 (test
- (modes js)
- (build_if
-  (and
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+ (modes js) ; No env support in wasm_of_ocaml yet
  (js_of_ocaml
   (javascript_files setup.js)
   (flags :standard --setenv JSOO_C=from-jsoo-args))
diff --git a/compiler/tests-io/dune b/compiler/tests-io/dune
@@ -2,6 +2,7 @@
  (names cat md5)
  (modes
   js
+  wasm
   (best exe)))
 
 (rule
@@ -27,6 +28,14 @@
  (action
   (diff cat-js.stdout cat-native.stdout)))
 
+(rule
+ (action
+  (copy cat.bc.wasm.js cat.bc.js))
+ (enabled_if
+  (or
+   (= %{profile} wasm)
+   (= %{profile} wasm-effects))))
+
 (rule
  (target md5-native.stdout)
  (action
@@ -69,3 +78,11 @@
  (alias runtest)
  (action
   (diff md5-js.stdout md5-native.stdout)))
+
+(rule
+ (action
+  (copy md5.bc.wasm.js md5.bc.js))
+ (enabled_if
+  (or
+   (= %{profile} wasm)
+   (= %{profile} wasm-effects))))
diff --git a/compiler/tests-jsoo/bin/dune b/compiler/tests-jsoo/bin/dune
@@ -1,6 +1,6 @@
 (executables
  (names error1 error2)
- (modes exe js)
+ (modes exe js wasm)
  (foreign_stubs
   (language c)
   (names named_value_stubs))
@@ -55,6 +55,14 @@
  (action
   (diff %{dep:error1-unregister.expected} %{dep:error1-unregister.js.actual})))
 
+(rule
+ (action
+  (copy error1.bc.wasm.js error1.bc.js))
+ (enabled_if
+  (or
+   (= %{profile} wasm)
+   (= %{profile} wasm-effects))))
+
 (rule
  (target error2.js.actual)
  (deps error2.html)
@@ -105,3 +113,11 @@
  (alias runtest)
  (action
   (diff %{dep:error2-unregister.expected} %{dep:error2-unregister.js.actual})))
+
+(rule
+ (action
+  (copy error2.bc.wasm.js error2.bc.js))
+ (enabled_if
+  (or
+   (= %{profile} wasm)
+   (= %{profile} wasm-effects))))
diff --git a/compiler/tests-jsoo/dune b/compiler/tests-jsoo/dune
@@ -5,7 +5,7 @@
  (enabled_if
   (>= %{ocaml_version} 4.14))
  (inline_tests
-  (modes js best))
+  (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
 
@@ -16,7 +16,7 @@
  (enabled_if
   (>= %{ocaml_version} 5.1.1))
  (inline_tests
-  (modes js best))
+  (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
 
@@ -27,7 +27,7 @@
  (enabled_if
   (>= %{ocaml_version} 5.1.1))
  (inline_tests
-  (modes js best))
+  (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
 
@@ -41,7 +41,7 @@
   (language c)
   (names bigarray_stubs))
  (inline_tests
-  (modes js best))
+  (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
 
diff --git a/compiler/tests-jsoo/lib-effects/dune b/compiler/tests-jsoo/lib-effects/dune
@@ -9,6 +9,6 @@
  (inline_tests
   ;; This requires the unreleased dune 3.7 to work
   (enabled_if true)
-  (modes js best))
+  (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
diff --git a/compiler/tests-linkall/dune b/compiler/tests-linkall/dune
@@ -3,11 +3,13 @@
 (env
  (_
   (js_of_ocaml
+   (compilation_mode separate))
+  (wasm_of_ocaml
    (compilation_mode separate))))
 
 (test
  (name test)
- (modes byte js)
+ (modes byte js wasm)
  (libraries dynlink)
  ;; It doesn't seem possible to create a pack-ed module with dune.
  ;; However, dynlink uses pack to embed a copy
diff --git a/compiler/tests-ocaml/basic-modules/dune b/compiler/tests-ocaml/basic-modules/dune
@@ -1,4 +1,4 @@
 (tests
  (names recursive_module_init)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-atomic/dune b/compiler/tests-ocaml/lib-atomic/dune
@@ -1,3 +1,3 @@
 (test
  (name test_atomic)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-bigarray/dune b/compiler/tests-ocaml/lib-bigarray/dune
@@ -1,4 +1,4 @@
 (tests
  (names bigarrays change_layout fftba pr5115 weak_bigarray)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-bool/dune b/compiler/tests-ocaml/lib-bool/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-buffer/dune b/compiler/tests-ocaml/lib-buffer/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-bytes-utf/dune b/compiler/tests-ocaml/lib-bytes-utf/dune
@@ -5,4 +5,5 @@
   (:standard \ -strict-sequence))
  (modes
   js
+  wasm
   (best exe)))
diff --git a/compiler/tests-ocaml/lib-bytes/dune b/compiler/tests-ocaml/lib-bytes/dune
@@ -1,4 +1,4 @@
 (tests
  (names test_bytes binary)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-digest/dune b/compiler/tests-ocaml/lib-digest/dune
@@ -2,15 +2,13 @@
  (names md5)
  (libraries)
  (modules md5)
- (modes js))
+ (modes js wasm))
 
 (tests
  (names digests)
  (libraries)
  (build_if
-  (and
-   (>= %{ocaml_version} 5.2)
-   (<> %{profile} wasm)
-   (<> %{profile} wasm-effects)))
+  (>= %{ocaml_version} 5.2))
  (modules digests)
+ ; blake2b not supported by wasm_of_ocaml yet
  (modes js))
diff --git a/compiler/tests-ocaml/lib-effects/dune b/compiler/tests-ocaml/lib-effects/dune
@@ -28,7 +28,7 @@
   test5 test6 test_lazy used_cont)
  (modules
   (:standard \ unhandled_unlinked))
- (modes js))
+ (modes js wasm))
 
 (tests
  (build_if
@@ -41,4 +41,4 @@
     2
     (run node %{test}))
    (run cat)))
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-filename/dune b/compiler/tests-ocaml/lib-filename/dune
@@ -1,4 +1,4 @@
 (tests
  (names suffix extension)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-float/dune b/compiler/tests-ocaml/lib-float/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-floatarray/dune b/compiler/tests-ocaml/lib-floatarray/dune
@@ -1,4 +1,4 @@
 (tests
  (names floatarray)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-format/dune b/compiler/tests-ocaml/lib-format/dune
@@ -3,4 +3,4 @@
  (libraries)
  (flags
   (:standard -no-strict-formats \ -strict-formats))
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-fun/dune b/compiler/tests-ocaml/lib-fun/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-gc/dune b/compiler/tests-ocaml/lib-gc/dune
@@ -2,4 +2,4 @@
  (names test_gc)
  (libraries)
  (flags -w -69)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-hashtbl/dune b/compiler/tests-ocaml/lib-hashtbl/dune
@@ -3,7 +3,7 @@
  (deps ../../../LICENSE)
  (modules hfun)
  (libraries)
- (modes js))
+ (modes js wasm))
 
 (tests
  (names htbl)
@@ -12,7 +12,7 @@
  (build_if
   (>= %{ocaml_version} 5))
  (libraries)
- (modes js))
+ (modes js wasm))
 
 (rule
  (action
diff --git a/compiler/tests-ocaml/lib-int/dune b/compiler/tests-ocaml/lib-int/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-int64/dune b/compiler/tests-ocaml/lib-int64/dune
@@ -1,4 +1,4 @@
 (tests
  (names test issue9460)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-list/dune b/compiler/tests-ocaml/lib-list/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-option/dune b/compiler/tests-ocaml/lib-option/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-printf/dune b/compiler/tests-ocaml/lib-printf/dune
@@ -5,4 +5,5 @@
   (:standard -no-strict-formats \ -strict-formats))
  (modes
   js
+  wasm
   (best exe)))
diff --git a/compiler/tests-ocaml/lib-queue/dune b/compiler/tests-ocaml/lib-queue/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-random/dune b/compiler/tests-ocaml/lib-random/dune
@@ -5,4 +5,5 @@
  (libraries)
  (modes
   js
+  wasm
   (best exe)))
diff --git a/compiler/tests-ocaml/lib-result/dune b/compiler/tests-ocaml/lib-result/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-seq/dune b/compiler/tests-ocaml/lib-seq/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-set/dune b/compiler/tests-ocaml/lib-set/dune
@@ -1,4 +1,4 @@
 (tests
  (names testmap testset)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-stack/dune b/compiler/tests-ocaml/lib-stack/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-str/dune b/compiler/tests-ocaml/lib-str/dune
@@ -1,4 +1,4 @@
 (tests
  (names t01)
  (libraries str)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-string/dune b/compiler/tests-ocaml/lib-string/dune
@@ -3,4 +3,4 @@
  (build_if
   (>= %{ocaml_version} 5))
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/lib-uchar/dune b/compiler/tests-ocaml/lib-uchar/dune
@@ -1,4 +1,4 @@
 (tests
  (names test)
  (libraries)
- (modes js))
+ (modes js wasm))
diff --git a/compiler/tests-ocaml/prim-bigstring/dune b/compiler/tests-ocaml/prim-bigstring/dune
diff --git a/compiler/tests-ocaml/prim-bswap/dune b/compiler/tests-ocaml/prim-bswap/dune
diff --git a/compiler/tests-ocaml/prim-revapply/dune b/compiler/tests-ocaml/prim-revapply/dune
diff --git a/compiler/tests-re/dune b/compiler/tests-re/dune
diff --git a/compiler/tests-runtime-events/dune b/compiler/tests-runtime-events/dune
diff --git a/compiler/tests-sourcemap/dune b/compiler/tests-sourcemap/dune
diff --git a/compiler/tests-wasm_of_ocaml/dune b/compiler/tests-wasm_of_ocaml/dune
diff --git a/dune b/dune
diff --git a/examples/graphics/dune b/examples/graphics/dune
diff --git a/examples/test_wheel/dune b/examples/test_wheel/dune
diff --git a/lib/deriving_json/tests/dune b/lib/deriving_json/tests/dune
diff --git a/lib/tests/dune.inc b/lib/tests/dune.inc
diff --git a/lib/tests/gen-rules/gen.ml b/lib/tests/gen-rules/gen.ml
diff --git a/tools/ci_setup.ml b/tools/ci_setup.ml
