Skip to content
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

WIP: Attempt to fix Cmi_format error in voodoo-do, by checking in prep that the magic numbers are ok #115

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

WIP: Attempt to fix Cmi_format error in voodoo-do, by checking in prep that the magic numbers are ok #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e91552
fix Cmi_format error in voodoo-do, by checking in prep that the magic…
sabine Jul 14, 2023
8333d32
try/with around call to ocamlobjinfo, is_blacklisted
sabine Jul 25, 2023
2f7b1f4
Update src/voodoo-prep/prep.ml
sabine Jul 25, 2023
0e6ac4d
Use read_cmt/cmi functions from compiler-libs (#1)
gpetiot Sep 6, 2023
5ba1fe1
fmt
sabine Sep 6, 2023
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
2 changes: 1 addition & 1 deletion src/voodoo-prep/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
(name main)
(public_name voodoo-prep)
(package voodoo-prep)
(libraries cmdliner fpath bos opam-format))
(libraries cmdliner fpath bos compiler-libs.common opam-format))
25 changes: 20 additions & 5 deletions src/voodoo-prep/prep.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,26 @@ let process_package : Fpath.t -> Package.t -> Fpath.t list -> unit =
fun root package files ->
let dest = Package.prep_path package in

let format_matches_compiler_version path =
let filename = Fpath.to_string path in
try
(match Fpath.get_ext path with
| ".cmt" | ".cmti" -> ignore @@ Cmt_format.read_cmt filename
| ".cmi" -> ignore @@ Cmi_format.read_cmi filename
| _ -> assert false);
true
with _ ->
Format.eprintf "[WARNING] %a ignored: wrong magic number\n%!" Fpath.pp
path;
false
in

(* Some packages produce ocaml artefacts that can't be processed with the switch's
ocaml compiler - most notably the secondary compiler! This switch is intended to
be used to ignore those files *)
let process_ocaml_artefacts =
let is_blacklisted =
let package_blacklist = [ "ocaml-secondary-compiler" ] in
not (List.mem package.name package_blacklist)
List.mem package.name package_blacklist
in

let foldfn fpath acc =
Expand All @@ -27,16 +41,17 @@ let process_package : Fpath.t -> Package.t -> Fpath.t list -> unit =
let no_ext = Fpath.rem_ext filename in
let has_hyphen = String.contains (Fpath.to_string filename) '-' in
let is_module =
process_ocaml_artefacts
(not is_blacklisted)
&& List.mem ext [ ".cmt"; ".cmti"; ".cmi" ]
&& not has_hyphen
&& (not has_hyphen)
&& format_matches_compiler_version Fpath.(root // fpath)
in
let do_copy =
(not in_build_dir)
&& (is_in_doc_dir || is_module
|| List.mem no_ext (List.map Fpath.v [ "META"; "dune-package" ]))
in
let is_cma = process_ocaml_artefacts && List.mem ext [ ".cma"; ".cmxa" ] in
let is_cma = (not is_blacklisted) && List.mem ext [ ".cma"; ".cmxa" ] in
let copy =
if do_copy then Fpath.(root // fpath, dest // fpath) :: acc.copy
else acc.copy
Expand Down