Driver: New hierarchy #1236
Merged
Driver: New hierarchy #1236
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonludlam
added
the
no changelog
This will allow to avoid circular dependencies when generation function call landing page generation function (which depend on the type defs) The code is untouched (apart from being moved).
This will be useful for landing pages outside of the hierarchy.
In particular, the package list page does not have one.
panglesd
force-pushed
the
new-hierarchy-in-driver-clean
branch
from
dc0b86f to
64ec490
Compare
jonludlam
reviewed
Nov 8, 2024
src/driver/odoc_driver.ml
Outdated
| @@ -614,6 +614,8 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers | |||
| if voodoo then | |||
| match Util.StringMap.to_list all with | |||
| | [ (_, p) ] -> | |||
| (* TODO: check whether the [doc] layer should be removed (due to new | |||
There was a problem hiding this comment.
It should be fine to remove the 'doc' dir.
|
This looks good, except that there's some code in the voodoo module to determine libraries based on their paths which we need to figure out: https://github.com/ocaml/odoc/blob/master/src/driver/voodoo.ml#L277-L280 |
|
I'm working on a fix for voodoo mode. |
|
Then, I pushed only the fix regarding your other comment. Is there anything more to do than removing the "lib" intermediate directory in your linked file? I'll wait and see your fix! |
|
Seems voodoo mode is broken for more reasons, let's just merge this and I'll fix it in another PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #1233.
Implement the new hierarchy in the driver. This time, properly split in commits!