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

Stop installing the ocaml-syntax-shims binary #2654

Merged
2 commits merged into from Sep 18, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
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)

1.11.3 (23/08/2019)
-------------------

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