Changeset 65 in code for trunk


Ignore:
Timestamp:
Aug 20, 2024, 1:17:24 PM (8 months ago)
Author:
yakumo.izuru
Message:

Replace Cmdliner with Ocmd, re-add documentation

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

Location:
trunk
Files:
14 added
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r64 r65  
    2020        @cp _build/default/cli/txt.exe txt.exe
    2121        @strip txt.exe
    22         @tar czvf "logarion-${OS}-${MACHINE}-${DATE}-${COMMIT}" txt.exe readme.txt
     22        @tar czvf "kosuzu-${OS}-${MACHINE}-${DATE}-${COMMIT}" txt.exe readme.txt
    2323        @rm txt.exe
    2424install:

  • trunk/cli/authors.ml

    r3 r65  
    77        Person.Set.iter (fun x -> print_endline (Person.to_string x)) s
    88
    9 open Cmdliner
     9open Ocmd
    1010let term =
    1111        let recurse = Arg.(value & flag & info ["R"]

  • trunk/cli/convert.ml

    r43 r65  
    7777        | path -> Printf.eprintf "Path doesn't exist: %s" path
    7878
    79 open Cmdliner
     79open Ocmd
    8080let term =
    8181        let path = Arg.(value & pos 0 string "" & info [] ~docv:"path"

  • trunk/cli/edit.ml

    r56 r65  
    1 open Cmdliner
     1open Ocmd
    22let term =
    33        let id = Arg.(value & pos 0 string "" & info [] ~docv:"text ID") in

  • trunk/cli/file.ml

    r6 r65  
    1515        List.iter (fun d -> List.iter (unlink d) files) dirs
    1616
    17 open Cmdliner
     17open Ocmd
    1818let term =
    1919        let files = Arg.(value & pos_all string [] & info []

  • trunk/cli/index.ml

    r22 r65  
    6868        index { dir; index_path; pck = Header_pack.of_kv kv }
    6969
    70 open Cmdliner
     70open Ocmd
    7171let term =
    7272        let print= Arg.(value & flag & info ["print"] ~doc:"print info") in

  • trunk/cli/last.ml

    r17 r65  
    2121        | Some (_, f) -> List.iter print_endline f
    2222
    23 open Cmdliner
     23open Ocmd
    2424let term =
    2525        let mine = Arg.(value & flag & info ["mine"] ~doc:"last text authored by me") in

  • trunk/cli/listing.ml

    r60 r65  
    2020                | None -> FS.iter ~r ~dir ~predicate ~order list_text
    2121
    22 open Cmdliner
     22open Ocmd
    2323let term =
    2424        let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in

  • trunk/cli/new.ml

    r32 r65  
    11open Logarion
    2 open Cmdliner
     2open Ocmd
    33
    44let new_txt title topics_opt interactive =

  • trunk/cli/peers.ml

    r42 r65  
    2929                Logarion.Peers.fold print_peer ()
    3030
    31 open Cmdliner
     31open Ocmd
    3232let term =
    3333        let remove = Arg.(value & opt (some string) None & info ["remove"]

  • trunk/cli/pull.ml

    r42 r65  
    139139        | "" -> pull_list auths topics | x -> ignore (pull_index x auths topics)
    140140
    141 open Cmdliner
     141open Ocmd
    142142let term =
    143143        let authors = Arg.(value & opt (some string) None & info ["a"; "authors"]

  • trunk/cli/read.ml

    r25 r65  
    11open Logarion
    22
    3 open Cmdliner
     3open Ocmd
    44let term =
    55        let id = Arg.(value & pos 0 string "" & info [] ~docv:"text ID") in

  • trunk/cli/recent.ml

    r23 r65  
    33module A = Archive
    44
    5 open Cmdliner
     5open Ocmd
    66let term =
    77        let recurse = Arg.(value & flag & info ["R"] ~doc:"recurse, include subdirs") in

  • trunk/cli/topics.ml

    r3 r65  
    77        print_endline @@ String_set.to_string s
    88
    9 open Cmdliner
     9open Ocmd
    1010let term =
    1111        let recurse = Arg.(value & flag & info ["R"]

  • trunk/cli/txt.ml

    r61 r65  
    1 let version = "1.3.2"
    2 
    3 open Cmdliner
     1open Ocmd
    42let default_cmd =
    53        let doc = "Discover, collect & exchange texts" in
    64        let man = [ `S "CONTACT"; `P "<mailto:logarion-dev@chaotic.ninja>" ] in
    7         Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version ~doc ~man
     5        Term.(ret (const (`Help (`Pager, None)))), Term.info "txt" ~version:"%%VERSION%%" ~doc ~man
    86
    97let () = match Term.eval_choice default_cmd [

  • trunk/dune-project

    r64 r65  
    11(lang dune 2.0)
    22(name logarion)
    3 (version 1.3.2)
     3(version 1.4.0)
    44(license EUPL-1.2)
    55(authors "orbifx <fox@orbitalfox.eu>")
    … …  
    1414 (name logarion)
    1515 (synopsis "Texts archival and exchange")
    16  (depends (cmdliner (<= 1.0.4)) msgpck ocurl))
     16 (depends ocaml dune ocurl msgpck cmdliner))

  • trunk/logarion.opam

    r64 r65  
    88homepage: "https://suzunaan.chaotic.ninja/logarion/"
    99bug-reports: "mailto:logarion-dev@chaotic.ninja"
    10 depends: [
    11   "dune" {>= "2.0"}
    12   "cmdliner" {<= "1.0.4"}
    13   "msgpck"
    14   "ocurl"
    15 ]
     10depends: ["ocaml" "dune" "ocurl" "msgpck" "ocmd"]
    1611build: [
    1712  ["dune" "subst"] {pinned}
Note: See TracChangeset for help on using the changeset viewer.