From 7d172e090521cdcf606052622f35ca77b478eb8b Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Fri, 10 Oct 2025 11:11:34 +0200 Subject: [PATCH 1/2] Fix typo (spell check) --- dune-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dune-project b/dune-project index e563f53..491f786 100644 --- a/dune-project +++ b/dune-project @@ -15,7 +15,7 @@ (documentation "https://mbarbin.github.io/fpath-base/") -;; The value for the [implicit_transtive_deps] option is set during the CI +;; The value for the [implicit_transitive_deps] option is set during the CI ;; depending on the OCaml compiler version. ;; ;; This will be set to [false] iif [ocaml-version >= 5.2]. From dacf6a359297208d2536ccfe7f42fddddd9abfa9 Mon Sep 17 00:00:00 2001 From: Mathieu Barbin Date: Fri, 10 Oct 2025 12:39:41 +0200 Subject: [PATCH 2/2] Regroup dev targets and dependencies into a dev opam pkg --- dune-project | 58 ++++++++++++++++++++++++++++++++++++------- fpath-base-dev.opam | 52 ++++++++++++++++++++++++++++++++++++++ fpath-base-tests.opam | 4 --- 3 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 fpath-base-dev.opam diff --git a/dune-project b/dune-project index 491f786..3f2e399 100644 --- a/dune-project +++ b/dune-project @@ -55,27 +55,69 @@ (package (name fpath-base-tests) (synopsis "Tests for fpath-base") + (depends + (ocaml + (>= 5.2)) + (base + (>= v0.17)) + (base_quickcheck + (>= v0.17)) + (expect_test_helpers_core + (>= v0.17)) + (fpath + (>= 0.7.3)) + (fpath-base + (= :version)) + (fpath-sexp0 + (= :version)) + (ppx_compare + (>= v0.17)) + (ppx_enumerate + (>= v0.17)) + (ppx_expect + (>= v0.17)) + (ppx_hash + (>= v0.17)) + (ppx_here + (>= v0.17)) + (ppx_let + (>= v0.17)) + (ppx_sexp_conv + (>= v0.17)) + (ppx_sexp_value + (>= v0.17)) + (ppxlib + (>= 0.33)) + (re + (>= 1.8.0)) + (sexp_pretty + (>= v0.17)) + (stdio + (>= v0.17)))) + +(package + (name fpath-base-dev) + (synopsis "Package to regroup dev targets, documentation, and more") + (allow_empty) (depends (ocaml (>= 5.2)) (ocamlformat - (and - :with-dev-setup - (= 0.27.0))) + (= 0.27.0)) (base (>= v0.17)) (base_quickcheck (>= v0.17)) (bisect_ppx - (and - :with-dev-setup - (>= 2.8.3))) + (>= 2.8.3)) (expect_test_helpers_core (>= v0.17)) (fpath (>= 0.7.3)) (fpath-base (= :version)) + (fpath-base-tests + (= :version)) (fpath-sexp0 (= :version)) (ppx_compare @@ -89,9 +131,7 @@ (ppx_here (>= v0.17)) (ppx_js_style - (and - :with-dev-setup - (>= v0.17))) + (>= v0.17)) (ppx_let (>= v0.17)) (ppx_sexp_conv diff --git a/fpath-base-dev.opam b/fpath-base-dev.opam new file mode 100644 index 0000000..e341b13 --- /dev/null +++ b/fpath-base-dev.opam @@ -0,0 +1,52 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "Package to regroup dev targets, documentation, and more" +maintainer: ["Mathieu Barbin "] +authors: ["Mathieu Barbin"] +license: "MIT" +homepage: "https://github.com/mbarbin/fpath-base" +doc: "https://mbarbin.github.io/fpath-base/" +bug-reports: "https://github.com/mbarbin/fpath-base/issues" +depends: [ + "dune" {>= "3.17"} + "ocaml" {>= "5.2"} + "ocamlformat" {= "0.27.0"} + "base" {>= "v0.17"} + "base_quickcheck" {>= "v0.17"} + "bisect_ppx" {>= "2.8.3"} + "expect_test_helpers_core" {>= "v0.17"} + "fpath" {>= "0.7.3"} + "fpath-base" {= version} + "fpath-base-tests" {= version} + "fpath-sexp0" {= version} + "ppx_compare" {>= "v0.17"} + "ppx_enumerate" {>= "v0.17"} + "ppx_expect" {>= "v0.17"} + "ppx_hash" {>= "v0.17"} + "ppx_here" {>= "v0.17"} + "ppx_js_style" {>= "v0.17"} + "ppx_let" {>= "v0.17"} + "ppx_sexp_conv" {>= "v0.17"} + "ppx_sexp_value" {>= "v0.17"} + "ppxlib" {>= "0.33"} + "re" {>= "1.8.0"} + "sexp_pretty" {>= "v0.17"} + "stdio" {>= "v0.17"} + "sherlodoc" {with-doc & >= "0.2"} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/mbarbin/fpath-base.git" diff --git a/fpath-base-tests.opam b/fpath-base-tests.opam index fc824e5..1b7892f 100644 --- a/fpath-base-tests.opam +++ b/fpath-base-tests.opam @@ -10,10 +10,8 @@ bug-reports: "https://github.com/mbarbin/fpath-base/issues" depends: [ "dune" {>= "3.17"} "ocaml" {>= "5.2"} - "ocamlformat" {with-dev-setup & = "0.27.0"} "base" {>= "v0.17"} "base_quickcheck" {>= "v0.17"} - "bisect_ppx" {with-dev-setup & >= "2.8.3"} "expect_test_helpers_core" {>= "v0.17"} "fpath" {>= "0.7.3"} "fpath-base" {= version} @@ -23,7 +21,6 @@ depends: [ "ppx_expect" {>= "v0.17"} "ppx_hash" {>= "v0.17"} "ppx_here" {>= "v0.17"} - "ppx_js_style" {with-dev-setup & >= "v0.17"} "ppx_let" {>= "v0.17"} "ppx_sexp_conv" {>= "v0.17"} "ppx_sexp_value" {>= "v0.17"} @@ -31,7 +28,6 @@ depends: [ "re" {>= "1.8.0"} "sexp_pretty" {>= "v0.17"} "stdio" {>= "v0.17"} - "sherlodoc" {with-doc & >= "0.2"} "odoc" {with-doc} ] build: [