Some misc. chores

.ocamlformat

@@ -0,0 +1,3 @@
+profile = conventional
+version = 0.24.1
+ocaml-version = 4.08

CHANGES.md

@@ -1,9 +1,15 @@
 unreleased
 ----------
 
+- Bump to OCaml 4.08 and remove dependencies on result and rresult (@MisterDA #106)
+- Wrap libraries:
+  + `Dockerfile_gen` from the `dockerfile-cmd` package becomes `Dockerfile_cmd.Gen`;
+  + `Dockerfile_distro`, `Dockerfile_linux`, `Dockerfile_windows` from the
+    `dockerfile_opam` package respectively become `Dockerfile_opam.Distro`,
+    `Dockerfile_opam.Linux`, `Dockerfile_opam.Windows`. (@MisterDA #106)
+- Generate opam images using BuildKit 1.4 syntax for Dockerfiles. (@MisterDA #105)
 - Support BuildKit 1.4 syntax of here-documents in `COPY` instructions. (@MisterDA #99)
 - Support BuildKit 1.4 `--link` flag in `ADD` and `COPY` instructions. (@MisterDA #99)
-- Generate opam images using BuildKit 1.4 syntax for Dockerfiles. (@MisterDA #105)
 
 v8.0.0 2022-07-27 Sydney
 ------------------------

dockerfile-cmd.opam

@@ -1,32 +1,62 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-synopsis: "Dockerfile eDSL - generation support"
+synopsis: "Dockerfile eDSL -- generation support"
 description: """
 This library provides a typed OCaml interface to generating Dockerfiles
 programmatically without having to resort to lots of shell scripting and
 awk/sed-style assembly.
 
 This sublibrary has support functions for generating arrays of Dockerfiles
-programmatically."""
-maintainer: "Anil Madhavapeddy <[email protected]>"
-authors: "Anil Madhavapeddy <[email protected]>"
+programmatically.
+"""
+maintainer: [
+  "Anil Madhavapeddy <[email protected]>"
+  "Antonin Décimo <[email protected]>"
+  "David Allsopp <[email protected]>"
+  "Kate <[email protected]>"
+  "Thomas Leonard <[email protected]>"
+  "Tim McGilchrist <[email protected]>"
+]
+authors: [
+  "Anil Madhavapeddy"
+  "Anton Kochkov"
+  "Antonin Décimo"
+  "David Allsopp"
+  "Ewan Mellor"
+  "Kate Deplaix"
+  "Louis Gesbert"
+  "Mark Elvers"
+  "Thomas Leonard"
+  "Tim McGilchrist"
+]
 license: "ISC"
 tags: ["org:mirage" "org:ocamllabs"]
 homepage: "https://github.com/ocurrent/ocaml-dockerfile"
-doc: "https://ocurrent.github.io/ocaml-dockerfile/doc"
+doc: "https://ocurrent.github.io/ocaml-dockerfile/doc/dockerfile-cmd/"
 bug-reports: "https://github.com/ocurrent/ocaml-dockerfile/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune" {>= "2.0.0"}
-  "dockerfile-opam" {= version}
+  "dune" {>= "3.0"}
+  "bos"
   "cmdliner"
-  "fmt"
+  "dockerfile-opam" {= version}
+  "fmt" {>= "0.8.7"}
   "logs"
-  "bos"
-  "result"
   "ppx_sexp_conv" {>= "v0.9.0"}
+  "sexplib"
+  "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocurrent/ocaml-dockerfile.git"

dockerfile-opam.opam

@@ -1,35 +1,61 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Dockerfile eDSL -- opam support"
 description: """
 This library provides a typed OCaml interface to generating Dockerfiles
 programmatically without having to resort to lots of shell scripting and
 awk/sed-style assembly.
 
-The opam subpackage provides opam and Linux-specific distribution
-support for generating dockerfiles."""
-maintainer: "Anil Madhavapeddy <[email protected]>"
-authors: [
+The opam subpackage provides opam and Linux-specific distribution support
+for generating dockerfiles.
+"""
+maintainer: [
   "Anil Madhavapeddy <[email protected]>"
   "Antonin Décimo <[email protected]>"
+  "David Allsopp <[email protected]>"
+  "Kate <[email protected]>"
+  "Thomas Leonard <[email protected]>"
+  "Tim McGilchrist <[email protected]>"
+]
+authors: [
+  "Anil Madhavapeddy"
+  "Anton Kochkov"
+  "Antonin Décimo"
+  "David Allsopp"
+  "Ewan Mellor"
+  "Kate Deplaix"
+  "Louis Gesbert"
+  "Mark Elvers"
+  "Thomas Leonard"
+  "Tim McGilchrist"
 ]
 license: "ISC"
 tags: ["org:mirage" "org:ocamllabs"]
 homepage: "https://github.com/ocurrent/ocaml-dockerfile"
-doc: "https://ocurrent.github.io/ocaml-dockerfile/doc"
+doc: "https://ocurrent.github.io/ocaml-dockerfile/doc/dockerfile-opam/"
 bug-reports: "https://github.com/ocurrent/ocaml-dockerfile/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune" {>= "2.0.0"}
-  "dockerfile" {= version}
-  "ocaml-version" {>= "3.5.0"}
-  "cmdliner"
+  "dune" {>= "3.0"}
   "astring"
+  "dockerfile" {= version}
+  "fmt" {>= "0.8.7"}
+  "ocaml-version" {>= "3.2.0"}
   "ppx_sexp_conv" {>= "v0.9.0"}
   "sexplib"
-  "fmt"
+  "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocurrent/ocaml-dockerfile.git"

dockerfile.opam

@@ -1,25 +1,56 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 synopsis: "Dockerfile eDSL in OCaml"
 description: """
 This library provides a typed OCaml interface to generating Dockerfiles
 programmatically without having to resort to lots of shell scripting and
-awk/sed-style assembly."""
-maintainer: "Anil Madhavapeddy <[email protected]>"
-authors: "Anil Madhavapeddy <[email protected]>"
+awk/sed-style assembly.
+"""
+maintainer: [
+  "Anil Madhavapeddy <[email protected]>"
+  "Antonin Décimo <[email protected]>"
+  "David Allsopp <[email protected]>"
+  "Kate <[email protected]>"
+  "Thomas Leonard <[email protected]>"
+  "Tim McGilchrist <[email protected]>"
+]
+authors: [
+  "Anil Madhavapeddy"
+  "Anton Kochkov"
+  "Antonin Décimo"
+  "David Allsopp"
+  "Ewan Mellor"
+  "Kate Deplaix"
+  "Louis Gesbert"
+  "Mark Elvers"
+  "Thomas Leonard"
+  "Tim McGilchrist"
+]
 license: "ISC"
 tags: ["org:mirage" "org:ocamllabs"]
 homepage: "https://github.com/ocurrent/ocaml-dockerfile"
-doc: "https://ocurrent.github.io/ocaml-dockerfile/doc"
+doc: "https://ocurrent.github.io/ocaml-dockerfile/doc/dockerfile/"
 bug-reports: "https://github.com/ocurrent/ocaml-dockerfile/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
-  "dune" {>= "2.0.0"}
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
+  "fmt" {>= "0.8.7"}
   "ppx_sexp_conv" {>= "v0.9.0"}
   "sexplib"
-  "fmt"
+  "odoc" {with-doc}
 ]
 build: [
   ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocurrent/ocaml-dockerfile.git"

dune-project

@@ -1,5 +1,86 @@
-(lang dune 2.0)
-
+(lang dune 3.0)
 (name dockerfile)
 
-(formatting disabled)
+(generate_opam_files true)
+
+(source (github ocurrent/ocaml-dockerfile))
+(license "ISC")
+
+(authors
+ "Anil Madhavapeddy"
+ "Anton Kochkov"
+ "Antonin Décimo"
+ "David Allsopp"
+ "Ewan Mellor"
+ "Kate Deplaix"
+ "Louis Gesbert"
+ "Mark Elvers"
+ "Thomas Leonard"
+ "Tim McGilchrist")
+
+(maintainers
+ "Anil Madhavapeddy <[email protected]>"
+ "Antonin Décimo <[email protected]>"
+ "David Allsopp <[email protected]>"
+ "Kate <[email protected]>"
+ "Thomas Leonard <[email protected]>"
+ "Tim McGilchrist <[email protected]>")
+
+(package
+ (name dockerfile)
+ (synopsis "Dockerfile eDSL in OCaml")
+ (description
+"\| This library provides a typed OCaml interface to generating Dockerfiles
+"\| programmatically without having to resort to lots of shell scripting and
+"\| awk/sed-style assembly.
+ )
+ (depends
+  (ocaml (>= "4.08"))
+  (fmt (>= "0.8.7"))
+  (ppx_sexp_conv (>= "v0.9.0"))
+  sexplib)
+ (documentation "https://ocurrent.github.io/ocaml-dockerfile/doc/dockerfile/")
+ (tags ("org:mirage" "org:ocamllabs")))
+
+(package
+ (name dockerfile-cmd)
+ (synopsis "Dockerfile eDSL -- generation support")
+ (description
+"\| This library provides a typed OCaml interface to generating Dockerfiles
+"\| programmatically without having to resort to lots of shell scripting and
+"\| awk/sed-style assembly.
+"\|
+"\| This sublibrary has support functions for generating arrays of Dockerfiles
+"\| programmatically.
+ )
+ (depends
+  bos
+  cmdliner
+  (dockerfile-opam (= :version))
+  (fmt (>= "0.8.7"))
+  logs
+  (ppx_sexp_conv (>= "v0.9.0"))
+  sexplib)
+ (documentation "https://ocurrent.github.io/ocaml-dockerfile/doc/dockerfile-cmd/")
+ (tags ("org:mirage" "org:ocamllabs")))
+
+(package
+ (name dockerfile-opam)
+ (synopsis "Dockerfile eDSL -- opam support")
+ (description
+"\| This library provides a typed OCaml interface to generating Dockerfiles
+"\| programmatically without having to resort to lots of shell scripting and
+"\| awk/sed-style assembly.
+"\|
+"\| The opam subpackage provides opam and Linux-specific distribution support
+"\| for generating dockerfiles.
+ )
+ (depends
+  astring
+  (dockerfile (= :version))
+  (fmt (>= "0.8.7"))
+  (ocaml-version (>= "3.2.0"))
+  (ppx_sexp_conv (>= "v0.9.0"))
+  sexplib)
+ (documentation "https://ocurrent.github.io/ocaml-dockerfile/doc/dockerfile-opam/")
+ (tags ("org:mirage" "org:ocamllabs")))