Skip to content

Commit 8f45a63

Browse files
raphael-proustraphael-proust
authored
Merge pull request #1035 from shonfeder/1034/dune-2
Update to dune 2
2 parents 53916cf + 341b721 commit 8f45a63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+189
-562
lines changed

‎.github/workflows/workflow.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191

9292
- run: opam install lwt_react lwt --deps-only --with-test
9393

94-
- run: opam install lwt_ppx lwt_ppx_let --deps-only --with-test
94+
- run: opam install lwt_ppx --deps-only --with-test
9595
if: ${{ matrix.ppx == true }}
9696

9797
- run: opam exec -- dune build --only-packages lwt_react,lwt
@@ -104,9 +104,6 @@ jobs:
104104
- run: opam exec -- dune runtest --only-packages lwt_ppx
105105
if: ${{ matrix.ppx == true }}
106106

107-
- run: opam exec -- make ppx_let-test
108-
if: ${{ matrix.ppx == true }}
109-
110107
lint-opam:
111108
runs-on: ubuntu-latest
112109

‎.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@ lib/
3030

3131
# Wikidoc output.
3232
/docs/api/
33-
34-
# Junk from packaging tests.
35-
*.cm*
36-
*.o
37-
a.out

‎Makefile‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,6 @@ doc-api-html: build
4444
doc-api-wiki: build
4545
$(MAKE) -C docs api/wiki/index.wiki
4646

47-
# Packaging tests. These are run with Lwt installed by OPAM, typically during
48-
# CI. To run locally, run the install-for-packaging-test target first.
49-
.PHONY: packaging-test
50-
packaging-test:
51-
ocamlfind query lwt
52-
for TEST in `ls -d test/packaging/*/*` ; \
53-
do \
54-
$(MAKE) -wC $$TEST || exit 1 ; \
55-
echo ; \
56-
echo ; \
57-
done
58-
59-
.PHONY: install-for-packaging-test
60-
install-for-packaging-test: clean
61-
opam pin add --yes --no-action lwt .
62-
opam pin add --yes --no-action lwt_ppx .
63-
opam pin add --yes --no-action lwt_react .
64-
opam reinstall --yes lwt lwt_ppx lwt_react
65-
66-
.PHONY: uninstall-after-packaging-test
67-
uninstall-after-packaging-test:
68-
opam remove --yes lwt lwt_ppx lwt_react
69-
opam pin remove --yes lwt
70-
opam pin remove --yes lwt_ppx
71-
opam pin remove --yes lwt_react
72-
7347
# ppx_let integration test.
7448
.PHONY : ppx_let-test
7549
ppx_let-test :
@@ -81,10 +55,6 @@ clean :
8155
dune clean
8256
rm -fr docs/api
8357
rm -f src/unix/discover_arguments
84-
for TEST in `ls -d test/packaging/*/*` ; \
85-
do \
86-
$(MAKE) -wC $$TEST clean ; \
87-
done
8858
rm -rf _coverage/
8959

9060
EXPECTED_FILES := \

‎dune-project‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(lang dune 1.12)
1+
(lang dune 2.0)
22

33
(name lwt)
44

@@ -12,21 +12,13 @@
1212
(source (github ocsigen/lwt))
1313
(documentation "https://ocsigen.org/lwt")
1414

15-
(package
16-
(name lwt_ppx_let)
17-
(synopsis "Dummy package context for ppx_let tests")
18-
(description "Internal package used to partition ppx_let tests.")
19-
(depends
20-
(ocaml (>= 4.08))
21-
(ppx_let :with-test)
22-
lwt))
23-
2415
(package
2516
(name lwt_ppx)
2617
(synopsis "PPX syntax for Lwt, providing something similar to async/await from JavaScript")
2718
(depends
2819
(ocaml (>= 4.08))
2920
(ppxlib (>= 0.16.0))
21+
(ppx_let :with-test)
3022
lwt))
3123

3224
(package

‎lwt.opam‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ homepage: "https://github.com/ocsigen/lwt"
2020
doc: "https://ocsigen.org/lwt"
2121
bug-reports: "https://github.com/ocsigen/lwt/issues"
2222
depends: [
23-
"dune" {>= "1.12"}
23+
"dune" {>= "2.0"}
2424
"ocaml" {>= "4.08"}
2525
"cppo" {build & >= "1.1.0"}
2626
"ocamlfind" {dev & >= "1.7.3-1"}
@@ -54,4 +54,3 @@ build: [
5454
"@doc" {with-doc}
5555
]
5656
]
57-
available: os-family != "windows" | "ocaml-version" < "5.2"

‎lwt_ppx.opam‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ homepage: "https://github.com/ocsigen/lwt"
1111
doc: "https://ocsigen.org/lwt"
1212
bug-reports: "https://github.com/ocsigen/lwt/issues"
1313
depends: [
14-
"dune" {>= "1.12"}
14+
"dune" {>= "2.0"}
1515
"ocaml" {>= "4.08"}
1616
"ppxlib" {>= "0.16.0"}
17+
"ppx_let" {with-test}
1718
"lwt"
1819
]
20+
dev-repo: "git+https://github.com/ocsigen/lwt.git"
1921
build: [
2022
["dune" "subst"] {dev}
2123
[
@@ -30,4 +32,3 @@ build: [
3032
"@doc" {with-doc}
3133
]
3234
]
33-
dev-repo: "git+https://github.com/ocsigen/lwt.git"

‎lwt_ppx.opam.template‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
build: [
2+
["dune" "subst"] {dev}
3+
[
4+
"dune"
5+
"build"
6+
"-p"
7+
name
8+
"-j"
9+
jobs
10+
"@install"
11+
"@runtest" {with-test}
12+
"@doc" {with-doc}
13+
]
14+
]

‎lwt_ppx_let.opam‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎lwt_react.opam‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ homepage: "https://github.com/ocsigen/lwt"
1010
doc: "https://ocsigen.org/lwt"
1111
bug-reports: "https://github.com/ocsigen/lwt/issues"
1212
depends: [
13-
"dune" {>= "1.12"}
13+
"dune" {>= "2.0"}
1414
"ocaml" {>= "4.08"}
1515
"cppo" {build & >= "1.1.0"}
1616
"lwt" {>= "3.0.0"}
1717
"react" {>= "1.0.0"}
1818
]
19+
dev-repo: "git+https://github.com/ocsigen/lwt.git"
1920
build: [
2021
["dune" "subst"] {dev}
2122
[
@@ -30,4 +31,3 @@ build: [
3031
"@doc" {with-doc}
3132
]
3233
]
33-
dev-repo: "git+https://github.com/ocsigen/lwt.git"

‎lwt_react.opam.template‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
build: [
2+
["dune" "subst"] {dev}
3+
[
4+
"dune"
5+
"build"
6+
"-p"
7+
name
8+
"-j"
9+
jobs
10+
"@install"
11+
"@runtest" {with-test}
12+
"@doc" {with-doc}
13+
]
14+
]

0 commit comments

Comments
 (0)