No x-maintenance-intent in opam files for dune<3.18

art-w · Leonidas-from-XIV · commit 263bf0b39552 · 2025-01-15T14:34:46.000+01:00
Signed-off-by: ArthurW &lt;arthur@tarides.com&gt;
Signed-off-by: Marek Kubica &lt;marek@tarides.com&gt;
diff --git a/otherlibs/dune-site/test/run.t b/otherlibs/dune-site/test/run.t
@@ -169,7 +169,6 @@ Test with an opam like installation
     ]
     ["dune" "install" "-p" name "--create-install-files" name]
   ]
-  x-maintenance-intent: ["(latest)"]
 
   $ dune build -p a --promote-install-files=false @install
 
diff --git a/otherlibs/dune-site/test/run_2_9.t b/otherlibs/dune-site/test/run_2_9.t
@@ -157,7 +157,6 @@ Test with an opam like installation
     ]
     ["dune" "install" "-p" name "--create-install-files" name]
   ]
-  x-maintenance-intent: ["(latest)"]
 
   $ dune build -p a --promote-install-files="false" @install
 
diff --git a/src/dune_rules/opam_create.ml b/src/dune_rules/opam_create.ml
@@ -196,6 +196,15 @@ let insert_odoc_dep depends =
   loop [] depends
 ;;
 
+let maintenance_intent dune_version info =
+  if dune_version < (3, 18)
+  then None
+  else (
+    match Package_info.maintenance_intent info with
+    | None -> Some [ "(latest)" ]
+    | x -> x)
+;;
+
 let opam_fields project (package : Package.t) =
   let dune_version = Dune_project.dune_version project in
   let package_name = Package.name package in
@@ -228,10 +237,7 @@ let opam_fields project (package : Package.t) =
   in
   let list_fields =
     [ "maintainer", Package_info.maintainers info
-    ; ( "x-maintenance-intent"
-      , match Package_info.maintenance_intent info with
-        | None -> Some [ "(latest)" ]
-        | x -> x )
+    ; "x-maintenance-intent", maintenance_intent dune_version info
     ; "authors", Package_info.authors info
     ; ( "license"
       , match Package_info.license info with
diff --git a/test/blackbox-tests/test-cases/describe/describe.t b/test/blackbox-tests/test-cases/describe/describe.t
@@ -1373,5 +1373,4 @@ opam file listing
       \"@doc\" {with-doc}
     ]
   ]
-  x-maintenance-intent: [\"(latest)\"]
   "))
diff --git a/test/blackbox-tests/test-cases/dune-package.t/run.t b/test/blackbox-tests/test-cases/dune-package.t/run.t
@@ -177,7 +177,6 @@ Install as opam does
       "@doc" {with-doc}
     ]
   ]
-  x-maintenance-intent: ["(latest)"]
 
   $ (cd a; "dune" "build" "-p" a "@install")
 
diff --git a/test/blackbox-tests/test-cases/dune-project-meta/basic-generate.t b/test/blackbox-tests/test-cases/dune-project-meta/basic-generate.t
@@ -4,21 +4,19 @@ Simple test
 The `dune build` should generate the opam file
 
   $ cat >dune-project <<EOF
-  > (lang dune 3.18)
+  > (lang dune 1.10)
   > (version 1.0.0)
   > (name cohttp)
   > (source (github mirage/ocaml-cohttp))
   > (license ISC)
   > (authors "Anil Madhavapeddy" "Rudi Grinberg")
-  > (maintenance_intent "(latest)")
   > 
   > (generate_opam_files true)
   > 
   > (package
   >  (name cohttp)
   >  (synopsis "An OCaml library for HTTP clients and servers")
   >  (description "A longer description")
-  >  (allow_empty)
   >  (depends
   >   (alcotest :with-test)
   >   (dune (and :build (> 1.5)))
@@ -35,7 +33,6 @@ The `dune build` should generate the opam file
   > A really long multi line description that spans across lines to
   > make sure that the rendering of long strings stays compatible.
   > ")
-  >  (allow_empty)
   >  (depends
   >   (cohttp (>= 1.0.2))
   >   (conduit-async (>= 1.0.3))
@@ -49,7 +46,6 @@ The `dune build` should generate the opam file
   > A really long description that is supposed to start with a
   > newline since it doesn't escape the line break.
   > ")
-  >  (allow_empty)
   >  (depends
   >   (cohttp (>= 1.0.2))
   >   (conduit-lwt (>= 1.0.3))
@@ -62,114 +58,81 @@ The `dune build` should generate the opam file
   $ cat cohttp.opam
   # This file is generated by dune, edit dune-project instead
   opam-version: "2.0"
+  build: [
+    ["dune" "subst"] {pinned}
+    ["dune" "build" "-p" name "-j" jobs]
+    ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+    ["dune" "build" "-p" name "@doc"] {with-doc}
+  ]
+  authors: ["Anil Madhavapeddy" "Rudi Grinberg"]
+  bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+  homepage: "https://github.com/mirage/ocaml-cohttp"
+  license: "ISC"
   version: "1.0.0"
+  dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
   synopsis: "An OCaml library for HTTP clients and servers"
   description: "A longer description"
-  authors: ["Anil Madhavapeddy" "Rudi Grinberg"]
-  license: "ISC"
-  homepage: "https://github.com/mirage/ocaml-cohttp"
-  bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
   depends: [
-    "dune" {>= "3.18"}
     "alcotest" {with-test}
     "dune" {build & > "1.5"}
     "foo" {dev & > "1.5" & < "2.0"}
     "uri" {>= "1.9.0"}
     "uri" {< "2.0.0"}
     "fieldslib" {> "v0.12"}
     "fieldslib" {< "v0.13"}
-    "odoc" {with-doc}
   ]
-  build: [
-    ["dune" "subst"] {dev}
-    [
-      "dune"
-      "build"
-      "-p"
-      name
-      "-j"
-      jobs
-      "@install"
-      "@runtest" {with-test}
-      "@doc" {with-doc}
-    ]
-  ]
-  dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
-  x-maintenance-intent: ["(latest)"]
 
   $ cat cohttp-async.opam
   # This file is generated by dune, edit dune-project instead
   opam-version: "2.0"
+  build: [
+    ["dune" "subst"] {pinned}
+    ["dune" "build" "-p" name "-j" jobs]
+    ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+    ["dune" "build" "-p" name "@doc"] {with-doc}
+  ]
+  authors: ["Anil Madhavapeddy" "Rudi Grinberg"]
+  bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+  homepage: "https://github.com/mirage/ocaml-cohttp"
+  license: "ISC"
   version: "1.0.0"
+  dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
   synopsis: "HTTP client and server for the Async library"
   description: """
   A really long multi line description that spans across lines to
   make sure that the rendering of long strings stays compatible.
   """
-  authors: ["Anil Madhavapeddy" "Rudi Grinberg"]
-  license: "ISC"
-  homepage: "https://github.com/mirage/ocaml-cohttp"
-  bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
   depends: [
-    "dune" {>= "3.18"}
     "cohttp" {>= "1.0.2"}
     "conduit-async" {>= "1.0.3"}
     "async" {>= "v0.10.0"}
     "async" {< "v0.12"}
-    "odoc" {with-doc}
-  ]
-  build: [
-    ["dune" "subst"] {dev}
-    [
-      "dune"
-      "build"
-      "-p"
-      name
-      "-j"
-      jobs
-      "@install"
-      "@runtest" {with-test}
-      "@doc" {with-doc}
-    ]
   ]
-  dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
-  x-maintenance-intent: ["(latest)"]
 
   $ cat cohttp-lwt.opam
   # This file is generated by dune, edit dune-project instead
   opam-version: "2.0"
+  build: [
+    ["dune" "subst"] {pinned}
+    ["dune" "build" "-p" name "-j" jobs]
+    ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+    ["dune" "build" "-p" name "@doc"] {with-doc}
+  ]
+  authors: ["Anil Madhavapeddy" "Rudi Grinberg"]
+  bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+  homepage: "https://github.com/mirage/ocaml-cohttp"
+  license: "ISC"
   version: "1.0.0"
+  dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
   synopsis: "HTTP client and server for the Lwt library"
   description: """
   
   A really long description that is supposed to start with a
   newline since it doesn't escape the line break.
   """
-  authors: ["Anil Madhavapeddy" "Rudi Grinberg"]
-  license: "ISC"
-  homepage: "https://github.com/mirage/ocaml-cohttp"
-  bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
   depends: [
-    "dune" {>= "3.18"}
     "cohttp" {>= "1.0.2"}
     "conduit-lwt" {>= "1.0.3"}
     "lwt" {>= "5.0.0"}
     "lwt" {< "6.0.0"}
-    "odoc" {with-doc}
   ]
-  build: [
-    ["dune" "subst"] {dev}
-    [
-      "dune"
-      "build"
-      "-p"
-      name
-      "-j"
-      jobs
-      "@install"
-      "@runtest" {with-test}
-      "@doc" {with-doc}
-    ]
-  ]
-  dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
-  x-maintenance-intent: ["(latest)"]
diff --git a/test/blackbox-tests/test-cases/dune-project-meta/dune-dep.t b/test/blackbox-tests/test-cases/dune-project-meta/dune-dep.t
@@ -191,7 +191,6 @@ the doc dependencies:
     ]
     ["dune" "install" "-p" name "--create-install-files" name]
   ]
-  x-maintenance-intent: ["(latest)"]
 
   $ cat > dune-project <<EOF
   > (lang dune 3.0)
@@ -216,7 +215,6 @@ the doc dependencies:
       "@doc" {with-doc}
     ]
   ]
-  x-maintenance-intent: ["(latest)"]
 
   $ cat > dune-project <<EOF
   > (lang dune 3.0)
@@ -242,4 +240,3 @@ the doc dependencies:
       "@doc" {with-doc}
     ]
   ]
-  x-maintenance-intent: ["(latest)"]
diff --git a/test/blackbox-tests/test-cases/dune-project-meta/github2927.t b/test/blackbox-tests/test-cases/dune-project-meta/github2927.t
@@ -30,4 +30,3 @@ Reproduction case for #2927
       "@doc" {with-doc}
     ]
   ]
-  x-maintenance-intent: ["(latest)"]
diff --git a/test/blackbox-tests/test-cases/dune-project-meta/v11-1.t b/test/blackbox-tests/test-cases/dune-project-meta/v11-1.t
@@ -29,4 +29,3 @@ Generation of opam files with lang dune >= 1.11
       "@doc" {with-doc}
     ]
   ]
-  x-maintenance-intent: ["(latest)"]
diff --git a/test/blackbox-tests/test-cases/opam-constraints.t b/test/blackbox-tests/test-cases/opam-constraints.t
@@ -67,4 +67,3 @@ constraints.
       "@doc" {with-doc}
     ]
   ]
-  x-maintenance-intent: ["(latest)"]

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ Test with an opam like installation`
`169`	`169`	`]`
`170`	`170`	`["dune" "install" "-p" name "--create-install-files" name]`
`171`	`171`	`]`
`172`		`- x-maintenance-intent: ["(latest)"]`
`173`	`172`
`174`	`173`	`$ dune build -p a --promote-install-files=false @install`
`175`	`174`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ Test with an opam like installation`
`157`	`157`	`]`
`158`	`158`	`["dune" "install" "-p" name "--create-install-files" name]`
`159`	`159`	`]`
`160`		`- x-maintenance-intent: ["(latest)"]`
`161`	`160`
`162`	`161`	`$ dune build -p a --promote-install-files="false" @install`
`163`	`162`
Original file line number	Diff line number	Diff line change
`@@ -1373,5 +1373,4 @@ opam file listing`
`1373`	`1373`	`\"@doc\" {with-doc}`
`1374`	`1374`	`]`
`1375`	`1375`	`]`
`1376`		`- x-maintenance-intent: [\"(latest)\"]`
`1377`	`1376`	`"))`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ Install as opam does`
`177`	`177`	`"@doc" {with-doc}`
`178`	`178`	`]`
`179`	`179`	`]`
`180`		`- x-maintenance-intent: ["(latest)"]`
`181`	`180`
`182`	`181`	`$ (cd a; "dune" "build" "-p" a "@install")`
`183`	`182`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,6 @@ the doc dependencies:`
`191`	`191`	`]`
`192`	`192`	`["dune" "install" "-p" name "--create-install-files" name]`
`193`	`193`	`]`
`194`		`- x-maintenance-intent: ["(latest)"]`
`195`	`194`
`196`	`195`	`$ cat > dune-project <<EOF`
`197`	`196`	`> (lang dune 3.0)`
`@@ -216,7 +215,6 @@ the doc dependencies:`
`216`	`215`	`"@doc" {with-doc}`
`217`	`216`	`]`
`218`	`217`	`]`
`219`		`- x-maintenance-intent: ["(latest)"]`
`220`	`218`
`221`	`219`	`$ cat > dune-project <<EOF`
`222`	`220`	`> (lang dune 3.0)`
`@@ -242,4 +240,3 @@ the doc dependencies:`
`242`	`240`	`"@doc" {with-doc}`
`243`	`241`	`]`
`244`	`242`	`]`
`245`		`- x-maintenance-intent: ["(latest)"]`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,3 @@ Reproduction case for #2927`
`30`	`30`	`"@doc" {with-doc}`
`31`	`31`	`]`
`32`	`32`	`]`
`33`		`- x-maintenance-intent: ["(latest)"]`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,3 @@ Generation of opam files with lang dune >= 1.11`
`29`	`29`	`"@doc" {with-doc}`
`30`	`30`	`]`
`31`	`31`	`]`
`32`		`- x-maintenance-intent: ["(latest)"]`
Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,3 @@ constraints.`
`67`	`67`	`"@doc" {with-doc}`
`68`	`68`	`]`
`69`	`69`	`]`
`70`		`- x-maintenance-intent: ["(latest)"]`