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

c-cube · c-cube · commit cfb19b37f8f3 · 2024-07-10T11:56:50.000-04:00
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}
+  ]
+]

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ depends: [`
`14`	`14`	`"odoc" {with-doc}`
`15`	`15`	`"ocaml" {>= "4.08"}`
`16`	`16`	`]`
	`17`	`+dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"`
	`18`	`+available: arch != "arm32" & arch != "x86_32" & arch != "ppc32" & arch != "ppc64"`
`17`	`19`	`build: [`
`18`	`20`	`["dune" "subst"] {pinned}`
`19`	`21`	`[`
`@@ -24,9 +26,7 @@ build: [`
`24`	`26`	`"-j"`
`25`	`27`	`jobs`
`26`	`28`	`"@install"`
`27`		`- "@runtest" {with-test}`
	`29`	`+ "@src/tests/unit-tests/pbrt/runtest" {with-test} # custom path`
`28`	`30`	`"@doc" {with-doc}`
`29`	`31`	`]`
`30`	`32`	`]`
`31`		`-dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"`
`32`		`-available: arch != "arm32" & arch != "x86_32" & arch != "ppc32" & arch != "ppc64"`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ depends: [`
`12`	`12`	`"dune" {>= "2.0"}`
`13`	`13`	`"ocaml" {>= "4.08"}`
`14`	`14`	`"pbrt" {= version}`
	`15`	`+ "ocaml-protoc" {= version & with-test}`
`15`	`16`	`"pbrt_yojson" {= version}`
`16`	`17`	`]`
`17`	`18`	`build: [`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ depends: [`
`16`	`16`	`"yojson" {>= "1.6"}`
`17`	`17`	`"base64" {>= "3.0"}`
`18`	`18`	`]`
	`19`	`+dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"`
`19`	`20`	`build: [`
`20`	`21`	`["dune" "subst"] {pinned}`
`21`	`22`	`[`
`@@ -26,8 +27,7 @@ build: [`
`26`	`27`	`"-j"`
`27`	`28`	`jobs`
`28`	`29`	`"@install"`
`29`		`- "@runtest" {with-test}`
	`30`	`+ "@src/tests/yojson/runtest" {with-test}`
`30`	`31`	`"@doc" {with-doc}`
`31`	`32`	`]`
`32`	`33`	`]`
`33`		`-dev-repo: "git+https://github.com/mransan/ocaml-protoc.git"`