Skip to content

Commit e83dd90

Browse files
vouillonvouillon
authored
Merge pull request #133 from ocaml-wasm/dune-released
No longer pin dune
2 parents bb3fb63 + 97db4d6 commit e83dd90

File tree

36 files changed

+477
-115
lines changed

36 files changed

+477
-115
lines changed

‎.github/workflows/build-wasm_of_ocaml.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ jobs:
107107
ref: feaf8f831051fd5f316963b28efd728cf0b0eca1
108108
path: jane-street/opam-repository
109109

110-
- name: Pin dune
111-
run: opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
112-
113110
- name: Pin wasm_of_ocaml
114111
working-directory: ./wasm_of_ocaml
115112
run: opam pin -n --with-version `< VERSION` .

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ jobs:
112112
dune-cache: true
113113
opam-pin: false
114114

115-
- name: Pin dune
116-
run: |
117-
opam pin add dune.3.17 https://github.com/ocaml/dune.git
118-
119115
- run: opam install conf-pkg-config
120116
if: runner.os == 'Windows'
121117

@@ -164,4 +160,4 @@ jobs:
164160
branch: wikidoc
165161
folder: doc-dev
166162
clean: true
167-
target-folder: doc/dev/
163+
target-folder: doc/dev/

‎.github/workflows/lint.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717
with:
1818
ocaml-compiler: "5.2"
1919
dune-cache: true
20-
- name: Pin dune
21-
run: |
22-
opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
2320
- uses: ocaml/setup-ocaml/lint-opam@v3
2421

2522
lint-fmt:
@@ -32,9 +29,6 @@ jobs:
3229
with:
3330
ocaml-compiler: "5.2"
3431
dune-cache: true
35-
- name: Pin dune
36-
run: |
37-
opam pin add -n dune.3.17 https://github.com/ocaml/dune.git
3832
- uses: ocaml/setup-ocaml/lint-fmt@v3
3933

4034
lint-runtime:

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ The following commands will perform a minimal installation:
2424
```
2525
git clone https://github.com/ocaml-wasm/wasm_of_ocaml
2626
cd wasm_of_ocaml
27-
opam pin add -n --with-version 3.17 https://github.com/ocaml/dune.git
28-
opam pin add -n --with-version 5.8.2-wasm .
29-
opam install wasm_of_ocaml-compiler
27+
opam pin add -n --with-version 6.0.0 .
28+
opam install dune.3.17.0 wasm_of_ocaml-compiler
3029
```
3130
You may want to install additional packages. For instance:
3231

‎benchmarks/sources/ml/dune‎

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,49 @@
11
(executables
2-
(names almabench bdd binary_trees boyer boyer_no_exc fannkuch_redux_2
3-
fannkuch_redux fft fib hamming kb kb_no_exc loop nucleic quicksort raytrace
4-
soli splay takc taku))
2+
(names
3+
almabench
4+
bdd
5+
binary_trees
6+
boyer
7+
boyer_no_exc
8+
fannkuch_redux_2
9+
fannkuch_redux
10+
fft
11+
fib
12+
hamming
13+
kb
14+
kb_no_exc
15+
loop
16+
nucleic
17+
quicksort
18+
raytrace
19+
soli
20+
splay
21+
takc
22+
taku))
523

624
(alias
725
(name benchmark)
8-
(deps almabench.exe bdd.exe binary_trees.exe boyer.exe boyer_no_exc.exe
9-
fannkuch_redux_2.exe fannkuch_redux.exe fft.exe fib.exe hamming.exe kb.exe
10-
kb_no_exc.exe loop.exe nucleic.exe quicksort.exe raytrace.exe soli.exe
11-
splay.exe takc.exe taku.exe))
26+
(deps
27+
almabench.exe
28+
bdd.exe
29+
binary_trees.exe
30+
boyer.exe
31+
boyer_no_exc.exe
32+
fannkuch_redux_2.exe
33+
fannkuch_redux.exe
34+
fft.exe
35+
fib.exe
36+
hamming.exe
37+
kb.exe
38+
kb_no_exc.exe
39+
loop.exe
40+
nucleic.exe
41+
quicksort.exe
42+
raytrace.exe
43+
soli.exe
44+
splay.exe
45+
takc.exe
46+
taku.exe))
1247

1348
(env
1449
(_

‎compiler/bin-js_of_ocaml/dune‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@
5151
(install
5252
(section man)
5353
(package js_of_ocaml-compiler)
54-
(files js_of_ocaml.1 js_of_ocaml-link.1 js_of_ocaml-build-fs.1
54+
(files
55+
js_of_ocaml.1
56+
js_of_ocaml-link.1
57+
js_of_ocaml-build-fs.1
5558
js_of_ocaml-build-runtime.1))
5659

5760
;; Generate and install runtime.js for compatibility reasons

‎compiler/bin-wasm_of_ocaml/dune‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323

2424
(rule
2525
(target wa_runtime.ml)
26-
(deps gen/gen.exe ../../runtime/wasm/runtime.wasm
27-
../../runtime/wasm/runtime.js ../../runtime/wasm/deps.json)
26+
(deps
27+
gen/gen.exe
28+
../../runtime/wasm/runtime.wasm
29+
../../runtime/wasm/runtime.js
30+
../../runtime/wasm/deps.json)
2831
(action
2932
(with-stdout-to
3033
%{target}

‎compiler/lib-dynlink/dune‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
(foreign_stubs
77
(language c)
88
(names stubs))
9-
(libraries js_of_ocaml-compiler js_of_ocaml-compiler.runtime
9+
(libraries
10+
js_of_ocaml-compiler
11+
js_of_ocaml-compiler.runtime
1012
compiler-libs.bytecomp))

‎compiler/lib/dune‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
(name js_of_ocaml_compiler)
33
(public_name js_of_ocaml-compiler)
44
(synopsis "Js_of_ocaml compiler library")
5-
(libraries compiler-libs.common compiler-libs.bytecomp menhirLib sedlex
5+
(libraries
6+
compiler-libs.common
7+
compiler-libs.bytecomp
8+
menhirLib
9+
sedlex
610
yojson)
711
(flags
812
(:standard -w -7-37 -safe-string))
@@ -13,9 +17,21 @@
1317

1418
(menhir
1519
(modules js_parser)
16-
(flags --table --external-tokens Js_token --explain --unused-token TAnnot
17-
--unused-token TComment --unused-token TCommentLineDirective --unused-token
18-
T_ERROR --unused-token T_AT))
20+
(flags
21+
--table
22+
--external-tokens
23+
Js_token
24+
--explain
25+
--unused-token
26+
TAnnot
27+
--unused-token
28+
TComment
29+
--unused-token
30+
TCommentLineDirective
31+
--unused-token
32+
T_ERROR
33+
--unused-token
34+
T_AT))
1935

2036
(menhir
2137
(modules annot_parser)

‎compiler/tests-check-prim/dune‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
(action
2424
(with-stdout-to
2525
%{targets}
26-
(run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js
26+
(run
27+
%{bin:js_of_ocaml}
28+
check-runtime
29+
+dynlink.js
30+
+toplevel.js
2731
%{dep:main.bc}))))
2832

2933
(rule
@@ -37,7 +41,11 @@
3741
(action
3842
(with-stdout-to
3943
%{targets}
40-
(run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js
44+
(run
45+
%{bin:js_of_ocaml}
46+
check-runtime
47+
+dynlink.js
48+
+toplevel.js
4149
%{dep:unix.bc}))))
4250

4351
(rule
@@ -51,7 +59,11 @@
5159
(action
5260
(with-stdout-to
5361
%{targets}
54-
(run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js
62+
(run
63+
%{bin:js_of_ocaml}
64+
check-runtime
65+
+dynlink.js
66+
+toplevel.js
5567
%{dep:unix.bc}))))
5668

5769
(rule
@@ -63,7 +75,11 @@
6375
(action
6476
(with-stdout-to
6577
%{targets}
66-
(run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js
78+
(run
79+
%{bin:js_of_ocaml}
80+
check-runtime
81+
+dynlink.js
82+
+toplevel.js
6783
%{dep:main.bc}))))
6884

6985
(rule
@@ -77,7 +93,11 @@
7793
(action
7894
(with-stdout-to
7995
%{targets}
80-
(run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js
96+
(run
97+
%{bin:js_of_ocaml}
98+
check-runtime
99+
+dynlink.js
100+
+toplevel.js
81101
%{dep:unix.bc}))))
82102

83103
(rule
@@ -91,5 +111,9 @@
91111
(action
92112
(with-stdout-to
93113
%{targets}
94-
(run %{bin:js_of_ocaml} check-runtime +dynlink.js +toplevel.js
114+
(run
115+
%{bin:js_of_ocaml}
116+
check-runtime
117+
+dynlink.js
118+
+toplevel.js
95119
%{dep:unix.bc}))))

0 commit comments

Comments
 (0)