Merge pull request #15 from mbarbin/cmdlang

Upgrade to cmdlang.0.0.4

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
 #           janestreet-bleeding-external: https://github.com/janestreet/opam-repository.git#external-packages
 
       - name: Install dependencies
-        run: opam install . --deps-only --with-doc --with-test
+        run: opam install . --deps-only --with-doc --with-test --with-dev-setup
 
       - name: Build
         run: opam exec -- dune build @all @lint

CHANGES.md

@@ -1,11 +1,17 @@
+## 0.3.1 (2024-09-07)
+
+### Changed
+
+- Upgrade to latest `cmdlang`.
+
 ## 0.3.0 (2024-08-23)
 
 ### Changed
 
 - Switch from `Error_log` to `Err` for error handling.
 - Internal refactors, switch from `Core` to `Base` in assorted places.
 - Split main packages into separate smaller ones.
-- Switch to `commandlang` with `cmdliner` as a backend for all commands. Breaking changes:
+- Switch to `cmdlang` with `cmdliner` as a backend for all commands. Breaking changes:
   - Flags and named command line arguments now have 2 '--' instead of 1.
   - Exit code changes, using now cmdliner default conventions (123, 124, 125).
 

Makefile

@@ -20,7 +20,7 @@ lint:
 
 .PHONY: deps
 deps:
-	opam install . --deps-only --with-doc --with-test
+	opam install . --deps-only --with-doc --with-test --with-dev-setup
 
 .PHONY: doc
 doc:

bin/dune

@@ -2,5 +2,5 @@
  (name main)
  (package bopkit)
  (public_name bopkit)
- (libraries bopkit_command commandlang-to-cmdliner)
+ (libraries bopkit_command cmdlang-to-cmdliner)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))

bin/main.ml

@@ -1,3 +1 @@
-let () =
-  Commandlang_to_cmdliner.run Bopkit_command.main ~name:"bopkit" ~version:"%%VERSION%%"
-;;
+let () = Cmdlang_to_cmdliner.run Bopkit_command.main ~name:"bopkit" ~version:"%%VERSION%%"

bopkit-tests.opam

@@ -10,27 +10,29 @@ bug-reports: "https://github.com/mbarbin/bopkit/issues"
 depends: [
   "dune" {>= "3.16"}
   "ocaml" {>= "5.2"}
+  "ocamlformat" {with-dev-setup & = "0.26.2"}
   "ANSITerminal" {>= "0.8.3"}
   "appendable-list" {>= "v0.17" & < "v0.18"}
-  "auto-format" {>= "0.0.11"}
+  "auto-format" {>= "0.0.12"}
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
+  "cmdlang" {>= "0.0.4"}
+  "cmdlang-to-cmdliner" {>= "0.0.4"}
   "cmdliner" {= "1.3.0"}
-  "commandlang" {>= "0.0.2"}
-  "commandlang-to-cmdliner" {>= "0.0.2"}
+  "comments-parser" {>= "0.2.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err0" {>= "0.0.2"}
-  "err0-handler" {>= "0.0.2"}
+  "err" {>= "0.0.4"}
+  "err-cli" {>= "0.0.4"}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "fpath" {>= "0.7.3"}
-  "fpath-base" {>= "0.0.9"}
+  "fpath-base" {>= "0.2.0"}
   "graphics" {>= "5.1.2"}
-  "loc0" {>= "0.1.0"}
+  "loc" {>= "0.2.0"}
   "mdx" {>= "2.4"}
   "menhir" {>= "20220210"}
-  "parsing-utils" {>= "0.0.8"}
+  "parsing-utils" {>= "0.2.0"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
@@ -39,7 +41,7 @@ depends: [
   "ppx_fields_conv" {>= "v0.17" & < "v0.18"}
   "ppx_hash" {>= "v0.17" & < "v0.18"}
   "ppx_here" {>= "v0.17" & < "v0.18"}
-  "ppx_js_style" {dev & >= "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"}

bopkit.opam

@@ -12,32 +12,32 @@ depends: [
   "ocaml" {>= "5.2"}
   "ANSITerminal" {>= "0.8.3"}
   "appendable-list" {>= "v0.17" & < "v0.18"}
-  "auto-format" {>= "0.0.11"}
+  "auto-format" {>= "0.0.12"}
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
+  "cmdlang" {>= "0.0.4"}
+  "cmdlang-to-cmdliner" {>= "0.0.4"}
   "cmdliner" {= "1.3.0"}
-  "commandlang" {>= "0.0.2"}
-  "commandlang-to-cmdliner" {>= "0.0.2"}
+  "comments-parser" {>= "0.2.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err0" {>= "0.0.2"}
-  "err0-handler" {>= "0.0.2"}
+  "err" {>= "0.0.4"}
+  "err-cli" {>= "0.0.4"}
   "fpath" {>= "0.7.3"}
-  "fpath-base" {>= "0.0.9"}
+  "fpath-base" {>= "0.2.0"}
   "graphics" {>= "5.1.2"}
-  "loc0" {>= "0.1.0"}
+  "loc" {>= "0.2.0"}
   "mdx" {>= "2.4"}
   "menhir" {>= "20220210"}
-  "parsing-utils" {>= "0.0.8"}
+  "parsing-utils" {>= "0.2.0"}
   "pp" {>= "1.2.0"}
   "pp-extended" {>= "0.0.2"}
   "ppx_compare" {>= "v0.17" & < "v0.18"}
   "ppx_enumerate" {>= "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" {dev & >= "v0.17" & < "v0.18"}
   "ppx_let" {>= "v0.17" & < "v0.18"}
   "ppx_sexp_conv" {>= "v0.17" & < "v0.18"}
   "ppx_sexp_value" {>= "v0.17" & < "v0.18"}

doc/dune

@@ -1 +1,2 @@
-(mdx)
+(mdx
+ (package bopkit-tests))

doc/reference/dune

@@ -1,4 +1,5 @@
 (mdx
+ (package bopkit-tests)
  (deps
   (package bopkit)
   (glob_files *.bop)))
@@ -19,6 +20,7 @@
     (run dune format-dune-file)))))
 
 (cram
+ (package bopkit-tests)
  (deps
   (package bopkit)
   %{bin:bopkit}