Jbuilder: use --dev for running test and other minor improvments

Makefile

@@ -1,18 +1,20 @@
 
+DEV ?= --dev
+
 all:
-	@jbuilder build tezos.install --dev
+	@jbuilder build tezos.install ${DEV}
 	@cp _build/default/src/node_main.exe tezos-node
 	@cp _build/default/src/client_main.exe tezos-client
 	@cp _build/default/src/compiler_main.exe tezos-protocol-compiler
 
 doc-html:
-	@jbuilder build @doc --dev
+	@jbuilder build @doc ${DEV}
 
 build-test:
-	@jbuilder build @buildtest --dev
+	@jbuilder build @buildtest ${DEV}
 
 test:
-	@jbuilder runtest
+	@jbuilder runtest ${DEV}
 
 build-deps:
 	@./scripts/install_build_deps.sh

src/client/jbuild

@@ -3,10 +3,7 @@
 (library
  ((name client_lib)
   (public_name tezos.client)
-  (libraries (minutils
+  (libraries (node_shell
-              utils
-              cohttp
-              node_shell
               node_db
               node_updater
               tezos_protocol_compiler))

src/minutils/jbuild

@@ -1,11 +1,11 @@
 (jbuild_version 1)
 
 (library
-    ((name minutils)
+ ((name minutils)
-     (public_name tezos.minutils)
+  (public_name tezos.minutils)
-     (libraries (cstruct
+  (libraries (cstruct
-                 lwt
+              lwt
-                 ocplib-json-typed.bson
+              ocplib-json-typed.bson
-                 ocplib-resto.directory))
+              ocplib-resto.directory))
-     (flags (:standard -w -9+27-30-32-40@8 -safe-string))
+  (flags (:standard -w -9+27-30-32-40@8 -safe-string))
-     (wrapped false)))
+  (wrapped false)))

src/node/shell/jbuild

@@ -3,7 +3,7 @@
 (library
  ((name node_shell)
   (public_name tezos.node.shell)
-  (libraries (utils minutils node_net node_db node_updater ezjsonm ocplib-json-typed.bson))
+  (libraries (node_net node_db node_updater))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Error_monad

src/proto/alpha/jbuild

@@ -25,32 +25,32 @@ let () =
     } end) in ()"))))
 
 (library
-  ((name tezos_protocol_environment_alpha)
+ ((name tezos_protocol_environment_alpha)
-   (public_name tezos.protocol_environment.alpha)
+  (public_name tezos.protocol_environment.alpha)
-   (library_flags (:standard -linkall -w -9 -safe-string))
+  (library_flags (:standard -linkall -w -9 -safe-string))
-   (libraries (node_updater))
+  (libraries (node_updater))
-   (modules (Environment))))
+  (modules (Environment))))
 
 (library
-  ((name tezos_embedded_raw_protocol_alpha)
+ ((name tezos_embedded_raw_protocol_alpha)
-   (public_name tezos.embedded_raw_protocol.alpha)
+  (public_name tezos.embedded_raw_protocol.alpha)
-   (libraries (tezos_protocol_environment_alpha))
+  (libraries (tezos_protocol_environment_alpha))
-   (library_flags (:standard -linkall))
+  (library_flags (:standard -linkall))
-   (flags (:standard -nopervasives -nostdlib -safe-string
+  (flags (:standard -nopervasives -nostdlib -safe-string
-                     -w +a-4-6-7-9-29-32-40..42-44-45-48
+                    -w +a-4-6-7-9-29-32-40..42-44-45-48
-                     -warn-error -a+8
+                    -warn-error -a+8
-                     -open Tezos_protocol_environment_alpha__Environment
+                    -open Tezos_protocol_environment_alpha__Environment
-                     -open Error_monad
+                    -open Error_monad
-                     -open Hash
+                    -open Hash
-                     -open Tezos_data))
+                    -open Tezos_data))
-   (modules (:standard \ Environment Registerer))))
+  (modules (:standard \ Environment Registerer))))
 
 (library
-  ((name tezos_embedded_protocol_alpha)
+ ((name tezos_embedded_protocol_alpha)
-   (public_name tezos.embedded_protocol.alpha)
+  (public_name tezos.embedded_protocol.alpha)
-   (library_flags (:standard -linkall -w -9-32 -safe-string))
+  (library_flags (:standard -linkall -w -9-32 -safe-string))
-   (libraries (tezos_embedded_raw_protocol_alpha node_shell))
+  (libraries (tezos_embedded_raw_protocol_alpha node_shell))
-   (modules (Registerer))))
+  (modules (Registerer))))
 
 (alias
  ((name runtest_sandboxing)

src/proto/genesis/jbuild

@@ -3,14 +3,14 @@
 (rule
  ((targets (environment.ml))
   (action
-    (write-file ${@}
+   (write-file ${@}
-      "include Tezos_protocol_environment.Make(struct let name = \"genesis\" end)()"))))
+               "include Tezos_protocol_environment.Make(struct let name = \"genesis\" end)()"))))
 
 (rule
  ((targets (registerer.ml))
   (action
-    (write-file ${@}
+   (write-file ${@}
-       "module Ignored =
+               "module Ignored =
   State.Register_embedded_protocol
     (Tezos_protocol_environment_genesis.Environment)
     (Tezos_embedded_raw_protocol_genesis.Main)
@@ -24,31 +24,31 @@
     } end)"))))
 
 (library
-  ((name tezos_protocol_environment_genesis)
+ ((name tezos_protocol_environment_genesis)
-   (public_name tezos.protocol_environment.genesis)
+  (public_name tezos.protocol_environment.genesis)
   (libraries (node_updater))
   (modules (Environment))))
 
 (library
-  ((name tezos_embedded_raw_protocol_genesis)
+ ((name tezos_embedded_raw_protocol_genesis)
-   (public_name tezos.embedded_raw_protocol.genesis)
+  (public_name tezos.embedded_raw_protocol.genesis)
-   (libraries (tezos_protocol_environment_genesis))
+  (libraries (tezos_protocol_environment_genesis))
-   (library_flags (:standard -linkall))
+  (library_flags (:standard -linkall))
-   (flags (:standard -nopervasives -nostdlib -safe-string
+  (flags (:standard -nopervasives -nostdlib -safe-string
-                     -w +a-4-6-7-9-29-32-40..42-44-45-48
+                    -w +a-4-6-7-9-29-32-40..42-44-45-48
-                     -warn-error -a+8
+                    -warn-error -a+8
-                     -open Tezos_protocol_environment_genesis__Environment
+                    -open Tezos_protocol_environment_genesis__Environment
-                     -open Error_monad
+                    -open Error_monad
-                     -open Hash
+                    -open Hash
-                     -open Tezos_data))
+                    -open Tezos_data))
-   (modules (:standard \ Environment Registerer))))
+  (modules (:standard \ Environment Registerer))))
 
 (library
-  ((name tezos_embedded_protocol_genesis)
+ ((name tezos_embedded_protocol_genesis)
-   (public_name tezos.embedded_protocol.genesis)
+  (public_name tezos.embedded_protocol.genesis)
-   (library_flags (:standard -linkall -w -9-32 -safe-string))
+  (library_flags (:standard -linkall -w -9-32 -safe-string))
-   (libraries (tezos_embedded_raw_protocol_genesis node_shell))
+  (libraries (tezos_embedded_raw_protocol_genesis node_shell))
-   (modules (Registerer))))
+  (modules (Registerer))))
 
 (alias
  ((name runtest_sandboxing)