Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/js_of_ocaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ jobs:
with:
token: ${{ github.token }}

- name: Install faked binaryen-bin package
# It's faster to use a cached version
run: opam install --fake binaryen-bin

- run: opam install . --best-effort --solver builtin-mccs+glpk
if: ${{ matrix.skip-test }}

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ jobs:
uses: Aandreba/setup-binaryen@v1.0.0
with:
token: ${{ github.token }}
- name: Install faked binaryen-bin package
# It's faster to use a cached version
run: opam install --fake binaryen-bin
- uses: ocaml/setup-ocaml/lint-opam@v3

lint-fmt:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/wasm_of_ocaml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ jobs:
with:
token: ${{ github.token }}

- name: Install faked binaryen-bin package
# It's faster to use a cached version
run: opam install --fake binaryen-bin

# Work-around a race between reinstalling mingw-w64-shims
# (because of conf-pkg-config optional dep) and installing other
# packages that implicitly depend on mingw-w64-shims.
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ Js_of_ocaml is composed of multiple packages:

## Requirements

See
See the
[opam](https://github.com/ocsigen/js_of_ocaml/blob/master/js_of_ocaml-compiler.opam)
file for version constraints.
files for version constraints.

wasm_of_ocaml-compiler additionally depends on a system installation of binaryen (version 119 or later)

## Supported engines

Expand Down
1 change: 0 additions & 1 deletion bench.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ ENV BINARYEN=binaryen-$BINARYEN_VERSION
RUN curl -Lq https://github.com/WebAssembly/binaryen/releases/download/$BINARYEN_VERSION/$BINARYEN-x86_64-linux.tar.gz \
| tar zxf -
ENV PATH="/bench-dir/$BINARYEN/bin:$PATH"
RUN opam install --fake binaryen-bin

# Jane Street opam packages
RUN mkdir janestreet \
Expand Down
2 changes: 1 addition & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
menhirLib
menhirSdk
(yojson (>= 2.1))
binaryen-bin)
conf-binaryen)
(depopts
ocamlfind)
(conflicts
Expand Down
3 changes: 3 additions & 0 deletions manual/wasm_overview.wiki
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ The compiler is provided by the wasm_of_ocaml-compiler package. The <<a_manual c
The easiest way to install wasm_of_ocaml is to use opam.
{{{opam install wasm_of_ocaml-compiler js_of_ocaml js_of_ocaml-ppx js_of_ocaml-lwt}}}

Binaryen version 119 or later is required. The opam command above will
install it automatically if needed.

== Usage ==

Your program must first be compiled using the OCaml bytecode compiler
Expand Down
2 changes: 1 addition & 1 deletion wasm_of_ocaml-compiler.opam
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depends: [
"menhirLib"
"menhirSdk"
"yojson" {>= "2.1"}
"binaryen-bin"
"conf-binaryen"
"odoc" {with-doc}
]
depopts: ["ocamlfind"]
Expand Down
Loading