Skip to content

Commit 1d436f0

Browse files
committed
Add (universe) dependency to rules depending on opam switch packages
1 parent dc6a329 commit 1d436f0

File tree

2 files changed

+38
-16
lines changed

2 files changed

+38
-16
lines changed

img/dune

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
(target findlib-depends-dune-release.svg)
44
(mode promote)
55
(enabled_if %{bin-available:dot})
6+
(deps (universe))
67
(action
78
(with-stdout-to %{target}
89
(pipe-stdout
@@ -14,6 +15,7 @@
1415
(target findlib-rdepends-fmt.svg)
1516
(mode promote)
1617
(enabled_if %{bin-available:dot})
18+
(deps (universe))
1719
(action
1820
(with-stdout-to %{target}
1921
(pipe-stdout
@@ -25,6 +27,7 @@
2527
(target findlib-depends-dune-release-rdepends-fmt.svg)
2628
(mode promote)
2729
(enabled_if %{bin-available:dot})
30+
(deps (universe))
2831
(action
2932
(with-stdout-to %{target}
3033
(pipe-stdout
@@ -36,6 +39,7 @@
3639
(target opam-depends-dune-release.svg)
3740
(mode promote)
3841
(enabled_if %{bin-available:dot})
42+
(deps (universe))
3943
(action
4044
(with-stdout-to %{target}
4145
(pipe-stdout
@@ -47,6 +51,7 @@
4751
(target opam-rdepends-fmt.svg)
4852
(mode promote)
4953
(enabled_if %{bin-available:dot})
54+
(deps (universe))
5055
(action
5156
(with-stdout-to %{target}
5257
(pipe-stdout
@@ -58,6 +63,7 @@
5863
(target opam-depends-dune-release-rdepends-fmt.svg)
5964
(mode promote)
6065
(enabled_if %{bin-available:dot})
66+
(deps (universe))
6167
(action
6268
(with-stdout-to %{target}
6369
(pipe-stdout

test/dune

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@
33
; deps
44

55
(rule
6-
(with-stdout-to deps.dot
7-
(run odep dune-describe-file -t dot %{dep:deps.sexp})))
6+
(deps (universe))
7+
(action
8+
(with-stdout-to deps.dot
9+
(run odep dune-describe-file -t dot %{dep:deps.sexp}))))
810

911
(rule
1012
(alias sim642test)
1113
(action (diff deps.dot.expected deps.dot)))
1214

1315
(rule
14-
(with-stdout-to deps.mermaid
15-
(run odep dune-describe-file -t mermaid %{dep:deps.sexp})))
16+
(deps (universe))
17+
(action
18+
(with-stdout-to deps.mermaid
19+
(run odep dune-describe-file -t mermaid %{dep:deps.sexp}))))
1620

1721
(rule
1822
(alias sim642test)
@@ -21,16 +25,20 @@
2125
; deps2
2226

2327
(rule
24-
(with-stdout-to deps2.dot
25-
(run odep dune-describe-file -t dot %{dep:deps2.sexp})))
28+
(deps (universe))
29+
(action
30+
(with-stdout-to deps2.dot
31+
(run odep dune-describe-file -t dot %{dep:deps2.sexp}))))
2632

2733
(rule
2834
(alias sim642test)
2935
(action (diff deps2.dot.expected deps2.dot)))
3036

3137
(rule
32-
(with-stdout-to deps2.mermaid
33-
(run odep dune-describe-file -t mermaid %{dep:deps2.sexp})))
38+
(deps (universe))
39+
(action
40+
(with-stdout-to deps2.mermaid
41+
(run odep dune-describe-file -t mermaid %{dep:deps2.sexp}))))
3442

3543
(rule
3644
(alias sim642test)
@@ -39,16 +47,20 @@
3947
; deps3
4048

4149
(rule
42-
(with-stdout-to deps3.dot
43-
(run odep dune-describe-file -t dot %{dep:deps3.sexp})))
50+
(deps (universe))
51+
(action
52+
(with-stdout-to deps3.dot
53+
(run odep dune-describe-file -t dot %{dep:deps3.sexp}))))
4454

4555
(rule
4656
(alias sim642test)
4757
(action (diff deps3.dot.expected deps3.dot)))
4858

4959
(rule
50-
(with-stdout-to deps3.mermaid
51-
(run odep dune-describe-file -t mermaid %{dep:deps3.sexp})))
60+
(deps (universe))
61+
(action
62+
(with-stdout-to deps3.mermaid
63+
(run odep dune-describe-file -t mermaid %{dep:deps3.sexp}))))
5264

5365
(rule
5466
(alias sim642test)
@@ -57,16 +69,20 @@
5769
; deps4
5870

5971
(rule
60-
(with-stdout-to deps4.dot
61-
(run odep dune-describe-file -t dot %{dep:deps4.sexp})))
72+
(deps (universe))
73+
(action
74+
(with-stdout-to deps4.dot
75+
(run odep dune-describe-file -t dot %{dep:deps4.sexp}))))
6276

6377
(rule
6478
(alias sim642test)
6579
(action (diff deps4.dot.expected deps4.dot)))
6680

6781
(rule
68-
(with-stdout-to deps4.mermaid
69-
(run odep dune-describe-file -t mermaid %{dep:deps4.sexp})))
82+
(deps (universe))
83+
(action
84+
(with-stdout-to deps4.mermaid
85+
(run odep dune-describe-file -t mermaid %{dep:deps4.sexp}))))
7086

7187
(rule
7288
(alias sim642test)

0 commit comments

Comments
 (0)