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.

Sign up for GitHub

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

Jump to bottom

Use Toploop.add_directive #4834

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Use Toploop.add_directive #4834

merged 1 commit into from
Sep 21, 2021

Conversation

nojb
Copy link
Collaborator

@nojb nojb commented Jul 28, 2021

Fixes #4830

cc @hhugo

@nojb nojb force-pushed the toploop_add_directive branch 5 times, most recently from aec8eae to 44cb88b Compare July 28, 2021 11:43
rgrinberg
rgrinberg approved these changes Aug 16, 2021
View reviewed changes
Copy link
Member

@rgrinberg rgrinberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a CHANGES entry.

@nojb nojb force-pushed the toploop_add_directive branch 2 times, most recently from 292763c to 97b6be2 Compare September 21, 2021 07:48
@nojb
Copy link
Collaborator Author

nojb commented Sep 21, 2021

Needs a CHANGES entry.

Done (sorry for the lag). Will merge once CI passes.

@nojb
Use Toploop.add_directive
c2cce09 
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb nojb force-pushed the toploop_add_directive branch from 97b6be2 to c2cce09 Compare September 21, 2021 08:11
@nojb
Copy link
Collaborator Author

nojb commented Sep 21, 2021

By the way if there is another 2.9 release this can go in it.

@nojb nojb merged commit 3f08057 into ocaml:main Sep 21, 2021
@nojb nojb deleted the toploop_add_directive branch September 21, 2021 08:50
@hhugo
Copy link
Collaborator

hhugo commented Sep 27, 2021

When should I expect this to land in an official release ?

@nojb
Copy link
Collaborator Author

nojb commented Sep 27, 2021

This will be in 3.0 but it is probably worth doing a 2.9 maintenance release with this fix as well. cc @rgrinberg @ejgallego

@ejgallego
Copy link
Collaborator

ejgallego commented Sep 27, 2021 •
edited
Loading

Ok, the fix seems minor but we can add it to 2.9.2

@ejgallego ejgallego added this to the 2.9.2 milestone Sep 27, 2021
@nojb
Copy link
Collaborator Author

nojb commented Sep 27, 2021

Ok, the fix seems minor but we can add it to 2.9.2

Yes, the warning is a bit annoying because it triggers whenever you use "OCaml syntax" with 4.13.

@samoht
Copy link
Member

samoht commented Oct 19, 2021

It would indeed be nice to have a 2.9.2 release to declutter build results with OCaml 4.13.

@ejgallego
Copy link
Collaborator

Sure, I didn't have time to backport this, please feel free to submit a backported PR targetting the 2.9 branch [and don't forget to adjust the changelog in master too]

samoht pushed a commit to samoht/dune that referenced this pull request Oct 20, 2021
@nojb @samoht
Use Toploop.add_directive (ocaml#4834)
9b049de 
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
(cherry picked from commit 3f08057)
@samoht
Copy link
Member

samoht commented Oct 20, 2021

Done in #5026

nojb added a commit that referenced this pull request Oct 20, 2021
@samoht @nojb
Use Toploop.add_directive (#4834) (#5026)
0aecdcf 
(cherry picked from commit 3f08057)

Co-authored-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb nojb mentioned this pull request Jan 6, 2022
Closed
@ejgallego ejgallego mentioned this pull request Jan 23, 2022
Merged
kit-ty-kate pushed a commit to ocaml/opam-repository that referenced this pull request Jan 23, 2022
@ejgallego
[new release] dune (2.9.2)
6a457f8 
CHANGES:

- Fix missing -linkall flag when linking library dune-sites.plugin
  ( ocaml/dune#4348, @Kakadu, @bobot, reported by @Kakadu)

- No longer reference deprecated Toploop functions when using dune files in
  OCaml syntax. (ocaml/dune#4834, fixes ocaml/dune#4830, @nojb)

- Use the stag format API to be compatible with OCaml 5.0 (ocaml/dune#5351, @emillon).

- Fix post-processing of dune-package (fix ocaml/dune#4389, @strub)
nojb added a commit to nojb/dune that referenced this pull request Jan 25, 2022
@nojb
Revert "Use Toploop.add_directive (ocaml#4834)"
e75770c 
This reverts commit 3f08057.

Signed-off-by: nojebar <nicolas.ojeda.bar@lexifi.com>
nojb added a commit to nojb/dune that referenced this pull request Jan 26, 2022
@nojb
Revert "Use Toploop.add_directive (ocaml#4834)"
9855e61 
This reverts commit 3f08057.

Signed-off-by: nojebar <nicolas.ojeda.bar@lexifi.com>
ejgallego pushed a commit that referenced this pull request Jan 26, 2022
@nojb @ejgallego
Revert "Use Toploop.add_directive (#4834)"
59560e1 
This reverts commit 3f08057.

Signed-off-by: nojebar <nicolas.ojeda.bar@lexifi.com>
ejgallego pushed a commit that referenced this pull request Jan 26, 2022
@nojb @ejgallego
Revert "Use Toploop.add_directive (#4834)"
eb7e8ee 
This reverts commit 3f08057.

Signed-off-by: nojebar <nicolas.ojeda.bar@lexifi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rgrinberg rgrinberg rgrinberg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.9.2
Development

Successfully merging this pull request may close these issues.

deprecated alert when using ocaml syntax in dune files with ocaml 4.13~alpha2
5 participants
@nojb @hhugo @ejgallego @samoht @rgrinberg