balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/version2' into 'dev'

Browse Source 
Add --version via dune rule

See merge request ligolang/ligo!254
This commit is contained in:
Gabriel Alfour 2019-12-13 12:20:24 +00:00
commit 36794120f0
3 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/cli.ml
View File

@ -2,11 +2,18 @@ open Cmdliner
open Trace
open Cli_helpers
let version =
Format.asprintf
"Rolling release\nHash: %s\nDate: %s\nCI job id: %s"
Version.hash
Version.commit_date
Version.job_id
let main =
let man =
[ `S "MORE HELP";
`P "Use `$(mname) $(i,COMMAND) --help' for help on a single command." ] in
(Term.(ret (const (`Help (`Auto, None)))), Term.info "ligo" ~man)
(Term.(ret (const (`Help (`Auto, None)))), Term.info "ligo" ~version ~man)
let source_file n =
let open Arg in

9
src/bin/dune
View File

@ -5,13 +5,20 @@
cmdliner
ligo
)
(modules cli cli_helpers)
(modules cli cli_helpers version)
(preprocess
(pps ppx_let)
)
(flags (:standard -open Simple_utils))
)
(rule
(targets version.ml)
(action (with-stdout-to
version.ml
(run "sh" "-c"
"printf 'let hash = \"%s\"\nlet commit_date = \"%s\"\nlet job_id = \"%s\"\n' \"$(git rev-parse HEAD)\" \"$(git show --no-patch --format=%ci)\" \"${CI_JOB_ID}\""))))
(executable
(name runligo)
(public_name ligo)

45
src/bin/expect_tests/help_tests.ml
View File

@ -51,7 +51,10 @@ let%expect_test _ =
--help[=FMT] (default=auto)
Show this help in format FMT. The value FMT must be one of `auto',
`pager', `groff' or `plain'. With `auto', the format is `pager` or
`plain' whenever the TERM env var is `dumb' or undefined. |} ] ;
`plain' whenever the TERM env var is `dumb' or undefined.
--version
Show version information. |} ] ;
run_ligo_good [ "--help" ] ;
[%expect {|
@ -102,7 +105,10 @@ let%expect_test _ =
--help[=FMT] (default=auto)
Show this help in format FMT. The value FMT must be one of `auto',
`pager', `groff' or `plain'. With `auto', the format is `pager` or
`plain' whenever the TERM env var is `dumb' or undefined. |} ] ;
`plain' whenever the TERM env var is `dumb' or undefined.
--version
Show version information. |} ] ;
run_ligo_good [ "compile-contract" ; "--help" ] ;
[%expect {|
@ -142,7 +148,10 @@ let%expect_test _ =
-s SYNTAX, --syntax=SYNTAX (absent=auto)
SYNTAX is the syntax that will be used. Currently supported
syntaxes are "pascaligo" and "cameligo". By default, the syntax is
guessed from the extension (.ligo and .mligo, respectively). |} ] ;
guessed from the extension (.ligo and .mligo, respectively).
--version
Show version information. |} ] ;
run_ligo_good [ "compile-parameter" ; "--help" ] ;
[%expect {|
@ -188,7 +197,10 @@ let%expect_test _ =
-s SYNTAX, --syntax=SYNTAX (absent=auto)
SYNTAX is the syntax that will be used. Currently supported
syntaxes are "pascaligo" and "cameligo". By default, the syntax is
guessed from the extension (.ligo and .mligo, respectively). |} ] ;
guessed from the extension (.ligo and .mligo, respectively).
--version
Show version information. |} ] ;
run_ligo_good [ "compile-storage" ; "--help" ] ;
[%expect {|
@ -235,7 +247,10 @@ let%expect_test _ =
-s SYNTAX, --syntax=SYNTAX (absent=auto)
SYNTAX is the syntax that will be used. Currently supported
syntaxes are "pascaligo" and "cameligo". By default, the syntax is
guessed from the extension (.ligo and .mligo, respectively). |} ] ;
guessed from the extension (.ligo and .mligo, respectively).
--version
Show version information. |} ] ;
run_ligo_good [ "dry-run" ; "--help" ] ;
[%expect {|
@ -287,7 +302,10 @@ let%expect_test _ =
SENDER is the sender the dry-run transaction will use.
--source=SOURCE
SOURCE is the source the dry-run transaction will use. |} ] ;
SOURCE is the source the dry-run transaction will use.
--version
Show version information. |} ] ;
run_ligo_good [ "run-function" ; "--help" ] ;
[%expect {|
@ -336,7 +354,10 @@ let%expect_test _ =
SENDER is the sender the dry-run transaction will use.
--source=SOURCE
SOURCE is the source the dry-run transaction will use. |} ] ;
SOURCE is the source the dry-run transaction will use.
--version
Show version information. |} ] ;
run_ligo_good [ "evaluate-value" ; "--help" ] ;
[%expect {|
@ -380,7 +401,10 @@ let%expect_test _ =
SENDER is the sender the dry-run transaction will use.
--source=SOURCE
SOURCE is the source the dry-run transaction will use. |} ] ;
SOURCE is the source the dry-run transaction will use.
--version
Show version information. |} ] ;
run_ligo_good [ "compile-expression" ; "--help" ] ;
[%expect {|
@ -416,4 +440,7 @@ let%expect_test _ =
--michelson-format=MICHELSON_FORMAT (absent=text)
MICHELSON_FORMAT is the format that will be used by
compile-contract for the resulting Michelson. Available formats
are 'text' (default), 'json' and 'hex'. |} ] ;
are 'text' (default), 'json' and 'hex'.
--version
Show version information. |} ] ;