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.

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

Allow users to vendor ppxlib as-is, as well as ppx_sexp_conv in the same project #386

Merged
merged 1 commit into from
Feb 14, 2023
Merged
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
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
unreleased
------------------


- Allow users to vendor `ppxlib` as-is, as well as `ppx_sexp_conv` in the same project (#386, @kit-ty-kate)

0.29.0 (06/02/2023)
------------------
Expand Down
1 change: 0 additions & 1 deletion bench/vendored/dune

This file was deleted.

1 change: 1 addition & 0 deletions bench/vendored/ppx_sexp_conv.v0.15.1/.ocamlformat-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**
1 change: 0 additions & 1 deletion bench/vendored/ppx_sexp_conv.v0.15.1/dune-project

This file was deleted.

11 changes: 7 additions & 4 deletions bench/vendored/ppx_sexp_conv.v0.15.1/expander/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
(library (name ppx_sexp_conv_expander) (public_name ppx_sexp_conv.expander)
(enabled_if (>= %{ocaml_version} "4.10.0"))
(libraries base ppxlib ppxlib.metaquot_lifters)
(library
(name ppx_sexp_conv_expander)
(enabled_if
(>= %{ocaml_version} "4.10.0"))
(libraries base ppxlib ppxlib.astlib ppxlib.metaquot_lifters)
(ppx_runtime_libraries ppx_sexp_conv.runtime-lib sexplib0)
(preprocess (pps ppxlib.metaquot ppxlib.traverse)))
(preprocess
(pps ppxlib.metaquot ppxlib.traverse)))
6 changes: 4 additions & 2 deletions bench/vendored/ppx_sexp_conv.v0.15.1/runtime-lib/dune
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
(library (name ppx_sexp_conv_lib) (public_name ppx_sexp_conv.runtime-lib)
(libraries sexplib0) (preprocess no_preprocessing))
(library
(name ppx_sexp_conv_lib)
(libraries sexplib0)
(preprocess no_preprocessing))
10 changes: 7 additions & 3 deletions bench/vendored/ppx_sexp_conv.v0.15.1/src/dune
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
(library (name ppx_sexp_conv) (public_name ppx_sexp_conv) (kind ppx_deriver)
(enabled_if (>= %{ocaml_version} "4.10.0"))
(libraries ppxlib ppx_sexp_conv_expander) (preprocess no_preprocessing))
(library
(name ppx_sexp_conv)
(kind ppx_deriver)
(enabled_if
(>= %{ocaml_version} "4.10.0"))
(libraries ppxlib ppx_sexp_conv_expander)
(preprocess no_preprocessing))
4 changes: 0 additions & 4 deletions bench/vendored/ppx_sexp_conv.v0.15.1/test/dune

This file was deleted.

265 changes: 0 additions & 265 deletions bench/vendored/ppx_sexp_conv.v0.15.1/test/errors.mlt

This file was deleted.

58 changes: 0 additions & 58 deletions bench/vendored/ppx_sexp_conv.v0.15.1/test/examples.mlt

This file was deleted.

Loading