From 0407a2cd1c6b5403adf6c4d3bcf6d9f72157d2bd Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 1 Apr 2024 17:45:39 -0500 Subject: [PATCH] Bump dune. --- dune-project | 2 +- src/generator/dune | 13 +++++++++++-- srt.opam | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dune-project b/dune-project index b7b078c..dfb01fc 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,4 @@ -(lang dune 2.8) +(lang dune 3.6) (version 0.3.1) (name srt) (source (github savonet/ocaml-srt)) diff --git a/src/generator/dune b/src/generator/dune index 3ef3c4e..3aab26b 100644 --- a/src/generator/dune +++ b/src/generator/dune @@ -54,16 +54,24 @@ (action (run ../config/discover.exe))) +(rule + (targets ctypes_dir) + (action + (with-stdout-to + %{targets} + (run dirname %{lib:ctypes:ctypes_cstubs_internals.h})))) + (rule (targets gen_types_c_target.exe) (deps (:c_flags ./c_flags) + (:ctypes_dir ./ctypes_dir) (:c_code ./gen_types.c)) (action (run %{ocaml-config:c_compiler} -I - %{lib:ctypes:} + %{read-lines:ctypes_dir} -I %{ocaml-config:standard_library} %{read-lines:c_flags} @@ -102,12 +110,13 @@ (targets gen_constants_c_target.exe) (deps (:c_flags ./c_flags) + (:ctypes_dir ./ctypes_dir) (:c_code ./gen_constants.c)) (action (run %{ocaml-config:c_compiler} -I - %{lib:ctypes:} + %{read-lines:ctypes_dir} -I %{ocaml-config:standard_library} %{read-lines:c_flags} diff --git a/srt.opam b/srt.opam index 683ed0c..23fa5d2 100644 --- a/srt.opam +++ b/srt.opam @@ -16,7 +16,7 @@ bug-reports: "https://github.com/savonet/ocaml-srt/issues" depends: [ "conf-srt" {build} "conf-pkg-config" {build} - "dune" {>= "2.8"} + "dune" {>= "3.6"} "dune-configurator" {build} "ocamlfind" "ctypes"