Guard META generation of exports with version >= (3, 17)

Signed-off-by: Nicolás Ojeda Bär <[email protected]>

Author: nojb

src/dune_rules/gen_meta.ml

@@ -111,7 +111,12 @@ let gen_lib pub_name lib ~version =
   List.concat
     [ version
     ; [ description desc; requires ~preds lib_deps ]
-    ; (if Lib_name.Set.is_empty lib_re_exports then [] else [ exports lib_re_exports ])
+    ; (if (match Lib.project lib with
+           | None -> true
+           | Some project -> Dune_project.dune_version project < (3, 17))
+          || Lib_name.Set.is_empty lib_re_exports
+       then []
+       else [ exports lib_re_exports ])
     ; archives ~preds lib
     ; (if Lib_name.Set.is_empty ppx_rt_deps
        then []

test/blackbox-tests/test-cases/meta-gen.t/dune-project

@@ -1,3 +1,88 @@
+  $ echo '(lang dune 2.0)' > dune-project
+  $ dune runtest --force
+  description = "contains \"quotes\""
+  requires = "bytes"
+  archive(byte) = "foobar.cma"
+  archive(native) = "foobar.cmxa"
+  plugin(byte) = "foobar.cma"
+  plugin(native) = "foobar.cmxs"
+  package "baz" (
+    directory = "baz"
+    description = "sub library with modes set to byte"
+    requires = "bytes"
+    archive(byte) = "foobar_baz.cma"
+    archive(native) = ""
+    plugin(byte) = "foobar_baz.cma"
+    plugin(native) = ""
+  )
+  package "foobar2" (
+    directory = "foobar2"
+    description = ""
+    requires = "foobar foobar.ppd foobar.rewriter2"
+    archive(byte) = "foobar2.cma"
+    archive(native) = "foobar2.cmxa"
+    plugin(byte) = "foobar2.cma"
+    plugin(native) = "foobar2.cmxs"
+  )
+  package "ppd" (
+    directory = "ppd"
+    description = "pp'd with a rewriter"
+    requires = "foobar foobar.baz foobar.runtime-lib2"
+    archive(byte) = "foobar_ppd.cma"
+    archive(native) = "foobar_ppd.cmxa"
+    plugin(byte) = "foobar_ppd.cma"
+    plugin(native) = "foobar_ppd.cmxs"
+  )
+  package "rewriter" (
+    directory = "rewriter"
+    description = "ppx rewriter"
+    requires(ppx_driver) = "foobar foobar.rewriter2"
+    archive(ppx_driver,byte) = "foobar_rewriter.cma"
+    archive(ppx_driver,native) = "foobar_rewriter.cmxa"
+    plugin(ppx_driver,byte) = "foobar_rewriter.cma"
+    plugin(ppx_driver,native) = "foobar_rewriter.cmxs"
+    # This is what dune uses to find out the runtime dependencies of
+    # a preprocessor
+    ppx_runtime_deps = "foobar.baz"
+    # This line makes things transparent for people mixing preprocessors
+    # and normal dependencies
+    requires(-ppx_driver) = "foobar.baz foobar.runtime-lib2"
+    ppx(-ppx_driver,-custom_ppx) = "./ppx.exe --as-ppx"
+    library_kind = "ppx_rewriter"
+  )
+  package "rewriter2" (
+    directory = "rewriter2"
+    description = "ppx rewriter expander"
+    requires = "foobar"
+    archive(byte) = "foobar_rewriter2.cma"
+    archive(native) = "foobar_rewriter2.cmxa"
+    plugin(byte) = "foobar_rewriter2.cma"
+    plugin(native) = "foobar_rewriter2.cmxs"
+    # This is what dune uses to find out the runtime dependencies of
+    # a preprocessor
+    ppx_runtime_deps = "foobar.runtime-lib2"
+  )
+  package "runtime-lib2" (
+    directory = "runtime-lib2"
+    description = "runtime library for foobar.rewriter2"
+    requires = ""
+    archive(byte) = "foobar_runtime_lib2.cma"
+    archive(native) = "foobar_runtime_lib2.cmxa"
+    plugin(byte) = "foobar_runtime_lib2.cma"
+    plugin(native) = "foobar_runtime_lib2.cmxs"
+    jsoo_runtime = "foobar_runtime.js foobar_runtime2.js"
+  )
+  package "sub" (
+    directory = "sub"
+    description = "sub library in a sub dir"
+    requires = "bytes"
+    archive(byte) = "foobar_sub.cma"
+    archive(native) = ""
+    plugin(byte) = "foobar_sub.cma"
+    plugin(native) = ""
+  )
+
+  $ echo '(lang dune 3.17)' > dune-project
   $ dune runtest --force
   description = "contains \"quotes\""
   requires = "bytes"