aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Gruin2020-12-30 16:38:15 +0100
committerAlban Gruin2020-12-30 17:40:39 +0100
commit8dff924f4d598da653794e29fb9929017e161aa3 (patch)
treee88e0564bc41662ebb01c334e189346bea95c580
parentf6ee00c1b33b35f6adcd8c27cc4013636fd202a4 (diff)
ucs: use the version name from dune
Signed-off-by: Alban Gruin <alban at pa1ch dot fr>
-rw-r--r--dune-project4
-rw-r--r--src/dune3
-rw-r--r--src/pages.ml2
-rw-r--r--src/ucs.ml2
-rw-r--r--src/version.ml21
-rw-r--r--src/version.mli18
6 files changed, 47 insertions, 3 deletions
diff --git a/dune-project b/dune-project
index 170a0b0..9fe70b1 100644
--- a/dune-project
+++ b/dune-project
@@ -1,3 +1,5 @@
(lang dune 2.0)
(name ucs)
-(version 0.1.1)
+
+(package
+ (name ucs))
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 =
<article>|} ^ content ^
{| </article>
<footer>
- <p>(c) 2020 &ndash; Alban Gruin &ndash; µCS 0.1.1 « CANIS MINOR »</p>
+ <p>(c) 2020 &ndash; Alban Gruin &ndash; µCS |} ^ Version.version () ^ {| « CANIS MINOR »</p>
</footer>
</body>
</html>
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 <http://www.gnu.org/licenses/>.
+ *)
+
+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 <http://www.gnu.org/licenses/>.
+ *)
+
+val version : unit -> string