Merge pull request #16 from mbarbin/cmdlang

Upgrade to cmdlang.0.0.5
mbarbin · Sep 17, 2024 · cc128a5 · cc128a5
2 parents b9673a0 + 3ff988e
commit cc128a5
Show file tree

Hide file tree

Showing 31 changed files with 95 additions and 58 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,17 @@
+## 0.3.2 (unreleased)
+
+### Added
+
+### Changed
+
+- Upgrade to `cmdlang.0.0.5`.
+
+### Deprecated
+
+### Fixed
+
+### Removed
+
 ## 0.3.1 (2024-09-07)
 
 ### Changed

diff --git a/bin/dune b/bin/dune
@@ -2,5 +2,5 @@
  (name main)
  (package bopkit)
  (public_name bopkit)
- (libraries bopkit_command cmdlang-to-cmdliner)
+ (libraries bopkit_command cmdlang-cmdliner-runner)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))
diff --git a/bin/main.ml b/bin/main.ml
@@ -1 +1,3 @@
-let () = Cmdlang_to_cmdliner.run Bopkit_command.main ~name:"bopkit" ~version:"%%VERSION%%"
+let () =
+  Cmdlang_cmdliner_runner.run Bopkit_command.main ~name:"bopkit" ~version:"%%VERSION%%"
+;;
diff --git a/bopkit-tests.opam b/bopkit-tests.opam
@@ -16,15 +16,16 @@ depends: [
   "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"}
+  "cmdlang" {>= "0.0.5"}
+  "cmdlang-cmdliner-runner" {>= "0.0.5"}
+  "cmdlang-to-cmdliner" {>= "0.0.5"}
   "cmdliner" {= "1.3.0"}
   "comments-parser" {>= "0.2.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.4"}
-  "err-cli" {>= "0.0.4"}
+  "err" {>= "0.0.5"}
+  "err-cli" {>= "0.0.5"}
   "expect_test_helpers_core" {>= "v0.17" & < "v0.18"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}

diff --git a/bopkit.opam b/bopkit.opam
@@ -15,15 +15,16 @@ depends: [
   "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"}
+  "cmdlang" {>= "0.0.5"}
+  "cmdlang-cmdliner-runner" {>= "0.0.5"}
+  "cmdlang-to-cmdliner" {>= "0.0.5"}
   "cmdliner" {= "1.3.0"}
   "comments-parser" {>= "0.2.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.4"}
-  "err-cli" {>= "0.0.4"}
+  "err" {>= "0.0.5"}
+  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}
   "graphics" {>= "5.1.2"}

diff --git a/dune-project b/dune-project
@@ -50,9 +50,11 @@
     (>= v0.17)
     (< v0.18)))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
+  (cmdlang-cmdliner-runner
+   (>= 0.0.5))
   (cmdlang-to-cmdliner
-   (>= 0.0.4))
+   (>= 0.0.5))
   (cmdliner
    (= 1.3.0))
   (comments-parser
@@ -68,9 +70,9 @@
   (dune-site
    (>= 3.16))
   (err
-   (>= 0.0.4))
+   (>= 0.0.5))
   (err-cli
-   (>= 0.0.4))
+   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -159,9 +161,11 @@
   (bopkit
    (= :version))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
+  (cmdlang-cmdliner-runner
+   (>= 0.0.5))
   (cmdlang-to-cmdliner
-   (>= 0.0.4))
+   (>= 0.0.5))
   (cmdliner
    (= 1.3.0))
   (core
@@ -175,9 +179,9 @@
   (dune-site
    (>= 3.16))
   (err
-   (>= 0.0.4))
+   (>= 0.0.5))
   (err-cli
-   (>= 0.0.4))
+   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -262,9 +266,11 @@
   (bopkit
    (= :version))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
+  (cmdlang-cmdliner-runner
+   (>= 0.0.5))
   (cmdlang-to-cmdliner
-   (>= 0.0.4))
+   (>= 0.0.5))
   (cmdliner
    (= 1.3.0))
   (core
@@ -278,9 +284,9 @@
   (dune-site
    (>= 3.16))
   (err
-   (>= 0.0.4))
+   (>= 0.0.5))
   (err-cli
-   (>= 0.0.4))
+   (>= 0.0.5))
   (fpath
    (>= 0.7.3))
   (fpath-base
@@ -367,9 +373,11 @@
     (>= v0.17)
     (< v0.18)))
   (cmdlang
-   (>= 0.0.4))
+   (>= 0.0.5))
+  (cmdlang-cmdliner-runner
+   (>= 0.0.5))
   (cmdlang-to-cmdliner
-   (>= 0.0.4))
+   (>= 0.0.5))
   (cmdliner
    (= 1.3.0))
   (comments-parser
@@ -385,9 +393,9 @@
   (dune-site
    (>= 3.16))
   (err
-   (>= 0.0.4))
+   (>= 0.0.5))
   (err-cli
-   (>= 0.0.4))
+   (>= 0.0.5))
   (expect_test_helpers_core
    (and
     (>= v0.17)

diff --git a/editor/README.md b/editor/README.md
@@ -89,7 +89,7 @@ OPTIONS
 
        --verbosity=LEVEL
            Be more or less verbose. Takes over v.. LEVEL must be one of
-           'quiet', 'error', 'warning', 'info' or 'debug'.
+           'quiet', 'app', 'error', 'warning', 'info' or 'debug'.
 
        --warn-error
            treat warnings as errors.

diff --git a/lib/bopkit_block/src/bopkit_block.ml b/lib/bopkit_block/src/bopkit_block.ml
@@ -341,7 +341,7 @@ let main ?readme t_param =
 ;;
 
 let run ?readme t_param =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     (main ?readme t_param)
     ~name:"bopkit.block"
     ~version:"%%VERSION%%"

diff --git a/lib/bopkit_block/src/dune b/lib/bopkit_block/src/dune
@@ -19,7 +19,7 @@
  (libraries
   bit_utils
   cmdlang
-  cmdlang-to-cmdliner
+  cmdlang-cmdliner-runner
   cmdliner
   core
   core_unix

diff --git a/project/digital-watch/dune b/project/digital-watch/dune
@@ -12,7 +12,7 @@
   Stdio
   -open
   Cmdlang)
- (libraries base cmdlang cmdlang-to-cmdliner cmdliner graphics stdio threads)
+ (libraries base cmdlang cmdlang-cmdliner-runner graphics stdio threads)
  (preprocess
   (pps
    ppx_compare

diff --git a/project/digital-watch/remove_duplicates.ml b/project/digital-watch/remove_duplicates.ml
@@ -22,4 +22,4 @@ let main =
        done))
 ;;
 
-let () = Cmdlang_to_cmdliner.run main ~name:"remove_duplicate" ~version:"%%VERSION%%"
+let () = Cmdlang_cmdliner_runner.run main ~name:"remove_duplicate" ~version:"%%VERSION%%"
diff --git a/project/subleq/bin/dune b/project/subleq/bin/dune
@@ -2,5 +2,5 @@
  (name main)
  (package subleq)
  (public_name subleq)
- (libraries cmdlang-to-cmdliner subleq_command)
+ (libraries cmdlang-cmdliner-runner subleq_command)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))
diff --git a/project/subleq/bin/main.ml b/project/subleq/bin/main.ml
@@ -1 +1,3 @@
-let () = Cmdlang_to_cmdliner.run Subleq_command.main ~name:"subleq" ~version:"%%VERSION%%"
+let () =
+  Cmdlang_cmdliner_runner.run Subleq_command.main ~name:"subleq" ~version:"%%VERSION%%"
+;;
diff --git a/project/visa/bin/dune b/project/visa/bin/dune
@@ -2,5 +2,5 @@
  (name main)
  (package visa)
  (public_name visa)
- (libraries cmdlang-to-cmdliner visa_command)
+ (libraries cmdlang-cmdliner-runner visa_command)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))
diff --git a/project/visa/bin/main.ml b/project/visa/bin/main.ml
@@ -1 +1 @@
-let () = Cmdlang_to_cmdliner.run Visa_command.main ~name:"visa" ~version:"%%VERSION%%"
+let () = Cmdlang_cmdliner_runner.run Visa_command.main ~name:"visa" ~version:"%%VERSION%%"
diff --git a/project/visa/circuit/dune b/project/visa/circuit/dune
@@ -172,7 +172,15 @@
   Stdio
   -open
   Cmdlang)
- (libraries base bopkit_block cmdlang core stdio unix threads)
+ (libraries
+  base
+  bopkit_block
+  cmdlang
+  cmdlang-cmdliner-runner
+  core
+  stdio
+  unix
+  threads)
  (preprocess
   (pps
    ppx_compare

diff --git a/project/visa/circuit/get_date.ml b/project/visa/circuit/get_date.ml
@@ -33,4 +33,4 @@ let cmd =
      ())
 ;;
 
-let () = Cmdlang_to_cmdliner.run cmd ~name:"get_date" ~version:"%%VERSION%%"
+let () = Cmdlang_cmdliner_runner.run cmd ~name:"get_date" ~version:"%%VERSION%%"
diff --git a/stdlib/7-segment/bin/digital_calendar.ml b/stdlib/7-segment/bin/digital_calendar.ml
@@ -1,5 +1,5 @@
 let () =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     Seven_segment_display.Main.digital_calendar
     ~name:"bopkit"
     ~version:"%%VERSION%%"

diff --git a/stdlib/7-segment/bin/digital_calendar_display.ml b/stdlib/7-segment/bin/digital_calendar_display.ml
@@ -1,5 +1,5 @@
 let () =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     Seven_segment_display.digital_calendar_display
     ~name:"digital_calendar_display"
     ~version:"%%VERSION%%"

diff --git a/stdlib/7-segment/bin/digital_watch.ml b/stdlib/7-segment/bin/digital_watch.ml
@@ -1,5 +1,5 @@
 let () =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     Seven_segment_display.Main.digital_watch
     ~name:"digital_watch"
     ~version:"%%VERSION%%"

diff --git a/stdlib/7-segment/bin/digital_watch_display.ml b/stdlib/7-segment/bin/digital_watch_display.ml
@@ -1,5 +1,5 @@
 let () =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     Seven_segment_display.digital_watch_display
     ~name:"digital_watch_display"
     ~version:"%%VERSION%%"

diff --git a/stdlib/7-segment/bin/dune b/stdlib/7-segment/bin/dune
@@ -5,7 +5,7 @@
   digital_calendar
   digital_calendar_display)
  (flags -w +a-40-42-44-66 -warn-error +a)
- (libraries base cmdlang-to-cmdliner seven_segment_display)
+ (libraries base cmdlang-cmdliner-runner seven_segment_display)
  (preprocess
   (pps
    ppx_compare

diff --git a/stdlib/bopboard/bin/dune b/stdlib/bopboard/bin/dune
@@ -1,7 +1,7 @@
 (executables
  (names main)
  (flags -w +a-40-42-44-66 -warn-error +a)
- (libraries bopboard cmdliner cmdlang-to-cmdliner))
+ (libraries bopboard cmdlang-cmdliner-runner))
 
 (install
  (package bopkit)

diff --git a/stdlib/bopboard/bin/main.ml b/stdlib/bopboard/bin/main.ml
@@ -1 +1 @@
-let () = Cmdlang_to_cmdliner.run Bopboard.main ~name:"bopboard" ~version:"%%VERSION%%"
+let () = Cmdlang_cmdliner_runner.run Bopboard.main ~name:"bopboard" ~version:"%%VERSION%%"
diff --git a/stdlib/counter/bin/counter.ml b/stdlib/counter/bin/counter.ml
@@ -1,5 +1,5 @@
 let () =
-  Cmdlang_to_cmdliner.run
+  Cmdlang_cmdliner_runner.run
     Bopkit_counter.Counter.main
     ~name:"counter"
     ~version:"%%VERSION%%"

diff --git a/stdlib/counter/bin/dune b/stdlib/counter/bin/dune
@@ -1,6 +1,6 @@
 (executables
  (names counter)
- (libraries bopkit_counter cmdliner cmdlang-to-cmdliner))
+ (libraries bopkit_counter cmdlang-cmdliner-runner))
 
 (install
  (package bopkit)

diff --git a/stdlib/pulse/bin/pulse.ml b/stdlib/pulse/bin/pulse.ml
@@ -1,3 +1,3 @@
 let () =
-  Cmdlang_to_cmdliner.run Bopkit_pulse.Pulse.main ~name:"pulse" ~version:"%%VERSION%%"
+  Cmdlang_cmdliner_runner.run Bopkit_pulse.Pulse.main ~name:"pulse" ~version:"%%VERSION%%"
 ;;
diff --git a/subleq.opam b/subleq.opam
@@ -16,14 +16,15 @@ depends: [
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
   "bopkit" {= version}
-  "cmdlang" {>= "0.0.4"}
-  "cmdlang-to-cmdliner" {>= "0.0.4"}
+  "cmdlang" {>= "0.0.5"}
+  "cmdlang-cmdliner-runner" {>= "0.0.5"}
+  "cmdlang-to-cmdliner" {>= "0.0.5"}
   "cmdliner" {= "1.3.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.4"}
-  "err-cli" {>= "0.0.4"}
+  "err" {>= "0.0.5"}
+  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}
   "graphics" {>= "5.1.2"}

diff --git a/test/bop2c/gen-dune/dune b/test/bop2c/gen-dune/dune
@@ -14,8 +14,7 @@
   auto-format
   base
   cmdlang
-  cmdlang-to-cmdliner
-  cmdliner
+  cmdlang-cmdliner-runner
   eio
   eio_main
   parsing-utils)

diff --git a/test/bop2c/gen-dune/main.ml b/test/bop2c/gen-dune/main.ml
@@ -73,4 +73,4 @@ let gen_dune_cmd =
          Stdlib.print_endline (Sexp.to_string_hum sexp))))
 ;;
 
-let () = Cmdlang_to_cmdliner.run gen_dune_cmd ~name:"gen-dune" ~version:"%%VERSION%%"
+let () = Cmdlang_cmdliner_runner.run gen_dune_cmd ~name:"gen-dune" ~version:"%%VERSION%%"
diff --git a/visa.opam b/visa.opam
@@ -16,14 +16,15 @@ depends: [
   "base" {>= "v0.17" & < "v0.18"}
   "base_quickcheck" {>= "v0.17" & < "v0.18"}
   "bopkit" {= version}
-  "cmdlang" {>= "0.0.4"}
-  "cmdlang-to-cmdliner" {>= "0.0.4"}
+  "cmdlang" {>= "0.0.5"}
+  "cmdlang-cmdliner-runner" {>= "0.0.5"}
+  "cmdlang-to-cmdliner" {>= "0.0.5"}
   "cmdliner" {= "1.3.0"}
   "core" {>= "v0.17" & < "v0.18"}
   "core_unix" {>= "v0.17" & < "v0.18"}
   "dune-site" {>= "3.16"}
-  "err" {>= "0.0.4"}
-  "err-cli" {>= "0.0.4"}
+  "err" {>= "0.0.5"}
+  "err-cli" {>= "0.0.5"}
   "fpath" {>= "0.7.3"}
   "fpath-base" {>= "0.2.0"}
   "graphics" {>= "5.1.2"}