From e880688d746806c79f024d345cf0074f536a89b2 Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Fri, 10 Jan 2025 15:13:20 +0100 Subject: [PATCH] Move mdx doc targets as separate package --- bopkit-dev.opam | 75 +++++++++++++++++ doc/dune | 2 +- doc/reference/dune | 4 +- dune-project | 130 +++++++++++++++++++++++++++++ editor/dune | 2 +- project/digital-watch/dune | 2 +- project/subleq/dune | 2 +- project/visa/doc/dune | 2 +- project/visa/lib/visa_dsl/src/dune | 2 +- project/visa/test/runtime/dune | 2 +- stdlib/7-segment/dune | 2 +- stdlib/bopboard/example/dune | 2 +- stdlib/counter/dune | 2 +- stdlib/pulse/dune | 2 +- stdlib/stdlib/dune | 2 +- tutorial/bdd/division/dune | 2 +- tutorial/bdd/dune | 2 +- tutorial/hello-world/dune | 2 +- tutorial/misc/dune | 2 +- 19 files changed, 223 insertions(+), 18 deletions(-) create mode 100644 bopkit-dev.opam diff --git a/bopkit-dev.opam b/bopkit-dev.opam new file mode 100644 index 0000000..bea1ebe --- /dev/null +++ b/bopkit-dev.opam @@ -0,0 +1,75 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: + "Package to regroup dev targets for the bopkit project, documentation, and more" +maintainer: ["Mathieu Barbin "] +authors: ["Mathieu Barbin"] +license: "MIT" +homepage: "https://github.com/mbarbin/bopkit" +doc: "https://mbarbin.github.io/bopkit/" +bug-reports: "https://github.com/mbarbin/bopkit/issues" +depends: [ + "dune" {>= "3.17"} + "ocaml" {>= "5.2"} + "ocamlformat" {with-dev-setup & = "0.27.0"} + "ANSITerminal" {>= "0.8.3"} + "appendable-list" {>= "v0.17" & < "v0.18"} + "auto-format" {>= "0.0.14"} + "base" {>= "v0.17" & < "v0.18"} + "base_quickcheck" {>= "v0.17" & < "v0.18"} + "bopkit" {= version} + "bopkit-dev" {= version} + "cmdlang" {>= "0.0.9"} + "cmdlang-cmdliner-runner" {>= "0.0.8"} + "cmdlang-to-cmdliner" {>= "0.0.9"} + "cmdliner" {>= "1.3.0"} + "comments-parser" {>= "0.2.2"} + "core" {>= "v0.17" & < "v0.18"} + "dune-site" {>= "3.17"} + "expect_test_helpers_core" {>= "v0.17" & < "v0.18"} + "fpath" {>= "0.7.3"} + "fpath-base" {>= "0.2.2"} + "graphics" {>= "5.1.2"} + "loc" {>= "0.2.0"} + "mdx" {>= "2.4"} + "menhir" {>= "20220210"} + "parsing-utils" {>= "0.2.2"} + "pp" {>= "2.0.0"} + "pp-extended" {>= "0.0.2"} + "pp-log" {>= "0.0.8"} + "ppx_compare" {>= "v0.17" & < "v0.18"} + "ppx_enumerate" {>= "v0.17" & < "v0.18"} + "ppx_expect" {>= "v0.17" & < "v0.18"} + "ppx_fields_conv" {>= "v0.17" & < "v0.18"} + "ppx_hash" {>= "v0.17" & < "v0.18"} + "ppx_here" {>= "v0.17" & < "v0.18"} + "ppx_js_style" {with-dev-setup & >= "v0.17" & < "v0.18"} + "ppx_let" {>= "v0.17" & < "v0.18"} + "ppx_sexp_conv" {>= "v0.17" & < "v0.18"} + "ppx_sexp_value" {>= "v0.17" & < "v0.18"} + "ppxlib" {>= "0.33"} + "stdio" {>= "v0.17" & < "v0.18"} + "stdune" {>= "3.17"} + "subleq" {= version} + "tsdl" {= "1.0.0"} + "tsdl-image" {>= "0.6"} + "visa" {= version} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "--promote-install-files=false" + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] + ["dune" "install" "-p" name "--create-install-files" name] +] +dev-repo: "git+https://github.com/mbarbin/bopkit.git" diff --git a/doc/dune b/doc/dune index 4e0d182..e006e8c 100644 --- a/doc/dune +++ b/doc/dune @@ -1,2 +1,2 @@ (mdx - (package bopkit-tests)) + (package bopkit-dev)) diff --git a/doc/reference/dune b/doc/reference/dune index b8f897e..45461f0 100644 --- a/doc/reference/dune +++ b/doc/reference/dune @@ -1,5 +1,5 @@ (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) @@ -20,7 +20,7 @@ (run dune format-dune-file))))) (cram - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) %{bin:bopkit} diff --git a/dune-project b/dune-project index 4ba4c0f..f417e62 100644 --- a/dune-project +++ b/dune-project @@ -453,3 +453,133 @@ (>= 0.6)) (visa (= :version)))) + +(package + (name bopkit-dev) + (synopsis + "Package to regroup dev targets for the bopkit project, documentation, and more") + (allow_empty) ; The package is attached to mdx stanzas however dune doesn't see it. + (depends + (ocaml + (>= 5.2)) + (ocamlformat + (and + :with-dev-setup + (= 0.27.0))) + (ANSITerminal + (>= 0.8.3)) + (appendable-list + (and + (>= v0.17) + (< v0.18))) + (auto-format + (>= 0.0.14)) + (base + (and + (>= v0.17) + (< v0.18))) + (base_quickcheck + (and + (>= v0.17) + (< v0.18))) + (bopkit + (= :version)) + (bopkit-dev + (= :version)) + (cmdlang + (>= 0.0.9)) + (cmdlang-cmdliner-runner + (>= 0.0.8)) + (cmdlang-to-cmdliner + (>= 0.0.9)) + (cmdliner + (>= 1.3.0)) + (comments-parser + (>= 0.2.2)) + (core + (and + (>= v0.17) + (< v0.18))) + (dune-site + (>= 3.17)) + (expect_test_helpers_core + (and + (>= v0.17) + (< v0.18))) + (fpath + (>= 0.7.3)) + (fpath-base + (>= 0.2.2)) + (graphics + (>= 5.1.2)) + (loc + (>= 0.2.0)) + (mdx + (>= 2.4)) + (menhir + (>= 20220210)) + (parsing-utils + (>= 0.2.2)) + (pp + (>= 2.0.0)) + (pp-extended + (>= 0.0.2)) + (pp-log + (>= 0.0.8)) + (ppx_compare + (and + (>= v0.17) + (< v0.18))) + (ppx_enumerate + (and + (>= v0.17) + (< v0.18))) + (ppx_expect + (and + (>= v0.17) + (< v0.18))) + (ppx_fields_conv + (and + (>= v0.17) + (< v0.18))) + (ppx_hash + (and + (>= v0.17) + (< v0.18))) + (ppx_here + (and + (>= v0.17) + (< v0.18))) + (ppx_js_style + (and + :with-dev-setup + (>= v0.17) + (< v0.18))) + (ppx_let + (and + (>= v0.17) + (< v0.18))) + (ppx_sexp_conv + (and + (>= v0.17) + (< v0.18))) + (ppx_sexp_value + (and + (>= v0.17) + (< v0.18))) + (ppxlib + (>= 0.33)) + (stdio + (and + (>= v0.17) + (< v0.18))) + (stdune + (>= 3.17)) + (subleq + (= :version)) + (tsdl + (= 1.0.0)) + (tsdl-image + (>= 0.6)) + (visa + (= :version)))) diff --git a/editor/dune b/editor/dune index ebc39be..59841ae 100644 --- a/editor/dune +++ b/editor/dune @@ -1,4 +1,4 @@ (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit))) diff --git a/project/digital-watch/dune b/project/digital-watch/dune index 22310cf..ede7c49 100644 --- a/project/digital-watch/dune +++ b/project/digital-watch/dune @@ -101,7 +101,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/project/subleq/dune b/project/subleq/dune index 48974f5..fa87903 100644 --- a/project/subleq/dune +++ b/project/subleq/dune @@ -1,5 +1,5 @@ (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.input))) diff --git a/project/visa/doc/dune b/project/visa/doc/dune index 941ef3a..d54610e 100644 --- a/project/visa/doc/dune +++ b/project/visa/doc/dune @@ -10,7 +10,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (package visa) diff --git a/project/visa/lib/visa_dsl/src/dune b/project/visa/lib/visa_dsl/src/dune index 47dff1c..ca488b9 100644 --- a/project/visa/lib/visa_dsl/src/dune +++ b/project/visa/lib/visa_dsl/src/dune @@ -17,5 +17,5 @@ ppx_sexp_value))) (mdx - (package bopkit-tests) + (package bopkit-dev) (files :standard - *.mli)) diff --git a/project/visa/test/runtime/dune b/project/visa/test/runtime/dune index c501260..5712221 100644 --- a/project/visa/test/runtime/dune +++ b/project/visa/test/runtime/dune @@ -26,7 +26,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) get_date.exe diff --git a/stdlib/7-segment/dune b/stdlib/7-segment/dune index 3f264ac..4c29c2f 100644 --- a/stdlib/7-segment/dune +++ b/stdlib/7-segment/dune @@ -27,7 +27,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/stdlib/bopboard/example/dune b/stdlib/bopboard/example/dune index 9108cc2..0209878 100644 --- a/stdlib/bopboard/example/dune +++ b/stdlib/bopboard/example/dune @@ -20,7 +20,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/stdlib/counter/dune b/stdlib/counter/dune index 3f8f8ca..843eab7 100644 --- a/stdlib/counter/dune +++ b/stdlib/counter/dune @@ -14,7 +14,7 @@ (run dune format-dune-file))))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/stdlib/pulse/dune b/stdlib/pulse/dune index b2298a2..e596e88 100644 --- a/stdlib/pulse/dune +++ b/stdlib/pulse/dune @@ -27,7 +27,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/stdlib/stdlib/dune b/stdlib/stdlib/dune index 12b2656..3bace25 100644 --- a/stdlib/stdlib/dune +++ b/stdlib/stdlib/dune @@ -27,7 +27,7 @@ (glob_files *.bop))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/tutorial/bdd/division/dune b/tutorial/bdd/division/dune index de2c379..2ff71be 100644 --- a/tutorial/bdd/division/dune +++ b/tutorial/bdd/division/dune @@ -145,7 +145,7 @@ (glob_files *.txt))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) div.exe diff --git a/tutorial/bdd/dune b/tutorial/bdd/dune index f6202a0..578a792 100644 --- a/tutorial/bdd/dune +++ b/tutorial/bdd/dune @@ -88,7 +88,7 @@ (glob_files *.txt))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop) diff --git a/tutorial/hello-world/dune b/tutorial/hello-world/dune index 069e908..a734958 100644 --- a/tutorial/hello-world/dune +++ b/tutorial/hello-world/dune @@ -20,7 +20,7 @@ (run dune format-dune-file))))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit) (glob_files *.bop))) diff --git a/tutorial/misc/dune b/tutorial/misc/dune index 662d503..32951cf 100644 --- a/tutorial/misc/dune +++ b/tutorial/misc/dune @@ -20,6 +20,6 @@ (package bopkit))) (mdx - (package bopkit-tests) + (package bopkit-dev) (deps (package bopkit)))