Merge PR #8646: [dune] Add `(package coq)` scope to artifacts.

7 files changed, 15 insertions, 1 deletions

diff --git a/checker/dune b/checker/dune
index d520171f98..ebb3dd7583 100644
--- a/checker/dune
+++ b/checker/dune
@@ -19,6 +19,7 @@
 (executable
  (name main)
  (public_name coqchk)
+ (package coq)
  (modules main)
  (flags :standard -open Checklib)
  (libraries coq.checklib))
@@ -26,6 +27,7 @@
 (executable
  (name votour)
  (public_name votour)
+ (package coq)
  (modules votour)
  (flags :standard -open Checklib)
  (libraries coq.checklib))
diff --git a/coqpp/dune b/coqpp/dune
index 24b9b9184b..a6edf4cf5b 100644
--- a/coqpp/dune
+++ b/coqpp/dune
@@ -4,5 +4,6 @@
 (executable
  (name coqpp_main)
  (public_name coqpp)
+ (package coq)
  (modules coqpp_ast coqpp_lex coqpp_parse coqpp_main)
  (modules_without_implementation coqpp_ast))
diff --git a/grammar/dune b/grammar/dune
index 90847e7fb6..f03fe07607 100644
--- a/grammar/dune
+++ b/grammar/dune
@@ -18,6 +18,7 @@
 
 (install
  (section bin)
+ (package coq)
  (files coqp5 coqmlp5))
 
 (rule
diff --git a/tools/coq_dune.ml b/tools/coq_dune.ml
index 691f37b414..ff6cefdf24 100644
--- a/tools/coq_dune.ml
+++ b/tools/coq_dune.ml
@@ -194,7 +194,7 @@ let out_install fmt dir ff =
   let itarget = String.concat "/" dir in
   let ff = pmap (function | VO vo -> Some vo.target | _ -> None) ff in
   let pp_ispec fmt tg = fprintf fmt "(%s as %s)" tg (itarget^"/"^tg) in
-  fprintf fmt "(install@\n @[(section lib)@\n(files @[%a@])@])@\n"
+  fprintf fmt "(install@\n @[(section lib)@\n(package coq)@\n(files @[%a@])@])@\n"
     (pp_list pp_ispec sep) ff
 
 (* For each directory, we must record two things, the build rules and
diff --git a/tools/coqdoc/dune b/tools/coqdoc/dune
index b20d9f9b2e..9c0a6ccffe 100644
--- a/tools/coqdoc/dune
+++ b/tools/coqdoc/dune
@@ -1,5 +1,6 @@
 (install
  (section lib)
+ (package coq)
  (files
   (coqdoc.css as tools/coqdoc/coqdoc.css)
   (coqdoc.sty as tools/coqdoc/coqdoc.sty)))
@@ -7,6 +8,7 @@
 (executable
  (name main)
  (public_name coqdoc)
+ (package coq)
  (libraries str coq.config))
 
 (ocamllex cpretty)
diff --git a/tools/dune b/tools/dune
index 20048fde52..3358d1a4e2 100644
--- a/tools/dune
+++ b/tools/dune
@@ -1,5 +1,6 @@
 (install
  (section lib)
+ (package coq)
  (files
   (CoqMakefile.in as tools/CoqMakefile.in)
   (TimeFileMaker.py as tools/TimeFileMaker.py)
@@ -10,18 +11,21 @@
 (executable
  (name coq_makefile)
  (public_name coq_makefile)
+ (package coq)
  (modules coq_makefile)
  (libraries coq.lib))
 
 (executable
  (name coqc)
  (public_name coqc)
+ (package coq)
  (modules coqc)
  (libraries coq.toplevel))
 
 (executable
  (name coqdep)
  (public_name coqdep)
+ (package coq)
  (modules coqdep_lexer coqdep_common coqdep)
  (libraries coq.lib))
 
@@ -30,6 +34,7 @@
 (executable
  (name coqwc)
  (public_name coqwc)
+ (package coq)
  (modules coqwc)
  (libraries))
 
@@ -38,11 +43,13 @@
 (executable
  (name coq_tex)
  (public_name coq_tex)
+ (package coq)
  (modules coq_tex)
  (libraries str))
 
 (executable
  (name coq_dune)
  (public_name coq_dune)
+ (package coq)
  (modules coq_dune)
  (libraries str))
diff --git a/topbin/dune b/topbin/dune
index 5f07492a10..52f472d149 100644
--- a/topbin/dune
+++ b/topbin/dune
@@ -1,5 +1,6 @@
 (install
  (section bin)
+ (package coq)
  (files (coqtop_bin.exe as coqtop)))
 
 (executable