Allow users to vendor ppxlib as-is, as well as ppx_sexp_conv in the s…

…ame project Signed-off-by: Kate <[email protected]>
ocaml-ppx · Feb 14, 2023 · a8bc98c · a8bc98c
1 parent acc54bd
commit a8bc98c
Show file tree

Hide file tree

Showing 52 changed files with 8 additions and 7,019 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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)
 ------------------

diff --git a/bench/vendored/dune b/bench/vendored/dune
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/dune-project b/bench/vendored/ppx_sexp_conv.v0.15.1/dune-project
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/expander/dune b/bench/vendored/ppx_sexp_conv.v0.15.1/expander/dune
@@ -1,5 +1,5 @@
-(library (name ppx_sexp_conv_expander) (public_name ppx_sexp_conv.expander)
+(library (name ppx_sexp_conv_expander)
  (enabled_if (>= %{ocaml_version} "4.10.0"))
- (libraries base ppxlib ppxlib.metaquot_lifters)
+ (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)))
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/runtime-lib/dune b/bench/vendored/ppx_sexp_conv.v0.15.1/runtime-lib/dune
@@ -1,2 +1,2 @@
-(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))
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/src/dune b/bench/vendored/ppx_sexp_conv.v0.15.1/src/dune
@@ -1,3 +1,3 @@
-(library (name ppx_sexp_conv) (public_name ppx_sexp_conv) (kind ppx_deriver)
+(library (name ppx_sexp_conv) (kind ppx_deriver)
  (enabled_if (>= %{ocaml_version} "4.10.0"))
- (libraries ppxlib ppx_sexp_conv_expander) (preprocess no_preprocessing))
+ (libraries ppxlib ppx_sexp_conv_expander) (preprocess no_preprocessing))
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/test/dune b/bench/vendored/ppx_sexp_conv.v0.15.1/test/dune
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/test/errors.mlt b/bench/vendored/ppx_sexp_conv.v0.15.1/test/errors.mlt
diff --git a/bench/vendored/ppx_sexp_conv.v0.15.1/test/examples.mlt b/bench/vendored/ppx_sexp_conv.v0.15.1/test/examples.mlt