diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-01 17:25:44 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-01 17:25:44 +0200 |
| commit | b59b2b182a6832e1b6ebf3cf7ba4fd1943843b74 (patch) | |
| tree | 3fa8c338c917d4f72f3408b6a45cffcc6e1e0f8a /driver | |
| parent | d8ed56833c508b5103a900ef04975013bd9ba77b (diff) | |
| download | compcert-b59b2b182a6832e1b6ebf3cf7ba4fd1943843b74.tar.gz compcert-b59b2b182a6832e1b6ebf3cf7ba4fd1943843b74.zip | |
Removed the version from the compcert.ini file and add it again in a separate file.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/Configuration.ml | 1 | ||||
| -rw-r--r-- | driver/Configuration.mli | 2 | ||||
| -rw-r--r-- | driver/Driver.ml | 7 |
3 files changed, 5 insertions, 5 deletions
diff --git a/driver/Configuration.ml b/driver/Configuration.ml index 70131fc6..64f24820 100644 --- a/driver/Configuration.ml +++ b/driver/Configuration.ml @@ -104,7 +104,6 @@ let advanced_debug = | "false" -> false | v -> bad_config "advanced_debug" [v] -let version = get_config_string "version" type struct_passing_style = | SP_ref_callee (* by reference, callee takes copy *) diff --git a/driver/Configuration.mli b/driver/Configuration.mli index 72810456..f82ce213 100644 --- a/driver/Configuration.mli +++ b/driver/Configuration.mli @@ -36,8 +36,6 @@ val has_standard_headers: bool val advanced_debug: bool (** True if advanced debug is implement for the Target *) -val version: string - (** CompCert version string *) type struct_passing_style = | SP_ref_callee (* by reference, callee takes copy *) diff --git a/driver/Driver.ml b/driver/Driver.ml index 805d5405..402bdb65 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -145,7 +145,7 @@ let parse_c_file sourcename ifile = (* Dump Asm code in binary format for the validator *) -let sdump_magic_number = "CompCertSDUMP" ^ Configuration.version +let sdump_magic_number = "CompCertSDUMP" ^ Version.version let dump_asm asm destfile = let oc = open_out_bin destfile in @@ -387,7 +387,10 @@ let explode_comma_option s = | hd :: tl -> tl let version_string = - "The CompCert C verified compiler, version "^ Configuration.version ^ "\n" + if Version.buildnr <> "" && Version.tag <> "" then + sprintf "The CompCert verified compiler, %s,%s,%s\n" Version.version Version.buildnr Version.tag + else + "The CompCert C verified compiler, version "^ Version.version ^ "\n" let usage_string = version_string ^ |