From 8dff924f4d598da653794e29fb9929017e161aa3 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Wed, 30 Dec 2020 16:38:15 +0100 Subject: ucs: use the version name from dune Signed-off-by: Alban Gruin --- src/dune | 3 +++ src/pages.ml | 2 +- src/ucs.ml | 2 +- src/version.ml | 21 +++++++++++++++++++++ src/version.mli | 18 ++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 src/version.ml create mode 100644 src/version.mli (limited to 'src') diff --git a/src/dune b/src/dune index 14060f1..d6f0b6b 100644 --- a/src/dune +++ b/src/dune @@ -1,9 +1,12 @@ (executable (name ucs) + (package ucs) + (public_name ucs) (libraries astring calendar cmdliner cohttp-lwt-unix + dune-build-info ezjsonm json-data-encoding lwt.unix diff --git a/src/pages.ml b/src/pages.ml index d343ef2..a031599 100644 --- a/src/pages.ml +++ b/src/pages.ml @@ -31,7 +31,7 @@ let common content =
|} ^ content ^ {|
diff --git a/src/ucs.ml b/src/ucs.ml index 84d5988..9950d8c 100644 --- a/src/ucs.ml +++ b/src/ucs.ml @@ -65,6 +65,6 @@ let () = calendar to ICS files, on the fly." and exits = Term.default_exits in Term.(const run $ base_url $ celcat_url $ port $ socket), - Term.info "ucs" ~version:"0.1.1" ~doc ~exits in + Term.info "ucs" ~version:(Version.version ()) ~doc ~exits in CalendarLib.Time_Zone.(change Local); Term.(exit @@ eval cmd) diff --git a/src/version.ml b/src/version.ml new file mode 100644 index 0000000..033b60f --- /dev/null +++ b/src/version.ml @@ -0,0 +1,21 @@ +(* + * Copyright (C) 2020 Alban Gruin + * + * ucs is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * ucs is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with ucs. If not, see . + *) + +let version () = + match Build_info.V1.version () with + | Some v -> Build_info.V1.Version.to_string v + | None -> "dev" diff --git a/src/version.mli b/src/version.mli new file mode 100644 index 0000000..a37df45 --- /dev/null +++ b/src/version.mli @@ -0,0 +1,18 @@ +(* + * Copyright (C) 2020 Alban Gruin + * + * ucs is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * ucs is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with ucs. If not, see . + *) + +val version : unit -> string -- cgit v1.2.1