Update to Dune 3.17

MisterDA · MisterDA · commit 45858ab58da3 · 2025-02-27T00:58:06.000+01:00
diff --git a/config/discover.ml b/config/discover.ml
@@ -1,6 +1,6 @@
 open Base
 open Stdio
-module C = Configurator
+module C = Configurator.V1
 
 let write_sexp fn list_of_str =
   let data = sexp_of_list sexp_of_string list_of_str |> Sexp.to_string in
diff --git a/config/dune b/config/dune
@@ -1,3 +1,3 @@
 (executable
  (name discover)
- (libraries base stdio configurator))
+ (libraries base stdio dune-configurator))
diff --git a/dune-project b/dune-project
@@ -1 +1 @@
-(lang dune 2.5)
+(lang dune 3.17)
diff --git a/gobject-introspection.opam b/gobject-introspection.opam
@@ -15,13 +15,13 @@ build: [
 ]
 depends: [
   "ocaml"
-  "dune" {>= "1.2"}
+  "dune" {>= "3.17"}
   "ctypes"
   "ctypes-foreign"
   "ounit"
   "base"
   "stdio"
-  "configurator"
+  "dune-configurator" {build}
   "conf-pkg-config" {build}
   "conf-gobject-introspection" {build}
   "conf-glib-2" {build}
diff --git a/lib/dune b/lib/dune
@@ -10,7 +10,7 @@
 (rule
   (targets c_flags.sexp c_library_flags.sexp ccopts.sexp)
   (deps    (:x ../config/discover.exe))
-  (action  (run %{x} -ocamlc %{ocamlc}))
+  (action  (run %{x}))
 )
 
 (rule
diff --git a/stubgen/dune b/stubgen/dune
@@ -154,5 +154,5 @@
 (rule
   (targets c_library_flags c_flags)
   (deps    (:x ../config/discover.exe))
-  (action  (run %{x} -ocamlc %{ocamlc}))
+  (action  (run %{x}))
 )

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`(rule`
`11`	`11`	`(targets c_flags.sexp c_library_flags.sexp ccopts.sexp)`
`12`	`12`	`(deps (:x ../config/discover.exe))`
`13`		`- (action (run %{x} -ocamlc %{ocamlc}))`
	`13`	`+ (action (run %{x}))`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`(rule`
Original file line number	Diff line number	Diff line change
`@@ -154,5 +154,5 @@`
`154`	`154`	`(rule`
`155`	`155`	`(targets c_library_flags c_flags)`
`156`	`156`	`(deps (:x ../config/discover.exe))`
`157`		`- (action (run %{x} -ocamlc %{ocamlc}))`
	`157`	`+ (action (run %{x}))`
`158`	`158`	`)`