ensure opam install -t works for pbrt and pbrt-yojson

mransan · Jul 10, 2024 · cfb19b3 · cfb19b3
1 parent 1aa42d9
commit cfb19b3
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/dune-project b/dune-project
@@ -44,6 +44,7 @@
   (depends
     (ocaml (>= 4.08))
     (pbrt (= :version))
+    (ocaml-protoc (and (= :version) :with-test))
     (pbrt_yojson (= :version)))
   (tags (protobuf encode decode services rpc)))
 
diff --git a/pbrt.opam b/pbrt.opam
@@ -14,6 +14,8 @@ depends: [
   "odoc" {with-doc}
   "ocaml" {>= "4.08"}
 ]
+dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"
+available: arch != "arm32" & arch != "x86_32" & arch != "ppc32" & arch != "ppc64"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -24,9 +26,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@src/tests/unit-tests/pbrt/runtest" {with-test}  # custom path
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"
-available: arch != "arm32" & arch != "x86_32" & arch != "ppc32" & arch != "ppc64"
diff --git a/pbrt.opam.template b/pbrt.opam.template
@@ -1 +1,15 @@
 available: arch != "arm32" & arch != "x86_32" & arch != "ppc32" & arch != "ppc64"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@src/tests/unit-tests/pbrt/runtest" {with-test}  # custom path
+    "@doc" {with-doc}
+  ]
+]
diff --git a/pbrt_services.opam b/pbrt_services.opam
@@ -12,6 +12,7 @@ depends: [
   "dune" {>= "2.0"}
   "ocaml" {>= "4.08"}
   "pbrt" {= version}
+  "ocaml-protoc" {= version & with-test}
   "pbrt_yojson" {= version}
 ]
 build: [

diff --git a/pbrt_yojson.opam b/pbrt_yojson.opam
@@ -16,6 +16,7 @@ depends: [
   "yojson" {>= "1.6"}
   "base64" {>= "3.0"}
 ]
+dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"
 build: [
   ["dune" "subst"] {pinned}
   [
@@ -26,8 +27,7 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test}
+    "@src/tests/yojson/runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"
diff --git a/pbrt_yojson.opam.template b/pbrt_yojson.opam.template
@@ -0,0 +1,14 @@
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@src/tests/yojson/runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]