diff --git a/lib/dune b/lib/dune index ebe26f9568..604ee30fe3 100644 --- a/lib/dune +++ b/lib/dune @@ -28,7 +28,7 @@ (backend bisect_ppx)) (libraries format_ - ocaml_common + ocamlformat-lib._ocaml-common parser_standard parser_extended ocamlformat_stdlib diff --git a/test/install/ocamlformat-lib/dune b/test/install/ocamlformat-lib/dune new file mode 100644 index 0000000000..613fb4495c --- /dev/null +++ b/test/install/ocamlformat-lib/dune @@ -0,0 +1,9 @@ +(executable + (name foo) + (libraries ocamlformat-lib ppxlib)) + +(rule + (alias runtest) + (deps ./foo.exe) + (action + (run %{deps}))) diff --git a/test/install/ocamlformat-lib/foo.ml b/test/install/ocamlformat-lib/foo.ml new file mode 100644 index 0000000000..1d44784639 --- /dev/null +++ b/test/install/ocamlformat-lib/foo.ml @@ -0,0 +1,3 @@ +let _ = Ocamlformat_lib.Translation_unit.parse_and_format + +type t = Ppxlib_ast.Parsetree.structure diff --git a/vendor/ocaml-common/dune b/vendor/ocaml-common/dune index 6aabddca26..35ef3dcdc7 100644 --- a/vendor/ocaml-common/dune +++ b/vendor/ocaml-common/dune @@ -1,6 +1,6 @@ (library (name ocaml_common) - (public_name ocamlformat-lib.ocaml_common) + (public_name ocamlformat-lib._ocaml-common) (flags (:standard -w -9 -open Parser_shims)) (libraries parser_shims)) diff --git a/vendor/ocamlformat-stdlib/dune b/vendor/ocamlformat-stdlib/dune index e1edb24507..aa05ec90e3 100644 --- a/vendor/ocamlformat-stdlib/dune +++ b/vendor/ocamlformat-stdlib/dune @@ -3,4 +3,4 @@ (public_name ocamlformat-lib.ocamlformat_stdlib) (flags (:standard -open Ocaml_common)) - (libraries base cmdliner ocaml_common fpath stdio)) + (libraries base cmdliner ocamlformat-lib._ocaml-common fpath stdio)) diff --git a/vendor/parser-extended/dune b/vendor/parser-extended/dune index 72633eb613..6b13bb6119 100644 --- a/vendor/parser-extended/dune +++ b/vendor/parser-extended/dune @@ -3,7 +3,11 @@ (public_name ocamlformat-lib.parser_extended) (flags (:standard -w -9 -open Parser_shims -open Ocaml_common)) - (libraries compiler-libs.common menhirLib parser_shims ocaml_common)) + (libraries + compiler-libs.common + menhirLib + parser_shims + ocamlformat-lib._ocaml-common)) (ocamllex lexer) diff --git a/vendor/parser-standard/dune b/vendor/parser-standard/dune index d89ed64ba3..9e56ee9f94 100644 --- a/vendor/parser-standard/dune +++ b/vendor/parser-standard/dune @@ -3,7 +3,11 @@ (public_name ocamlformat-lib.parser_standard) (flags (:standard -w -9 -open Parser_shims -open Ocaml_common)) - (libraries compiler-libs.common menhirLib parser_shims ocaml_common)) + (libraries + compiler-libs.common + menhirLib + parser_shims + ocamlformat-lib._ocaml-common)) (ocamllex lexer)