Merge pull request #198 from minishrink/v6_fix

Document and build daemon CLIs for debugging

Author: mseri

INSTALL.md

@@ -10,3 +10,11 @@ This repository contains
      * configuration file parsing
      * argument parsing
      * RPCs
+  3. The following CLI tools for debugging:
+     * lib/channel_helper.exe -- a channel passing helper CLI
+     * memory/memory_cli.exe -- a squeezed debugging CLI
+     * v6/v6_cli.exe -- a V6d debugging CLI
+     * cluster/cluster_cli.exe -- a xapi-clusterd debugging CLI
+
+      To build these, run: `jbuilder build path/to/exec.exe`.
+      To run: `./_build/default/path/to/exec.exe`.

README.md

@@ -40,5 +40,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
 
 (alias
  ((name runtest)
-  (deps (example.exe))))
+  (deps (example.exe))
+  (action (run ${<}))))
 |} flags coverage_rewriter

example/jbuild

@@ -92,8 +92,4 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
     lwt
     lwt.unix
     xcp))))
-
-(alias
- ((name runtest)
-  (deps (channel_helper.exe))))
 |} runtime_coverage_enabled flags coverage_dep coverage_rewriter flags coverage_rewriter flags

lib/jbuild

@@ -48,8 +48,4 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
     rpclib.cmdliner
     rpclib.markdown
     xcp.memory))))
-
-(alias
- ((name runtest)
-  (deps (memory_cli.exe))))
 |} flags coverage_rewriter

memory/jbuild

@@ -15,7 +15,7 @@ let flags = function
     in
     go ic ""
 
-let rewriters_ppx = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
+let rewriters_ppx = ["ppx_deriving_rpc"]
 let flags = flags rewriters_ppx
 
 let coverage_rewriter =
@@ -32,10 +32,21 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  ((name xcp_v6)
   (public_name xcp.v6)
   (flags (:standard -w -39 %s))
+  (modules (:standard \ v6_cli ))
   (libraries
    (rpclib
     threads
     xcp))
   (wrapped false)
   %s))
+
+(executable
+ ((name v6_cli)
+  (modules (v6_cli))
+  (libraries
+   (cmdliner
+    rpclib.cmdliner
+    rpclib.markdown
+    xcp.v6))))
+
 |} flags coverage_rewriter