Skip to content

Commit 1afaf38

Browse files
committed
Merge tag 'v0.9.8' into duniverse-v0.9.8
Distribution v0.9.8
2 parents fa124fd + 7908d27 commit 1afaf38

File tree

14 files changed

+122
-41
lines changed

14 files changed

+122
-41
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
_build
2+
_b0
23
tmp
3-
*~
4-
\.\#*
5-
\#*#
64
*.install

.merlin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PKG bytes cmdliner
1+
PKG b0.kit cmdliner
22
S src
33
S test
4-
B _build/**
4+
B _b0

B0.ml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
open B0_kit.V000
2+
open B00_std
3+
4+
(* OCaml library names *)
5+
6+
let uuidm = B0_ocaml.libname "uuidm"
7+
let cmdliner = B0_ocaml.libname "cmdliner"
8+
9+
(* Libraries *)
10+
11+
let uuidm_lib =
12+
let srcs = Fpath.[`Dir (v "src")] in
13+
let requires = [] in
14+
B0_ocaml.lib uuidm ~doc:"The uuidm library" ~srcs ~requires
15+
16+
(* Tests *)
17+
18+
let test_exe src ~doc =
19+
let src = Fpath.v src in
20+
let srcs = Fpath.[`File src] in
21+
let meta = B0_meta.(empty |> tag test) in
22+
let requires = [ uuidm ] in
23+
B0_ocaml.exe (Fpath.basename ~no_ext:true src) ~srcs ~doc ~meta ~requires
24+
25+
let test = test_exe "test/test.ml" ~doc:"Test suite"
26+
let perf = test_exe "test/perf.ml" ~doc:"Test performance"
27+
28+
let uuidtrip =
29+
let doc = "Generates universally unique identifiers (UUIDs)" in
30+
let srcs = Fpath.[`File (v "test/uuidtrip.ml")] in
31+
let requires = [uuidm; cmdliner] in
32+
B0_ocaml.exe "uuidtrip" ~doc ~srcs ~requires
33+
34+
(* Packs *)
35+
36+
let default =
37+
let meta =
38+
let open B0_meta in
39+
empty
40+
|> tag B0_opam.tag
41+
|> add authors ["The uuidm programmers"]
42+
|> add maintainers ["Daniel Bünzli <daniel.buenzl [email protected]>"]
43+
|> add homepage "https://erratique.ch/software/uuidm"
44+
|> add online_doc "https://erratique.ch/software/uuidm/doc/"
45+
|> add licenses ["ISC"]
46+
|> add repo "git+https://erratique.ch/repos/uuidm.git"
47+
|> add issues "https://github.com/dbuenzli/uuidm/issues"
48+
|> add description_tags
49+
["uuid"; "codec"; "org:erratique"]
50+
|> add B0_opam.Meta.depopts ["cmdliner", ""]
51+
|> add B0_opam.Meta.conflicts
52+
[ "cmdliner", {|< "1.1.0"|}]
53+
|> add B0_opam.Meta.depends
54+
[ "ocaml", {|>= "4.08.0"|};
55+
"ocamlfind", {|build|};
56+
"ocamlbuild", {|build|};
57+
"topkg", {|build & >= "1.0.3"|};
58+
]
59+
|> add B0_opam.Meta.build
60+
{|[["ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"
61+
"--with-cmdliner" "%{cmdliner:installed}%"]]|}
62+
in
63+
B0_pack.v "default" ~doc:"uuidm package" ~meta ~locked:true @@
64+
B0_unit.list ()

BRZO

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(srcs-x pkg)

CHANGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
v0.9.8 2022-02-09 La Forclaz (VS)
2+
---------------------------------
3+
4+
- Add deprecation warnings on what is already deprecated.
5+
- Require OCaml 4.08 and support 5.00 (Thanks to Kate @ki-ty-kate
6+
for the patch).
7+
8+
19
v0.9.7 2019-03-08 La Forclaz (VS)
210
---------------------------------
311

@@ -7,6 +15,7 @@ v0.9.7 2019-03-08 La Forclaz (VS)
715
- Add `Uuidm.{to,of}_mixed_endian_bytes`. Support for UEFI and
816
Microsoft's binary serialization of UUIDs.
917

18+
1019
v0.9.6 2016-08-12 Zagreb
1120
------------------------
1221

@@ -21,6 +30,7 @@ v0.9.6 2016-08-12 Zagreb
2130
options which have to be written with a double dash. Binary output
2231
no longer adds an ending newline.
2332

33+
2434
v0.9.5 2012-08-05 Lausanne
2535
--------------------------
2636

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2008 Daniel C. Bünzli
1+
Copyright (c) 2008 The uuidm programmers
22

33
Permission to use, copy, modify, and/or distribute this software for any
44
purpose with or without fee is hereby granted, provided that the above

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Uuidm — Universally unique identifiers (UUIDs) for OCaml
2-
-------------------------------------------------------------------------------
2+
========================================================
33
%%VERSION%%
44

55
Uuidm is an OCaml module implementing 128 bits universally unique
@@ -10,9 +10,9 @@ Uuidm has no dependency and is distributed under the ISC license.
1010

1111
[rfc4122]: http://tools.ietf.org/html/rfc4122
1212

13-
Homepage: http://erratique.ch/software/uuidm
13+
Homepage: <http://erratique.ch/software/uuidm>
1414

15-
## Installation
15+
# Installation
1616

1717
Uuidm can be installed with `opam`:
1818

@@ -22,15 +22,16 @@ If you don't use `opam` consult the [`opam`](opam) file for build
2222
instructions.
2323

2424

25-
## Documentation
25+
# Documentation
2626

2727
The documentation and API reference is automatically generated by
28-
from the source interfaces. It can be consulted [online][doc].
28+
from the source interfaces. It can be consulted [online][doc] or via
29+
`odig doc uuidm`.
2930

30-
[doc]: http://erratique.ch/software/uuidm/doc/Uuidm
31+
[doc]: http://erratique.ch/software/uuidm/doc/
3132

3233

33-
## Sample programs
34+
# Sample programs
3435

3536
If you installed Uuidm with `opam`, it installed the `uuidtrip` binary
3637
that output UUIDs; invoke with `-help` for more information.

_tags

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
true : bin_annot, safe_string, package(bytes)
1+
true : bin_annot, safe_string
2+
3+
<_b0> : -traverse
24
<src> : include
35
<test> : include
46
<test/uuidtrip.*> : package(cmdliner)

doc/api.odocl

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/index.mld

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{0 Uuidm {%html: <span class="version">%%VERSION%%</span>%}}
2+
3+
Uuidm is an OCaml module implementing 128 bits universally unique
4+
identifiers version 3, 5 (named based with MD5, SHA-1 hashing) and 4
5+
(random based) according to {{:http://tools.ietf.org/html/rfc4122}
6+
RFC 4122}.
7+
8+
{!modules:
9+
Uuidm
10+
}

0 commit comments

Comments
 (0)