diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2019-05-06 18:54:31 +0200 |
|---|---|---|
| committer | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2019-05-10 14:44:26 +0200 |
| commit | 1e821bc1f1fb7a6b73ff1468b8b34f61b78cf304 (patch) | |
| tree | a2d328363060dbf84fc264f9c9a22d5674ae420d | |
| parent | df81fb38c941852919246371840c5fdb003ad0fb (diff) | |
| download | compcert-1e821bc1f1fb7a6b73ff1468b8b34f61b78cf304.tar.gz compcert-1e821bc1f1fb7a6b73ff1468b8b34f61b78cf304.zip | |
Change to AbsInt version string.
The AbsInt build number no longer contains "release", so it must
be printed additionally.
| -rw-r--r-- | backend/JsonAST.ml | 2 | ||||
| -rw-r--r-- | backend/PrintAsmaux.ml | 2 | ||||
| -rw-r--r-- | cparser/Diagnostics.ml | 2 | ||||
| -rw-r--r-- | debug/Dwarfgen.ml | 2 | ||||
| -rw-r--r-- | driver/CommonOptions.ml | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/backend/JsonAST.ml b/backend/JsonAST.ml index 599c6ecb..4e57106f 100644 --- a/backend/JsonAST.ml +++ b/backend/JsonAST.ml @@ -123,7 +123,7 @@ let pp_mnemonics pp mnemonic_names = let new_line pp () = pp_print_string pp "\n" in pp_print_list ~pp_sep:new_line pp_print_string pp mnemonic_names -let jdump_magic_number = "CompCertJDUMP" ^ Version.version +let jdump_magic_number = "CompCertJDUMPRelease: " ^ Version.version let pp_ast pp pp_inst ast sourcename = let get_args () = diff --git a/backend/PrintAsmaux.ml b/backend/PrintAsmaux.ml index 6f293bf4..0fd164b0 100644 --- a/backend/PrintAsmaux.ml +++ b/backend/PrintAsmaux.ml @@ -289,7 +289,7 @@ let print_inline_asm print_preg oc txt sg args res = let print_version_and_options oc comment = let version_string = if Version.buildnr <> "" && Version.tag <> "" then - sprintf "%s, Build: %s, Tag: %s" Version.version Version.buildnr Version.tag + sprintf "Release: %s, Build: %s, Tag: %s" Version.version Version.buildnr Version.tag else Version.version in fprintf oc "%s File generated by CompCert %s\n" comment version_string; diff --git a/cparser/Diagnostics.ml b/cparser/Diagnostics.ml index 2b8a3eb4..2eaf6436 100644 --- a/cparser/Diagnostics.ml +++ b/cparser/Diagnostics.ml @@ -473,7 +473,7 @@ let raise_on_errors () = let crash exn = if Version.buildnr <> "" && Version.tag <> "" then begin let backtrace = Printexc.get_backtrace () in - eprintf "%tThis is CompCert, %s, Build:%s, Tag:%s%t\n" + eprintf "%tThis is CompCert, Release %s, Build:%s, Tag:%s%t\n" bc Version.version Version.buildnr Version.tag rsc; eprintf "Backtrace (please include this in your support request):\n%s" backtrace; diff --git a/debug/Dwarfgen.ml b/debug/Dwarfgen.ml index 50063df8..0004e901 100644 --- a/debug/Dwarfgen.ml +++ b/debug/Dwarfgen.ml @@ -544,7 +544,7 @@ let diab_file_loc sec (f,l) = let prod_name = let version_string = if Version.buildnr <> "" && Version.tag <> "" then - Printf.sprintf "%s, Build: %s, Tag: %s" Version.version Version.buildnr Version.tag + Printf.sprintf "Release: %s, Build: %s, Tag: %s" Version.version Version.buildnr Version.tag else Version.version in Printf.sprintf "AbsInt Angewandte Informatik GmbH:CompCert Version %s:(%s,%s,%s,%s)" diff --git a/driver/CommonOptions.ml b/driver/CommonOptions.ml index 58dd4007..c151ecf2 100644 --- a/driver/CommonOptions.ml +++ b/driver/CommonOptions.ml @@ -14,9 +14,9 @@ open Clflags open Commandline (* The version string for [tool_name] *) -let version_string tool_name= +let version_string tool_name = if Version.buildnr <> "" && Version.tag <> "" then - Printf.sprintf "The CompCert %s, %s, Build: %s, Tag: %s\n" tool_name Version.version Version.buildnr Version.tag + Printf.sprintf "The CompCert %s, Release: %s, Build: %s, Tag: %s\n" tool_name Version.version Version.buildnr Version.tag else Printf.sprintf "The CompCert %s, version %s\n" tool_name Version.version |