Fix display of version (#336)

This PR fixes the display of Dedukti version (#300) when called in command line (for instance dk --version).
* fix of modules in dune file (add misc/gen_version.ml)
* remove variable version in subcommands because it is useless
---------
Co-authored-by: Frédéric Blanqui <[email protected]>

Author: Alidra

commands/dkcheck.ml

@@ -136,4 +136,4 @@ let cmd =
       `P "Report bugs to <[email protected]>.";
     ]
   in
-  Cmd.v (Cmd.info "check" ~version:"%%VERSION%%" ~doc ~man) cmd_t
+  Cmd.v (Cmd.info "check" ~doc ~man) cmd_t

commands/dkdep.ml

@@ -103,4 +103,4 @@ let cmd_t = Term.(const dkdep $ Config.t $ ignore $ output $ sort $ files)
 
 let cmd =
   let doc = "Dependency list generator for Dedukti files" in
-  Cmd.(v (info "dep" ~version:"%%VERSION%%" ~doc) cmd_t)
+  Cmd.(v (info "dep" ~doc) cmd_t)

commands/dkmeta.ml

@@ -115,4 +115,4 @@ let cmd_t =
 
 let cmd =
   let doc = "Transform dk signatures using dk." in
-  Cmdliner.Cmd.(v (info "meta" ~doc ~version:"%%VERSION%%") cmd_t)
+  Cmdliner.Cmd.(v (info "meta" ~doc) cmd_t)

commands/dkpretty.ml

@@ -28,4 +28,4 @@ let cmd_t = Term.(const beautify $ Config.t $ files)
 let cmd =
   let doc = "Pretty print Dedukti files" in
   let man = [] in
-  Cmd.(v (info "beautify" ~version:"%%VERSION%%" ~doc ~man) cmd_t)
+  Cmd.(v (info "beautify" ~doc ~man) cmd_t)

commands/dkprune.ml

@@ -303,4 +303,4 @@ let cmd_t = Cmdliner.Term.(const prune $ Config.t $ log $ output $ files)
 
 let cmd =
   let doc = "Compute dependencies of a set of Dedukti files." in
-  Cmdliner.Cmd.(v (info "prune" ~version:"%%VERSION%%" ~doc) cmd_t)
+  Cmdliner.Cmd.(v (info "prune" ~doc) cmd_t)

commands/dktop.ml

@@ -13,4 +13,4 @@ let cmd_t = Cmdliner.Term.(const top $ Config.t)
 
 let cmd =
   let doc = "Run a read-eval-print-loop using dk-check." in
-  Cmdliner.Cmd.(v (info "top" ~doc ~version:"%%VERSION%%") cmd_t)
+  Cmdliner.Cmd.(v (info "top" ~doc) cmd_t)

commands/dune

@@ -1,6 +1,13 @@
+(rule
+ (targets version.ml)
+ (action
+  (with-stdout-to version.ml
+    (run ocaml -I +unix unix.cma %{dep:../misc/gen_version.ml})))
+ (mode fallback))
+
 (executable
  (name main)
- (modules main dkcheck dkdep dkpretty dkprune dkmeta dktop config)
+ (modules main dkcheck dkdep dkpretty dkprune dkmeta dktop config version)
  (public_name dk)
  (package dedukti)
  (libraries cmdliner kernel parsers api))

commands/main.ml

@@ -13,7 +13,8 @@ let default_i =
          Dedukti language.";
     ]
   in
-  Cmd.info "dk" ~version:"%%VERSION%%" ~doc ~sdocs ~man
+  let version = Version.version in
+  Cmd.info "dk" ~version ~doc ~sdocs ~man
 
 let cmds =
   [Dkcheck.cmd; Dkdep.cmd; Dkpretty.cmd; Dkprune.cmd; Dkmeta.cmd; Dktop.cmd]

misc/gen_version.ml

@@ -0,0 +1,20 @@
+let version =
+  (* Trick to check whether the watermark has been substituted. *)
+  if "%%VERSION%%" <> "%%" ^ "VERSION%%" then "%%VERSION%%" else
+  (* If not, we fallback to git version. *)
+  let cmd = "git describe --dirty --always" in
+  let (oc, ic, ec) = Unix.open_process_full cmd (Unix.environment ()) in
+  let version =
+    try Printf.sprintf "dev-%s" (input_line oc)
+    with End_of_file -> "unknown"
+  in
+  match Unix.close_process_full (oc, ic, ec) with
+  | Unix.WEXITED(0) -> version
+  | _               -> "unknown"
+
+let _ =
+  let line fmt = Format.printf (fmt ^^ "@.") in
+  line "(** Version informations. *)";
+  line "";
+  line "(** [version] gives a version description. *)";
+  line "let version : string = %S" version