Use nobase variants of ppxes to avoid dependency on unix though base

andersfugmann · andersfugmann · commit 095b35cf4f4f · 2025-04-26T23:21:57.000+02:00
diff --git a/examples/echo_deriving/dune b/examples/echo_deriving/dune
@@ -3,7 +3,7 @@
  (name        test)
  (libraries   ocaml-protoc-plugin unix google_types_deriving)
  (preprocess
-  (pps ppx_expect ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))
+  (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))
 )
 
 (rule
diff --git a/examples/echo_deriving/google_types_deriving/dune b/examples/echo_deriving/google_types_deriving/dune
@@ -3,7 +3,7 @@
  (libraries   ocaml-protoc-plugin)
  (synopsis "Google well known types - with deriving")
  (preprocess
-  (pps ppx_expect ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))
+  (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))
 )
 
 (rule
diff --git a/ocaml-protoc-plugin.opam b/ocaml-protoc-plugin.opam
@@ -18,8 +18,8 @@ depends: [
   "conf-c++" {with-test}
   "dune" {>= "3.12"}
   "ocaml" {>= "4.08.0"}
-  "ppx_expect"
-  "ppx_inline_test"
+  "ppx_expect_nobase"
+  "ppx_inline_test_nobase"
   "ppx_deriving" {with-test}
   "bisect_ppx" {with-test}
   "odoc" {with-doc}
diff --git a/src/ocaml_protoc_plugin/dune b/src/ocaml_protoc_plugin/dune
@@ -4,6 +4,6 @@
  (synopsis "Serialization and deserialization of protobuf types")
  (inline_tests)
  (libraries base64 ptime)
- (preprocess (pps ppx_expect))
+ (preprocess (pps ppx_expect_nobase ppx_inline_test_nobase))
  (instrumentation (backend bisect_ppx))
 )
diff --git a/test/dune b/test/dune
@@ -31,7 +31,7 @@
     (glob_files *.proto)
   ))
  (modules :standard \ proto3_optional_test_opt)
- (preprocess (pps ppx_expect ppx_deriving.show ppx_deriving.eq))
+ (preprocess (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq))
  (foreign_stubs
   (language cxx)
   (names protobuf2json)
diff --git a/test/google_types_pp/dune b/test/google_types_pp/dune
@@ -2,7 +2,7 @@
  (name        google_types_pp)
  (libraries   ocaml_protoc_plugin)
  (preprocess
-  (pps ppx_expect ppx_deriving.show ppx_deriving.eq))
+  (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq))
 
  (synopsis "Google well known types with pretty printing")
 )
diff --git a/test/test_params/dune b/test/test_params/dune
@@ -2,7 +2,7 @@
  (name prefix_output_with_package)
  (inline_tests)
  (libraries ocaml_protoc_plugin google_types_prefixed)
- (preprocess (pps ppx_expect))
+ (preprocess (pps ppx_expect_nobase))
 )
 
 (rule
diff --git a/test/test_params/google_types_prefixed/dune b/test/test_params/google_types_prefixed/dune
@@ -2,7 +2,7 @@
  (name        google_types_prefixed)
  (libraries   ocaml_protoc_plugin)
  (preprocess
-  (pps ppx_expect ppx_deriving.show ppx_deriving.eq))
+  (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq))
  (synopsis "Google well known types with prefix_output_with_package=true")
 )
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`(name test)`
`4`	`4`	`(libraries ocaml-protoc-plugin unix google_types_deriving)`
`5`	`5`	`(preprocess`
`6`		`- (pps ppx_expect ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))`
	`6`	`+ (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`(rule`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`(libraries ocaml-protoc-plugin)`
`4`	`4`	`(synopsis "Google well known types - with deriving")`
`5`	`5`	`(preprocess`
`6`		`- (pps ppx_expect ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))`
	`6`	`+ (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq ppx_deriving.ord))`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`(rule`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`(synopsis "Serialization and deserialization of protobuf types")`
`5`	`5`	`(inline_tests)`
`6`	`6`	`(libraries base64 ptime)`
`7`		`- (preprocess (pps ppx_expect))`
	`7`	`+ (preprocess (pps ppx_expect_nobase ppx_inline_test_nobase))`
`8`	`8`	`(instrumentation (backend bisect_ppx))`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`(name google_types_pp)`
`3`	`3`	`(libraries ocaml_protoc_plugin)`
`4`	`4`	`(preprocess`
`5`		`- (pps ppx_expect ppx_deriving.show ppx_deriving.eq))`
	`5`	`+ (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq))`
`6`	`6`
`7`	`7`	`(synopsis "Google well known types with pretty printing")`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`(name prefix_output_with_package)`
`3`	`3`	`(inline_tests)`
`4`	`4`	`(libraries ocaml_protoc_plugin google_types_prefixed)`
`5`		`- (preprocess (pps ppx_expect))`
	`5`	`+ (preprocess (pps ppx_expect_nobase))`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`(rule`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`(name google_types_prefixed)`
`3`	`3`	`(libraries ocaml_protoc_plugin)`
`4`	`4`	`(preprocess`
`5`		`- (pps ppx_expect ppx_deriving.show ppx_deriving.eq))`
	`5`	`+ (pps ppx_expect_nobase ppx_deriving.show ppx_deriving.eq))`
`6`	`6`	`(synopsis "Google well known types with prefix_output_with_package=true")`
`7`	`7`	`)`
`8`	`8`