Skip to content

Commit b4ff599

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 6b69c61 commit b4ff599

File tree

7 files changed

+578
-25
lines changed

7 files changed

+578
-25
lines changed

CHANGES.md

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

4+
- Don't generate the dune-site build part when not needed (#4861, @bobot,
5+
review @kit-ty-kate)
6+
47
- Fixes `opam` META file requires entry for private libs (#4841, fixes #4839, @toots)
58

69
- Fixes `dune exec` not adding .exe on Windows (#4371, fixes #3322, @MisterDA)

otherlibs/site/test/run.t

Lines changed: 20 additions & 10 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

@@ -138,7 +149,7 @@ Test with an opam like installation
138149
opam-version: "2.0"
139150
version: "0.a"
140151
depends: [
141-
"dune" {>= "2.9"}
152+
"dune" {>= "3.0"}
142153
"odoc" {with-doc}
143154
]
144155
build: [
@@ -150,16 +161,15 @@ Test with an opam like installation
150161
name
151162
"-j"
152163
jobs
153-
"--promote-install-files"
154-
"false"
155164
"@install"
156165
"@runtest" {with-test}
157166
"@doc" {with-doc}
167+
"--promote-install-files=false"
158168
]
159169
["dune" "install" "-p" name "--create-install-files" name]
160170
]
161171

162-
$ dune build -p a --promote-install-files "false" @install
172+
$ dune build -p a --promote-install-files=false @install
163173

164174
$ test -e a/a.install
165175
[1]
@@ -377,7 +387,7 @@ Test %{version:installed-pkg}
377387
$ for i in f; do
378388
> mkdir -p $i
379389
> cat >$i/dune-project <<EOF
380-
> (lang dune 2.9)
390+
> (lang dune 3.0)
381391
> (using dune_site 0.1)
382392
> (name $i)
383393
> (version 0.$i)

0 commit comments

Comments
 (0)