fix: Allow package in any location in rule (#7445)

While fixing the package associations in ocaml/opam#5496 I realized that the package stanza is only accepted when it is at the end of the rule stanza. * Add test that `packages` needs to be last, or it will be rejected File "dune", line 12, characters 3-10: 12 | (package a) ^^^^^^^ Error: Unknown action or rule field. [1] Signed-off-by: Marek Kubica <[email protected]> Co-authored-by: Etienne Millon <[email protected]>
ocaml · Mar 30, 2023 · 026413c · 026413c
1 parent ad088a5
commit 026413c
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -91,6 +91,9 @@ Unreleased
 - Support `(link_flags ...)` in `(cinaps ...)` stanza. (#7423, fixes #7416,
   @nojb)
 
+- Allow `(package ...)` in any position within `(rule ...)` stanza (#7445,
+  @Leonidas-from-XIV)
+
 3.7.0 (2023-02-17)
 ------------------
 

diff --git a/src/dune_rules/dune_file.ml b/src/dune_rules/dune_file.ml
@@ -1728,6 +1728,7 @@ module Rule = struct
       ; ("aliases", Field)
       ; ("alias", Field)
       ; ("enabled_if", Field)
+      ; ("package", Field)
       ]
 
   let short_form =

diff --git a/test/blackbox-tests/test-cases/package-rule.t/a.opam b/test/blackbox-tests/test-cases/package-rule.t/a.opam
diff --git a/test/blackbox-tests/test-cases/package-rule.t/dune b/test/blackbox-tests/test-cases/package-rule.t/dune
@@ -0,0 +1,12 @@
+(test
+ (name test)
+ (modules test test_a test_b)
+ (package a))
+
+(rule
+  (action (copy test_temp.ml test_a.ml))
+  (package a))
+
+(rule
+  (package a)
+  (action (copy test_temp.ml test_b.ml)))
diff --git a/test/blackbox-tests/test-cases/package-rule.t/dune-project b/test/blackbox-tests/test-cases/package-rule.t/dune-project
@@ -0,0 +1 @@
+(lang dune 2.0)
diff --git a/test/blackbox-tests/test-cases/package-rule.t/run.t b/test/blackbox-tests/test-cases/package-rule.t/run.t
@@ -0,0 +1,5 @@
+When --only-packages is passed, it runs
+
+  $ dune build --only-packages a @runtest
+  A
+  A
diff --git a/test/blackbox-tests/test-cases/package-rule.t/test.ml b/test/blackbox-tests/test-cases/package-rule.t/test.ml
@@ -0,0 +1,2 @@
+module _ = Test_a
+module _ = Test_b
diff --git a/test/blackbox-tests/test-cases/package-rule.t/test_temp.ml b/test/blackbox-tests/test-cases/package-rule.t/test_temp.ml
@@ -0,0 +1 @@
+let () = print_endline "A"