Monorepo mode fixes #1276
Monorepo mode fixes #1276
Conversation
|
Built on top of #1275 |
src/markdown/doc_of_md.ml
Outdated
| String.sub s 0 (String.length s - 4) | ||
| else s | ||
| in | ||
| root ^ ".html" |
There was a problem hiding this comment.
If we have a link to foo.png, will this output foo.png.html ?
src/driver/monorepo_style.ml
Outdated
| match Option.map Fpath.segs p' with | ||
| | Some (objdir :: _ :: _) -> ( | ||
| match Astring.String.fields ~is_sep:(fun c -> c = '.') objdir with | ||
| | [ ""; libname; _ ] -> Some libname |
There was a problem hiding this comment.
We could assert that we are looking at the right directory:
| | [ ""; libname; _ ] -> Some libname | |
| | [ ""; libname; "objs" ] -> Some libname |
src/driver/monorepo_style.ml
Outdated
| | p :: _ -> ( | ||
| let p' = Fpath.relativize ~root:(Fpath.v l.source_dir) (Fpath.v p) in | ||
| match Option.map Fpath.segs p' with | ||
| | Some (objdir :: _ :: _) -> ( |
There was a problem hiding this comment.
Does adding this comment make sense?
| | Some (objdir :: _ :: _) -> ( | |
| (* cmt files are expected to be in [library_path/.libname.objs/byte/name.cmt]. *) | |
| | Some (objdir :: _ :: _) -> ( |
src/driver/monorepo_style.ml
Outdated
| match internal_name_of_library lib with | ||
| | None -> None | ||
| | Some libname -> | ||
| let cmtidir = |
There was a problem hiding this comment.
This cmtidir is already computed inside internal_name_of_library and could be removed to avoid constructing the path again potentially differently.
| in | ||
| let id_override = | ||
| Fpath.relativize | ||
| ~root:Fpath.(v "_build/default") |
There was a problem hiding this comment.
~root has dir prepended:
let root = Fpath.(dir / "_build" / "default") in
src/driver/monorepo_style.ml
Outdated
| |> Option.map Fpath.to_string | ||
| in | ||
| Logs.debug (fun m -> m "this should never be 'None': %a" Fmt.Dump.(option string) id_override); | ||
| if List.mem cmtidir c then |
There was a problem hiding this comment.
This is checking that cmtidir was actually built ? Perhaps c should be a set to avoid the loop in the loop ?
src/driver/odoc_units_of.ml
Outdated
| if pkg.name = "pkg" then | ||
| let others :> t list = Landing_pages.make_custom dirs index_of (List.find (fun p -> p.Packages.name = "pkg") pkgs) in | ||
| others @ List.concat | ||
| (mld_units @ asset_units @ md_units @ lib_units) | ||
| else | ||
| List.concat | ||
| ((pkg_index () :: src_index () :: lib_units) | ||
| @ mld_units @ asset_units @ md_units) |
There was a problem hiding this comment.
When pkg.name = "pkg" is false, this returns the same thing as in the Normal or Voodoo case. The code could be made clearer.
src/driver/odoc_units_of.mli
Outdated
| type indices_style = | ||
| | Voodoo | ||
| | Normal | ||
| | Custom |
There was a problem hiding this comment.
The Custom mode generates index pages in every places it needs. Could it be called Automatic ?
jonludlam
force-pushed
the
monorepo-mode-fixes
branch
from
6887d13 to
09d16f1
Compare
- library dependencies need transitive deps too - added the ability to specify extra pkgs/libs (like odoc-config.sexp) - minor improvements to landing pages - pick up jpgs as assets
jonludlam
force-pushed
the
monorepo-mode-fixes
branch
from
97c50f4 to
94e47d7
Compare
No description provided.