Add support for opam x-maintenance-intent in dune-project

Author: art-w

src/dune_config_file/dune_config_file.ml

@@ -20,21 +20,27 @@ module Dune_config = struct
     type t =
       { authors : string list option
       ; maintainers : string list option
+      ; maintenance_intent : string list option
       ; license : string list option
       }
 
     let decode =
       fields
         (let+ authors = field_o "authors" (repeat string)
          and+ maintainers = field_o "maintainers" (repeat string)
+         and+ maintenance_intent = field_o "maintenance_intent" (repeat string)
          and+ license = field_o "license" (repeat string) in
-         { authors; maintainers; license })
+         { authors; maintainers; maintenance_intent; license })
     ;;
 
     let to_dyn t =
       let f = Dyn.(option (list string)) in
       Dyn.record
-        [ "authors", f t.authors; "maintainers", f t.maintainers; "license", f t.license ]
+        [ "authors", f t.authors
+        ; "maintainers", f t.maintainers
+        ; "maintenance_intent", f t.maintenance_intent
+        ; "license", f t.license
+        ]
     ;;
   end
 
@@ -359,6 +365,7 @@ module Dune_config = struct
     ; project_defaults =
         { authors = Some [ "Author Name <[email protected]>" ]
         ; maintainers = Some [ "Maintainer Name <[email protected]>" ]
+        ; maintenance_intent = Some [ "(latest)" ]
         ; license = Some [ "LICENSE" ]
         }
     ; experimental = []

src/dune_config_file/dune_config_file.mli

@@ -8,6 +8,7 @@ module Dune_config : sig
     type t =
       { authors : string list option
       ; maintainers : string list option
+      ; maintenance_intent : string list option
       ; license : string list option
       }
 

src/dune_lang/package_info.ml

@@ -9,6 +9,7 @@ type t =
   ; bug_reports : string option
   ; documentation : string option
   ; maintainers : string list option
+  ; maintenance_intent : string list option
   }
 
 let source t = t.source
@@ -29,6 +30,7 @@ let bug_reports t =
 
 let documentation t = t.documentation
 let maintainers t = t.maintainers
+let maintenance_intent t = t.maintenance_intent
 
 let empty =
   { source = None
@@ -38,6 +40,7 @@ let empty =
   ; bug_reports = None
   ; documentation = None
   ; maintainers = None
+  ; maintenance_intent = None
   }
 ;;
 
@@ -54,10 +57,20 @@ let example ~authors ~maintainers ~license =
       (* homepage and bug_reports are inferred from the source *)
   ; homepage = None
   ; bug_reports = None
+  ; maintenance_intent = None
   }
 ;;
 
-let to_dyn { source; license; authors; homepage; bug_reports; documentation; maintainers }
+let to_dyn
+  { source
+  ; license
+  ; authors
+  ; homepage
+  ; bug_reports
+  ; documentation
+  ; maintainers
+  ; maintenance_intent
+  }
   =
   let open Dyn in
   record
@@ -67,18 +80,28 @@ let to_dyn { source; license; authors; homepage; bug_reports; documentation; mai
     ; "documentation", (option string) documentation
     ; "bug_reports", (option string) bug_reports
     ; "maintainers", option (list string) maintainers
+    ; "maintenance_intent", option (list string) maintenance_intent
     ; "authors", option (list string) authors
     ]
 ;;
 
 let encode_fields
-  { source; authors; license; homepage; documentation; bug_reports; maintainers }
+  { source
+  ; authors
+  ; license
+  ; homepage
+  ; documentation
+  ; bug_reports
+  ; maintainers
+  ; maintenance_intent
+  }
   =
   let open Encoder in
   record_fields
     [ field_o "source" Source_kind.encode source
     ; field_l "authors" string (Option.value ~default:[] authors)
     ; field_l "maintainers" string (Option.value ~default:[] maintainers)
+    ; field_l "maintenance_intent" string (Option.value ~default:[] maintenance_intent)
     ; field_l "license" string (Option.value ~default:[] license)
     ; field_o "homepage" string homepage
     ; field_o "documentation" string documentation
@@ -109,8 +132,18 @@ let decode ?since () =
     field_o "bug_reports" (Syntax.since Stanza.syntax (v (1, 10)) >>> string)
   and+ maintainers =
     field_o "maintainers" (Syntax.since Stanza.syntax (v (1, 10)) >>> repeat string)
+  and+ maintenance_intent =
+    field_o "maintenance_intent" (Syntax.since Stanza.syntax (v (3, 18)) >>> repeat string)
   in
-  { source; authors; license; homepage; documentation; bug_reports; maintainers }
+  { source
+  ; authors
+  ; license
+  ; homepage
+  ; documentation
+  ; bug_reports
+  ; maintainers
+  ; maintenance_intent
+  }
 ;;
 
 let superpose t1 t2 =
@@ -126,9 +159,27 @@ let superpose t1 t2 =
   ; documentation = f t1.documentation t2.documentation
   ; bug_reports = f t1.bug_reports t2.bug_reports
   ; maintainers = f t1.maintainers t2.maintainers
+  ; maintenance_intent = f t1.maintenance_intent t2.maintenance_intent
   }
 ;;
 
-let create ~maintainers ~authors ~homepage ~bug_reports ~documentation ~license ~source =
-  { maintainers; authors; homepage; bug_reports; documentation; license; source }
+let create
+  ~maintainers
+  ~maintenance_intent
+  ~authors
+  ~homepage
+  ~bug_reports
+  ~documentation
+  ~license
+  ~source
+  =
+  { maintainers
+  ; authors
+  ; homepage
+  ; bug_reports
+  ; documentation
+  ; license
+  ; source
+  ; maintenance_intent
+  }
 ;;

src/dune_lang/package_info.mli

@@ -7,6 +7,7 @@ val homepage : t -> string option
 val bug_reports : t -> string option
 val documentation : t -> string option
 val maintainers : t -> string list option
+val maintenance_intent : t -> string list option
 
 (** example package info (used for project initialization ) *)
 val example
@@ -28,6 +29,7 @@ val superpose : t -> t -> t
 
 val create
   :  maintainers:string list option
+  -> maintenance_intent:string list option
   -> authors:string list option
   -> homepage:string option
   -> bug_reports:string option

src/dune_pkg/opam_file.ml

@@ -260,6 +260,7 @@ let load_opam_file_with_contents ~contents:opam_file_string file name =
   let info =
     Dune_lang.Package_info.create
       ~maintainers:(get_many "maintainer")
+      ~maintenance_intent:(get_many "x-maintenance-intent")
       ~authors:(get_many "authors")
       ~homepage:(get_one "homepage")
       ~bug_reports:(get_one "bug-reports")

src/dune_rules/opam_create.ml

@@ -228,6 +228,7 @@ let opam_fields project (package : Package.t) =
   in
   let list_fields =
     [ "maintainer", Package_info.maintainers info
+    ; "x-maintenance-intent", Package_info.maintenance_intent info
     ; "authors", Package_info.authors info
     ; ( "license"
       , match Package_info.license info with