Skip to content

dune improvements#14408

Merged
nojb merged 1 commit intoocaml:trunkfrom
Alizter:push-wupwlxrvmqsr
Dec 8, 2025
Merged

dune improvements#14408
nojb merged 1 commit intoocaml:trunkfrom
Alizter:push-wupwlxrvmqsr

Conversation

@Alizter
Copy link
Copy Markdown
Contributor

@Alizter Alizter commented Dec 6, 2025

Here are some improvements to the dune setup. The compiler isn't built using dune so I think its fine to ask for a more recent version here.

@gasche
Copy link
Copy Markdown
Member

gasche commented Dec 6, 2025

Thanks! Getting up-to-date on standard dune idioms from more recent versions is a welcome change.

Why is this marked as a draft? I am happy to merge this as long as the Dune builds keep more-or-less working. (On my machine I generally expect that dune build @libs will succeed in building most compilation units in the compiler, so that I then get Merlin working.)

@Alizter Alizter marked this pull request as ready for review December 8, 2025 07:47
@Alizter
Copy link
Copy Markdown
Contributor Author

Alizter commented Dec 8, 2025

I've marked this as a draft since I didn't have time to check it is currently working. It was working when I wrote it a few months back.

I've undrafted it now. Please could you check that it doesn't break your existing workflow with dune.

The new makefile target is to have finer control when building with dune after having built with make. It only removes the parts that confuses dune, which should soon be gone when we introduce the (files) stanza allowing you to ignore those files instead.

Signed-off-by: Ali Caglayan <alizter@gmail.com>
@gasche gasche force-pushed the push-wupwlxrvmqsr branch from 94bf6e9 to 995f160 Compare December 8, 2025 09:10
@gasche
Copy link
Copy Markdown
Member

gasche commented Dec 8, 2025

I just tested it, and it works fine, thanks! I needed to rebase it on top of the current trunk to get the other dune fixes from #14328. (One of the fixes is also duplicated in the PR, but git seems able to rebase just fine.)

Our check-typo script complains that one line is too long. I rebased the PR and fixed the complaint, so this should be good to merge.

@gasche
Copy link
Copy Markdown
Member

gasche commented Dec 8, 2025

Note: I tried to use copy_files# in the stdlib as I considered in ocaml/dune#12879 (comment) , but I now realize that this seems to require listing all the files of the stdlib/ subdirectory by hand, which makes the dune file slightly more maintenance-consuming. If the dune people are happy with (files ...) then it is the better approach, otherwise we should give copy_files# a try again.

@gasche gasche added the merge-me label Dec 8, 2025
@nojb nojb merged commit 2d6a35d into ocaml:trunk Dec 8, 2025
33 checks passed
@Alizter Alizter deleted the push-wupwlxrvmqsr branch February 20, 2026 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants