Skip to content

Reanalyze: remove support for legacy build system #8212

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

Merged
cknitt merged 2 commits into from
Jan 22, 2026
Merged

Reanalyze: remove support for legacy build system #8212

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
515ee71
Reanalyze: remove support for legacy build system
cknitt Jan 22, 2026
4191504
CHANGELOG
cknitt Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 26 additions & 51 deletions analysis/reanalyze/src/Reanalyze.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,58 +105,33 @@ let collectCmtFilePaths ~cmtRoot : string list =
(* Prefer explicit scan plan emitted by rewatch (v2 `.sourcedirs.json`).
This supports monorepos without reanalyze-side package resolution. *)
let scan_plan = Paths.readCmtScan () in
if scan_plan <> [] then
let seen = Hashtbl.create 256 in
let add_dir (absDir : string) =
let files =
match Sys.readdir absDir |> Array.to_list with
| files -> files
| exception Sys_error _ -> []
in
files
|> List.filter (fun x ->
Filename.check_suffix x ".cmt" || Filename.check_suffix x ".cmti")
|> List.sort String.compare
|> List.iter (fun f ->
let p = Filename.concat absDir f in
if not (Hashtbl.mem seen p) then (
Hashtbl.add seen p ();
paths := p :: !paths))
in
scan_plan
|> List.iter (fun (entry : Paths.cmt_scan_entry) ->
let build_root_abs =
Filename.concat runConfig.projectRoot entry.build_root
in
(* Scan configured subdirs. *)
entry.scan_dirs
|> List.iter (fun d -> add_dir (Filename.concat build_root_abs d));
(* Optionally scan build root itself for namespace/mlmap `.cmt`s. *)
if entry.also_scan_build_root then add_dir build_root_abs)
else
(* Legacy behavior: scan `<projectRoot>/lib/bs/<sourceDir>` based on source dirs. *)
let lib_bs = runConfig.projectRoot +++ ("lib" +++ "bs") in
let sourceDirs =
Paths.readSourceDirs ~configSources:None |> List.sort String.compare
let seen = Hashtbl.create 256 in
let add_dir (absDir : string) =
let files =
match Sys.readdir absDir |> Array.to_list with
| files -> files
| exception Sys_error _ -> []
in
sourceDirs
|> List.iter (fun sourceDir ->
let libBsSourceDir = Filename.concat lib_bs sourceDir in
let files =
match Sys.readdir libBsSourceDir |> Array.to_list with
| files -> files
| exception Sys_error _ -> []
in
let cmtFiles =
files
|> List.filter (fun x ->
Filename.check_suffix x ".cmt"
|| Filename.check_suffix x ".cmti")
in
cmtFiles |> List.sort String.compare
|> List.iter (fun cmtFile ->
let cmtFilePath = Filename.concat libBsSourceDir cmtFile in
paths := cmtFilePath :: !paths)));
files
|> List.filter (fun x ->
Filename.check_suffix x ".cmt" || Filename.check_suffix x ".cmti")
|> List.sort String.compare
|> List.iter (fun f ->
let p = Filename.concat absDir f in
if not (Hashtbl.mem seen p) then (
Hashtbl.add seen p ();
paths := p :: !paths))
in
scan_plan
|> List.iter (fun (entry : Paths.cmt_scan_entry) ->
let build_root_abs =
Filename.concat runConfig.projectRoot entry.build_root
in
(* Scan configured subdirs. *)
entry.scan_dirs
|> List.iter (fun d -> add_dir (Filename.concat build_root_abs d));
(* Optionally scan build root itself for namespace/mlmap `.cmt`s. *)
if entry.also_scan_build_root then add_dir build_root_abs));
!paths |> List.rev

(** Process files sequentially *)
Expand Down
Loading