Skip to content

Commit a86b8cc

Browse files
committed
[Opam] Don't generate the dune-site build part when not needed
Fixes #4849 Signed-off-by: François Bobot <[email protected]>
1 parent 73d7364 commit a86b8cc

File tree

11 files changed

+544
-36
lines changed

11 files changed

+544
-36
lines changed

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ Unreleased
33

44
- Fix plugins with dot in the name (#5182, @bobot, review @rgrinberg)
55

6+
- Don't generate the dune-site build part when not needed (#4861, @bobot,
7+
review @kit-ty-kate)
8+
69
- Fix installation of implementations of virtual libraries (#5150, fix #3636,
710
@rgrinberg)
811

otherlibs/site/test/run.t

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,37 @@ Test embedding of sites locations information
33

44
$ mkdir -p a b c
55

6-
$ for i in a b d; do
6+
$ mkdir -p a
7+
8+
$ cat >a/dune-project <<EOF
9+
> (lang dune 3.0)
10+
> (generate_opam_files true)
11+
> (using dune_site 0.1)
12+
> (name a)
13+
> (version 0.a)
14+
> (package (name a) (sites (share data)))
15+
> EOF
16+
17+
$ for i in b d; do
718
> mkdir -p $i
819
> cat >$i/dune-project <<EOF
9-
> (lang dune 2.9)
20+
> (lang dune 3.0)
1021
> (generate_opam_files true)
1122
> (using dune_site 0.1)
1223
> (name $i)
1324
> (version 0.$i)
14-
> (package (name $i) (sites (share data)))
25+
> (package (name $i) (sites (share data)) (depends c))
1526
> EOF
1627
> done
1728

1829
$ for i in c; do
1930
> mkdir -p $i
2031
> cat >$i/dune-project <<EOF
21-
> (lang dune 2.9)
32+
> (lang dune 3.0)
2233
> (generate_opam_files true)
2334
> (using dune_site 0.1)
2435
> (name $i)
25-
> (package (name $i) (sites (share data) (lib plugins)))
36+
> (package (name $i) (sites (share data) (lib plugins)) (depends a))
2637
> EOF
2738
> done
2839

@@ -139,7 +150,7 @@ Test with an opam like installation
139150
opam-version: "2.0"
140151
version: "0.a"
141152
depends: [
142-
"dune" {>= "2.9"}
153+
"dune" {>= "3.0"}
143154
"odoc" {with-doc}
144155
]
145156
build: [
@@ -159,9 +170,7 @@ Test with an opam like installation
159170
["dune" "install" "-p" name "--create-install-files" name]
160171
]
161172

162-
$ dune subst
163-
164-
$ dune build -p a --promote-install-files=false @install @runtest @doc
173+
$ dune build -p a --promote-install-files=false @install
165174

166175
$ test -e a/a.install
167176
[1]
@@ -378,11 +387,11 @@ Test %{version:installed-pkg}
378387
$ for i in f; do
379388
> mkdir -p $i
380389
> cat >$i/dune-project <<EOF
381-
> (lang dune 2.9)
390+
> (lang dune 3.0)
382391
> (using dune_site 0.1)
383392
> (name $i)
384393
> (version 0.$i)
385-
> (package (name $i) (sites (share data) (lib plugins)))
394+
> (package (name $i) (sites (share data) (lib plugins)) (allow_empty))
386395
> EOF
387396
> done
388397

0 commit comments

Comments
 (0)