Skip to content

Commit

Permalink
Stop installing the ocaml-syntax-shims binary (#2654)
Browse files Browse the repository at this point in the history
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
  • Loading branch information
jeremiedimino authored Sep 18, 2019
1 parent b2d1057 commit 1fad79f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@
the executable source. Programs that use this feature can be run by a new
action (dynamic-run <progn> ...). (#2635, @staronj, @aalekseyev)

- Stop installing the `ocaml-syntax-shims` binary. In order to use
`future_syntax`, one now need to depend on the `ocaml-syntax-shims`
package (#2654, @diml)

- Add support for dependencies that are re-exported. Such dependencies
are marked with`re_export` and will automatically be provided to
users of a library (#2605, @rgrinberg)
Expand Down
5 changes: 5 additions & 0 deletions doc/concepts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,11 @@ compilers.
One example of supported syntax is the custom let-syntax that was
introduced in 4.08, allowing the user to define custom let operators.

Note that this feature is implemented by the third-party
`ocaml-syntax-shims project
<https://github.com/ocaml-ppx/ocaml-syntax-shims>`, so if you use this
feature you must also declare a dependency on this package.

.. _deps-field:

Dependency specification
Expand Down
6 changes: 6 additions & 0 deletions dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
;; We embed a copy of ocaml-syntax-shims until we drop support for
;; OCaml < 4.08
(env
(_
(binaries
(src/ocaml-syntax-shims/pp.exe as ocaml-syntax-shims))))
2 changes: 0 additions & 2 deletions src/ocaml-syntax-shims/dune
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
(executable
(name pp)
(package dune)
(public_name ocaml-syntax-shims)
(libraries compiler-libs.common))

(ocamllex let_trail)
Expand Down

0 comments on commit 1fad79f

Please sign in to comment.