Cmdliner v2

Signed-off-by: Sora Morimoto <[email protected]>

Author: smorimoto

compiler/bin-jsoo_minify/jsoo_minify.ml

@@ -91,7 +91,7 @@ let main =
   let t = Cmdliner.Term.(const f $ Cmd_arg.options) in
   Cmdliner.Cmd.v Cmd_arg.info t
 
-let (_ : int) =
+let exit_code =
   try Cmdliner.Cmd.eval ~catch:false ~argv:Sys.argv main with
   | (Match_failure _ | Assert_failure _ | Not_found) as exc ->
       let backtrace = Printexc.get_backtrace () in
@@ -108,3 +108,5 @@ let (_ : int) =
   | exc ->
       Format.eprintf "%s: Error: %s@." Sys.argv.(0) (Printexc.to_string exc);
       exit 1
+
+let () = exit exit_code

compiler/bin-wasm_of_ocaml/wasmoo_link_wasm.ml

@@ -19,7 +19,7 @@
 
 open Js_of_ocaml_compiler.Stdlib
 
-let (_ : int) =
+let exit_code =
   try Cmdliner.Cmd.eval ~catch:false ~argv:Sys.argv Link_wasm.command with
   | (Match_failure _ | Assert_failure _ | Not_found) as exc ->
       let backtrace = Printexc.get_backtrace () in
@@ -36,3 +36,5 @@ let (_ : int) =
   | exc ->
       Format.eprintf "%s: Error: %s@." Sys.argv.(0) (Printexc.to_string exc);
       exit 1
+
+let () = exit exit_code

dune-project

@@ -23,7 +23,7 @@
   (ppxlib (>= 0.35))
   (ocaml-compiler-libs (>= v0.12.4))
   (re :with-test)
-  (cmdliner (>= 1.1.0))
+  (cmdliner (>= 2.0))
   (sedlex (>= 3.3))
   (qcheck :with-test)
   menhir
@@ -143,7 +143,7 @@
   (ppx_expect (and (>= v0.14.2) :with-test))
   (ppxlib (>= 0.35))
   (re :with-test)
-  (cmdliner (>= 1.1.0))
+  (cmdliner (>= 2.0))
   (opam-format :with-test)
   (sedlex (>= 2.3))
   menhir

js_of_ocaml-compiler.opam

@@ -19,7 +19,7 @@ depends: [
   "ppxlib" {>= "0.35"}
   "ocaml-compiler-libs" {>= "v0.12.4"}
   "re" {with-test}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "2.0"}
   "sedlex" {>= "3.3"}
   "qcheck" {with-test}
   "menhir"

wasm_of_ocaml-compiler.opam

@@ -19,7 +19,7 @@ depends: [
   "ppx_expect" {>= "v0.14.2" & with-test}
   "ppxlib" {>= "0.35"}
   "re" {with-test}
-  "cmdliner" {>= "1.1.0"}
+  "cmdliner" {>= "2.0"}
   "opam-format" {with-test}
   "sedlex" {>= "2.3"}
   "menhir"