Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/changes/fixed/13522.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix `melange.emit` not respecting the package mask via `-p <PKG>` (#13522,
@anmonteiro)
1 change: 1 addition & 0 deletions src/dune_rules/stanzas/stanzas.ml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ let stanza_package stanza =
| Tests.T { package = Some package; _ } -> Some package
| Coq_stanza.Theory.T { package = Some package; _ } -> Some package
| Rocq_stanza.Theory.T { package = Some package; _ } -> Some package
| Melange_stanzas.Emit.T { package = Some package; _ } -> Some package
| _ -> None)
|> Option.map ~f:Package.id
with
Expand Down
11 changes: 4 additions & 7 deletions test/blackbox-tests/test-cases/melange/melange-emit-package.t
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,11 @@ we can still build my-ppx independently

$ dune build -p my-ppx

and fails if it can't resolve libraries to build the alias
and fails to build any `@melange`-related stuff, because none is defined for
the package `my-ppx`

$ dune build @melange -p my-ppx
File "test/dune", line 6, characters 12-19:
6 | (libraries mel-foo))
^^^^^^^
Error: Library "mel-foo" not found.
-> required by _build/default/test/js-out/test/test_entry.js
-> required by alias test/melange
Error: Alias "melange" specified on the command line is empty.
It is not defined in . or any of its descendants.
[1]

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Show interaction of `dune runtest -p ..` and `(melange.emit ..)`

$ cat > dune-project <<EOF
> (lang dune 3.21)
> (using melange 1.0)
> (package (name a))
> (package (name b))
> EOF

$ mkdir a b
$ cat > a/dune <<EOF
> (melange.emit
> (alias runtest)
> (package a)
> (emit_stdlib false)
> (target out))
> EOF
$ cat > a/x.ml <<EOF
> let () = print_endline "hello"
> EOF

$ cat > b/dune <<EOF
> (melange.emit
> (alias runtest)
> (package b)
> (emit_stdlib false)
> (target out))
> EOF
$ cat > b/x.ml <<EOF
> let () = print_endline "hello"
> EOF

Selecting only the package a should not build b

$ dune runtest -p a
$ test -e _build/default/b/out/b/x.js
[1]

$ dune runtest -p b
$ test -e _build/default/b/out/b/x.js
Loading