User '%{bin: ...}' for binaries to have dune locate them correctly

Author: andersfugmann

bench/dune

@@ -6,7 +6,7 @@
 (rule
  (targets verify.ml)
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto verify.proto))
  (action
   (run protoc "--plugin=protoc-gen-ocaml=%{plugin}" "--ocaml_out=." %{proto})))

bench/plugin/dune

@@ -10,7 +10,7 @@
     ../int64.proto ../string.proto ../float.proto ../enum.proto
     ../int64_list.proto ../string_list.proto ../float_list.proto ../enum_list.proto
     ../map.proto)
-  (:plugin ../../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
  )
  (action
   (bash "for p in %{proto}; do protoc -I .. --plugin=protoc-gen-ocaml=%{plugin} \"--ocaml_out=annot=[@@deriving show { with_path = false },eq]:.\" $p; done")))

ocaml-protoc-plugin.opam

@@ -9,7 +9,7 @@ doc: "https://andersfugmann.github.io/ocaml-protoc-plugin/"
 build: [
   ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "arm32" & arch != "x86_32"}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "arm32" & arch != "x86_32" & os != "win32"}
 ]
 
 depends: [
@@ -23,7 +23,7 @@ depends: [
   "ppx_deriving" {with-test}
   "bisect_ppx" {with-test}
   "odoc" {with-doc}
-  "omd"
+  "omd" {>= "2.0"}
   "conf-pkg-config" {build}
   "dune-configurator" {with-test}
   "yojson" {with-test}
@@ -36,6 +36,8 @@ x-ci-accept-failures: [
   "macos-homebrew" # C++ versions less than C++14 are not supported.
 ]
 
+x-maintenance-intent: ["(latest)"]
+
 synopsis: "Plugin for protoc protobuf compiler to generate ocaml definitions from a .proto file"
 
 description: """ The plugin generates ocaml type definitions,

src/google_types/dune

@@ -14,9 +14,9 @@
  (targets any.ml api.ml descriptor.ml duration.ml empty.ml field_mask.ml
           source_context.ml struct.ml timestamp.ml type.ml wrappers.ml)
  (deps
-  (:plugin ../plugin/protoc_gen_ocaml.exe))
+  (:plugin %{bin:protoc-gen-ocaml}))
  (action
-  (run protoc -I %{read-lines:google_include}
+  (run %{bin:protoc} -I %{read-lines:google_include}
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=."
        %{read-lines:google_include}/google/protobuf/any.proto

test/dune

@@ -8,7 +8,7 @@
 (subdir config
  (rule
  (target support_proto3_optional.conf)
- (action (with-accepted-exit-codes (or 0 1) (ignore-stderr (with-stdout-to %{target} (run protoc --experimental_allow_proto3_optional --version)))))))
+ (action (with-accepted-exit-codes (or 0 1) (ignore-stderr (with-stdout-to %{target} (run %{bin:protoc} --experimental_allow_proto3_optional --version)))))))
 
 (rule
  (enabled_if (<> %{read:config/support_proto3_optional.conf} ""))
@@ -52,7 +52,7 @@
    options.ml name_clash2.ml empty.ml service_rpc_clash.ml service_empty_package.ml
    deprecated.ml json_encoding.ml comments.ml)
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto
     basic.proto primitive_types.proto int_types.proto repeated.proto enum.proto empty_message.proto
     message.proto oneof.proto merge.proto map.proto package.proto large.proto
@@ -63,7 +63,7 @@
     deprecated.proto json_encoding.proto comments.proto)
  )
  (action
-  (run protoc -I %{read-lines:google_include} -I .
+  (run %{bin:protoc} -I %{read-lines:google_include} -I .
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_pp;open=Test_runtime;annot=[@@deriving show { with_path = false }, eq]:." %{proto})))
 
@@ -77,7 +77,7 @@
    include_included3_dash.ml
  )
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto
     basic.proto
     include.proto
@@ -88,7 +88,7 @@
   )
  )
  (action
-  (run protoc -I %{read-lines:google_include} -I .
+  (run %{bin:protoc} -I %{read-lines:google_include} -I .
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_pp;open=Test_runtime;prefix_output_with_package=true;annot=[@@deriving show { with_path = false }, eq]:." %{proto})))
 
@@ -98,46 +98,46 @@
    test_include_b_message.ml
  )
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto
     test_include_a/message.proto
     test_include_b/message.proto
   )
  )
  (action
-  (run protoc -I %{read-lines:google_include} -I .
+  (run %{bin:protoc} -I %{read-lines:google_include} -I .
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_pp;open=Test_runtime;prefix_output_with_package=true;annot=[@@deriving show { with_path = false }, eq]:." %{proto})))
 
 (rule
  (targets int_types_native.ml int_types_native_proto2.ml)
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto int_types_native.proto int_types_native_proto2.proto))
  (action
-  (run protoc -I %{read-lines:google_include} -I .
+  (run %{bin:protoc} -I %{read-lines:google_include} -I .
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_pp;open=Test_runtime;int32_as_int=false;int64_as_int=false;annot=[@@deriving show { with_path = false }, eq]:." %{proto})))
 
 (rule
  (targets singleton_record.ml oneof2.ml)
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto singleton_record.proto oneof2.proto))
  (action
-  (run protoc -I %{read-lines:google_include} -I .
+  (run %{bin:protoc} -I %{read-lines:google_include} -I .
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_pp;open=Test_runtime;annot=[@@deriving show { with_path = false }, eq]:." %{proto})))
 
 (rule
  (enabled_if (<> %{read:config/support_proto3_optional.conf} ""))
  (target proto3_optional.ml)
  (deps
-  (:plugin ../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto proto3_optional.proto)
  )
  (action
-  (run protoc -I %{read-lines:google_include} -I .
+  (run %{bin:protoc} -I %{read-lines:google_include} -I .
        "--experimental_allow_proto3_optional"
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_pp;open=Test_runtime;annot=[@@deriving show { with_path = false }, eq]:." %{proto})))

test/google_types_pp/dune

@@ -11,9 +11,9 @@
  (targets any.ml api.ml descriptor.ml duration.ml empty.ml field_mask.ml
           source_context.ml struct.ml timestamp.ml type.ml wrappers.ml)
  (deps
-  (:plugin ../../src/plugin/protoc_gen_ocaml.exe))
+  (:plugin %{bin:protoc-gen-ocaml}))
   (action
-    (run protoc -I %{read-lines:../google_include} -I .
+    (run %{bin:protoc} -I %{read-lines:../google_include} -I .
          "--plugin=protoc-gen-ocaml=%{plugin}"
          "--ocaml_out=annot=[@@deriving show { with_path = false }, eq]:."
 

test/test_params/dune

@@ -44,7 +44,7 @@
    singleton_record_singleton_record.ml
    comments_comments.ml)
  (deps
-  (:plugin ../../src/plugin/protoc_gen_ocaml.exe)
+  (:plugin %{bin:protoc-gen-ocaml})
   (:proto
     ../basic.proto
     ../deprecated.proto
@@ -84,7 +84,7 @@
     ../comments.proto)
  )
  (action
-  (run protoc -I %{read-lines:../google_include} -I ..
+  (run %{bin:protoc} -I %{read-lines:../google_include} -I ..
        "--plugin=protoc-gen-ocaml=%{plugin}"
        "--ocaml_out=open=Google_types_prefixed;singleton_record=true;prefix_output_with_package=true;singleton_oneof_as_option=false:."
        %{proto}))

test/test_params/google_types_prefixed/dune

@@ -20,9 +20,9 @@
    google_protobuf_type.ml
    google_protobuf_wrappers.ml)
   (deps
-  (:plugin ../../../src/plugin/protoc_gen_ocaml.exe))
+  (:plugin %{bin:protoc-gen-ocaml}))
   (action
-    (run protoc -I %{read-lines:../../google_include} -I .
+    (run %{bin:protoc} -I %{read-lines:../../google_include} -I .
          "--plugin=protoc-gen-ocaml=%{plugin}"
          "--ocaml_out=singleton_record=true;prefix_output_with_package=true;singleton_oneof_as_option=false:."