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

Jump to bottom

Fix Nix build header: F* and krml versions empty #394

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

Fix Nix build header: F* and krml versions empty #394

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de6337b
Fix Nix build header: F* rev empty
Oct 27, 2023
96f97c9
Fix Nix build header: krml rev empty
Oct 27, 2023
5eb08e9
Merge branch 'master' into areitz/fix-nix-build-header
cmovcc Dec 6, 2023
4752b6b
Merge branch 'master' into areitz/fix-nix-build-header
cmovcc Dec 18, 2023
4dac77c
Merge branch 'master' into areitz/fix-nix-build-header
R1kM Mar 3, 2024
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
25 changes: 10 additions & 15 deletions lib/Driver.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,9 @@ let detect_karamel () =
if not !Options.silent then
KPrint.bprintf "%sKaRaMeL home is:%s %s\n" Ansi.underline Ansi.reset krml_home;

if try Sys.is_directory (krml_home ^^ ".git") with Sys_error _ -> false then begin
let cwd = Sys.getcwd () in
Sys.chdir krml_home;
krml_rev := String.sub (read_one_line "git" [| "rev-parse"; "HEAD" |]) 0 8;
Sys.chdir cwd
krml_rev := begin
try String.sub Version.version 0 12
with Invalid_argument _ -> Version.version
end;

krmllib_dir := krml_home ^^ "krmllib";
Expand Down Expand Up @@ -250,16 +248,13 @@ let detect_fstar () =
KPrint.bprintf "%sfstar lib converted to windows path:%s %s\n" Ansi.underline Ansi.reset !fstar_lib
end;

if try Sys.is_directory (!fstar_home ^^ ".git") with Sys_error _ -> false then begin
let cwd = Sys.getcwd () in
Sys.chdir !fstar_home;
let branch = read_one_line "git" [| "rev-parse"; "--abbrev-ref"; "HEAD" |] in
fstar_rev := String.sub (read_one_line "git" [| "rev-parse"; "HEAD" |]) 0 8;
let color = if branch = "master" then Ansi.green else Ansi.orange in
if not !Options.silent then
KPrint.bprintf "fstar is on %sbranch %s%s\n" color branch Ansi.reset;
Sys.chdir cwd
end;
(* As fstar.exe path is known, use fstar.exe --version flag *)
let fstar_version_output = Process.read_stdout !fstar [| "--version" |] in
(* fstar.exe --version currently yields a few lines,
one is of the form commit=<git revision> *)
fstar_rev := List.hd (KList.filter_map
(fun s -> if KString.starts_with s "commit=" then Some (String.sub s (String.length "commit=") 12) else None)
fstar_version_output);

let fstar_includes = List.map expand_prefixes !Options.includes in
fstar_options := [
Expand Down
Loading