Include subdirs

Author: davesnx

src/dune_rules/odoc.ml

@@ -784,7 +784,21 @@ let odoc_artefacts sctx target =
   | Lib lib ->
     let info = Lib.Local.info lib in
     let obj_dir = Lib_info.obj_dir info in
-    let+ modules = entry_modules_by_lib sctx lib in
+    let+ modules =
+      let+ modules = Dir_contents.modules_of_local_lib sctx lib in
+      Modules.fold modules ~init:[] ~f:(fun m acc ->
+        (* Only include modules that:
+           1. Have public visibility
+           2. Are not wrapped library implementation modules (those with __ in the name) *)
+        if Module.visibility m = Public
+           && (Module.obj_name m
+               |> Module_name.Unique.to_name ~loc:Loc.none
+               |> Module_name.to_string
+               |> String.contains_double_underscore
+               |> not)
+        then m :: acc
+        else acc)
+    in
     List.map modules ~f:(fun m ->
       let odoc_file = Obj_dir.Module.odoc obj_dir m in
       create_odoc ctx ~target odoc_file)
@@ -1116,24 +1130,10 @@ let setup_package_odoc_rules sctx ~pkg =
 ;;
 
 let gen_project_rules sctx project =
-  let () =
-    User_message.print
-      (User_message.make
-         [ Pp.textf "Odoc.gen_project_rules called for project: %s"
-             (Dune_project.name project |> Dune_project_name.to_string_hum)
-         ])
-  in
   Dune_project.packages project
   |> Dune_lang.Package_name.Map.to_seq
   |> Memo.parallel_iter_seq ~f:(fun (_, (pkg : Package.t)) ->
     (* setup @doc to build the correct html for the package *)
-    let () =
-      User_message.print
-        (User_message.make
-           [ Pp.textf "Setting up package aliases for: %s"
-               (Package.name pkg |> Package.Name.to_string)
-           ])
-    in
     setup_package_aliases sctx pkg)
 ;;