diff options
-rw-r--r-- | src/defaults.ml | 2 | ||||
-rw-r--r-- | src/defaults.mli | 1 | ||||
-rw-r--r-- | src/version.ml | 13 | ||||
-rw-r--r-- | src/version.mli | 4 | ||||
-rw-r--r-- | src/vyconfd.ml | 2 |
5 files changed, 18 insertions, 4 deletions
diff --git a/src/defaults.ml b/src/defaults.ml index be77e89..ec4772f 100644 --- a/src/defaults.ml +++ b/src/defaults.ml @@ -1,13 +1,11 @@ type vyconf_defaults = { config_file: string; - version: string; pid_file: string; socket: string; } let defaults = { config_file = "/etc/vyconfd.conf"; - version = "0.0.1"; pid_file = "/var/run/vyconfd.pid"; socket = "/var/run/vyconfd.sock"; } diff --git a/src/defaults.mli b/src/defaults.mli index e5305b5..792bd22 100644 --- a/src/defaults.mli +++ b/src/defaults.mli @@ -1,6 +1,5 @@ type vyconf_defaults = { config_file: string; - version: string; pid_file: string; socket: string; } diff --git a/src/version.ml b/src/version.ml new file mode 100644 index 0000000..5f9cf6c --- /dev/null +++ b/src/version.ml @@ -0,0 +1,13 @@ +let version = "0.0.1" + +let copyright = "2016, VyOS maintainers and contributors" + +let license = "LGPL version 2 or later with OCaml linking exception" + +let version_info () = + let tmpl = + "VyConf version: %s\n" ^^ + "Copyright %s\n\n" ^^ + "This program is free software, you can use, modify, and redistribute it\n" ^^ + "under the terms of %s\n" + in Printf.sprintf tmpl version copyright license diff --git a/src/version.mli b/src/version.mli new file mode 100644 index 0000000..b4815ca --- /dev/null +++ b/src/version.mli @@ -0,0 +1,4 @@ +val version : string +val copyright : string +val license : string +val version_info : unit -> string diff --git a/src/vyconfd.ml b/src/vyconfd.ml index 120990f..e33f8c7 100644 --- a/src/vyconfd.ml +++ b/src/vyconfd.ml @@ -20,7 +20,7 @@ let args = [ (Printf.sprintf "<string> Configuration file, default is %s" defaults.config_file)); ("--log-file", Arg.String (fun s -> log_file := Some s), "<string> Log file"); - ("--version", Arg.Unit (fun () -> Printf.printf "VyConf version: %s\n" defaults.version; exit 0), "Print version and exit") + ("--version", Arg.Unit (fun () -> print_endline @@ Version.version_info (); exit 0), "Print version and exit") ] let usage = "Usage: " ^ Sys.argv.(0) ^ " [options]" |