Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to ppxlib #807

Merged
merged 2 commits into from
Nov 23, 2020
Merged

Switch to ppxlib #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
583f478
switch to ppxlib
pveber Sep 14, 2020
cfc48b1
Adjust Travis for preceding commit
aantron Nov 14, 2020
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
29 changes: 20 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ scripts:
- |
if [ "$CACHED" == no ]
then
opam install . --deps-only --yes
if [ "$PPX" == no ]
then
opam install ./lwt.opam ./lwt_react.opam --deps-only --yes
else
opam install . --deps-only --yes
fi
fi
- |
if [ "$CACHED" == no && "$LIBEV" != no ]
Expand All @@ -96,8 +101,14 @@ scripts:
- |
if [ "$COVERAGE" != yes ]
then
dune build
dune runtest --force
if [ "$PPX" == no ]
then
dune build --only-packages lwt,lwt_react
dune runtest --only-packages lwt,lwt_react --force
else
dune build
dune runtest --force
fi
else
make coverage
bisect-ppx-report send-to Coveralls
Expand Down Expand Up @@ -159,7 +170,7 @@ matrix:
env: COMPILER=4.10.0 LIBEV=no
- <<: *opam
os: linux
env: COMPILER=4.10.0 LIBEV=no PPX_LET=yes COVERAGE=yes
env: COMPILER=4.10.0 LIBEV=no PPX_LET=yes
- <<: *opam
os: linux
env: COMPILER=4.09.0 DOCS=yes
Expand All @@ -177,13 +188,13 @@ matrix:
env: COMPILER=4.05.0+bytecode-only
- <<: *opam
os: linux
env: COMPILER=4.04.2
env: COMPILER=4.04.2 PACKAGING=yes
- <<: *opam
os: linux
env: COMPILER=4.03.0
env: COMPILER=4.03.0 PPX=no
- <<: *opam
os: linux
env: COMPILER=4.02.3 PACKAGING=yes
env: COMPILER=4.02.3 PPX=no
- <<: *esy
os: linux
env: ESY=yes
Expand All @@ -194,8 +205,8 @@ matrix:
- env: COMPILER=4.07.1
- env: COMPILER=4.06.1 LWT_STRESS_TEST=true
- env: COMPILER=4.05.0+bytecode-only
- env: COMPILER=4.04.2
- env: COMPILER=4.03.0
- env: COMPILER=4.04.2 PACKAGING=yes
- env: COMPILER=4.03.0 PPX=no
- env: ESY=yes

fast_finish: true
Expand Down
3 changes: 2 additions & 1 deletion lwt.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ depends: [
"result" # result is needed as long as Lwt supports OCaml 4.02.
"seq" # seq is needed as long as Lwt supports OCaml < 4.07.0.

"bisect_ppx" {dev & >= "2.0.0"}
# Until https://github.com/aantron/bisect_ppx/pull/327.
# "bisect_ppx" {dev & >= "2.0.0"}
"ocamlfind" {dev & >= "1.7.3-1"}
]

Expand Down
3 changes: 1 addition & 2 deletions lwt_ppx.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ depends: [
"dune" {>= "1.8.0"}
"lwt"
"ocaml" {>= "4.02.0"}
"ocaml-migrate-parsetree" {>= "1.7.0"}
"ppx_tools_versioned" {>= "5.4.0"}
"ppxlib" {>= "0.16.0"}
]

build: [
Expand Down
4 changes: 2 additions & 2 deletions src/ppx/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ let () = Jbuild_plugin.V1.send @@ {|
(public_name lwt_ppx)
(synopsis "Lwt PPX syntax extension")
(modules ppx_lwt)
(libraries compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned)
(libraries ocaml-compiler-libs.common ppxlib)
(ppx_runtime_libraries lwt)
(kind ppx_rewriter)
(preprocess (pps ppx_tools_versioned.metaquot_411 |} ^ bisect_ppx ^ {|))
(preprocess (pps ppxlib.metaquot|} ^ bisect_ppx ^ {|))
(flags (:standard -w +A-4)))

|}
Loading