Jbuilder: Move client & node libraries in their own OPAM packages

bin_client/jbuild

@@ -0,0 +1,19 @@
+(jbuild_version 1)
+
+(executable
+ ((name main)
+  (public_name tezos-client)
+  (libraries (tezos-base
+              tezos-client-base
+              tezos-embedded-client-genesis
+              tezos-embedded-client-alpha))
+  (flags (:standard -w -9+27-30-32-40@8
+                    -safe-string
+                    -open Tezos_base__TzPervasives
+                    -open Tezos_client_base
+                    -linkall))))
+
+(alias
+ ((name runtest_indent)
+  (deps ((glob_files *.ml) (glob_files *.mli)))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))

bin_client/tezos-client.opam

@@ -0,0 +1,19 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & >= "1.0+beta15" }
+  "tezos-base"
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]

bin_node/jbuild

@@ -0,0 +1,25 @@
+(jbuild_version 1)
+
+(executable
+ ((name main)
+  (public_name tezos-node)
+  (libraries (tezos-base
+              tezos-node-updater
+              tezos-node-net
+              tezos-node-shell
+              tezos-embedded-protocol-genesis
+              tezos-embedded-protocol-demo
+              tezos-embedded-protocol-alpha
+              cmdliner))
+  (flags (:standard -w -9+27-30-32-40@8
+                    -safe-string
+                    -open Tezos_base__TzPervasives
+                    -open Tezos_node_updater
+                    -open Tezos_node_net
+                    -open Tezos_node_shell
+                    -linkall))))
+
+(alias
+ ((name runtest_indent)
+  (deps ((glob_files *.ml) (glob_files *.mli)))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))

bin_node/tezos-node.opam

@@ -0,0 +1,23 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & >= "1.0+beta15" }
+  "tezos-base"
+  "tezos-embedded-protocol-genesis"
+  "tezos-embedded-protocol-demo"
+  "tezos-embedded-protocol-alpha"
+  "cmdliner"
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]

lib_client_base/jbuild

@@ -0,0 +1,23 @@
+(jbuild_version 1)
+
+(library
+ ((name tezos_client_base)
+  (public_name tezos-client-base)
+  (libraries (tezos-base
+              tezos-node-shell
+              tezos-node-net
+              tezos-node-db
+              tezos-node-updater
+              tezos-protocol-compiler))
+  (flags (:standard -w -9+27-30-32-40@8
+                    -safe-string
+                    -open Tezos_base__TzPervasives
+                    -open Tezos_node_net
+                    -open Tezos_node_db
+                    -open Tezos_node_updater
+                    -open Tezos_node_shell))))
+
+(alias
+ ((name runtest_indent)
+  (deps ((glob_files *.ml) (glob_files *.mli)))
+  (action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${<}))))

lib_client_base/tezos-client-base.opam

@@ -0,0 +1,23 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & >= "1.0+beta15" }
+  "tezos-base"
+  "tezos-embedded-protocol-genesis"
+  "tezos-embedded-protocol-demo"
+  "tezos-embedded-protocol-alpha"
+  "cmdliner"
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]

lib_embedded_client_alpha/jbuild

@@ -1,18 +1,21 @@
 (jbuild_version 1)
 
 (library
- ((name client_embedded_alpha)
+ ((name tezos_embedded_client_alpha)
-  (public_name tezos.client.embedded.alpha)
+  (public_name tezos-embedded-client-alpha)
   (libraries (tezos-base
               tezos-embedded-protocol-alpha
               tezos-embedded-protocol-alpha.raw
-              client_lib))
+              tezos-node-shell
+              tezos-client-base))
   (library_flags (:standard -linkall))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
                     -open Tezos_embedded_protocol_environment_alpha
                     -open Tezos_embedded_raw_protocol_alpha
+                    -open Tezos_node_shell
+                    -open Tezos_client_base
                     -open Tezos_context))))
 
 (alias

lib_embedded_client_alpha/tezos-embedded-client-alpha.opam

@@ -0,0 +1,22 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & >= "1.0+beta15" }
+  "tezos-base"
+  "tezos-embedded-protocol-alpha"
+  "tezos-embedded-protocol-alpha.raw"
+  "tezos-client-base"
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]

lib_embedded_client_genesis/jbuild

@@ -1,20 +1,23 @@
 (jbuild_version 1)
 
 (library
- ((name client_embedded_genesis)
+ ((name tezos_embedded_client_genesis)
-  (public_name tezos.client.embedded.genesis)
+  (public_name tezos-embedded-client-genesis)
   (libraries (tezos-base
               tezos-embedded-protocol-genesis
               tezos-embedded-protocol-genesis.raw
               tezos-embedded-protocol-alpha.environment
               tezos-embedded-protocol-alpha.raw
-              client_lib))
+              tezos-node-shell
+              tezos-client-base))
   (library_flags (:standard -linkall))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives
                     -open Tezos_embedded_protocol_environment_genesis
-                    -open Tezos_embedded_raw_protocol_genesis))))
+                    -open Tezos_embedded_raw_protocol_genesis
+                    -open Tezos_node_shell
+                    -open Tezos_client_base))))
 
 (alias
  ((name runtest_indent)

lib_embedded_client_genesis/tezos-embedded-client-genesis.opam

@@ -0,0 +1,24 @@
+opam-version: "1.2"
+version: "dev"
+maintainer: "contact@tezos.com"
+authors: [ "Tezos devteam" ]
+homepage: "https://www.tezos.com/"
+bug-reports: "https://gitlab.com/tezos/tezos/issues"
+dev-repo: "https://gitlab.com/tezos/tezos.git"
+license: "unreleased"
+depends: [
+  "ocamlfind" { build }
+  "jbuilder" { build & >= "1.0+beta15" }
+  "tezos-base"
+  "tezos-embedded-protocol-genesis"
+  "tezos-embedded-protocol-genesis.raw"
+  "tezos-embedded-protocol-alpha.environment"
+  "tezos-embedded-protocol-alpha.raw"
+  "tezos-client-base"
+]
+build: [
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]

lib_embedded_protocol_alpha/src/jbuild

@@ -4,7 +4,7 @@
  ((targets (environment.ml))
   (action
     (write-file ${@}
-      "include Tezos_protocol_environment.Make(struct let name = \"alpha\" end)()"))))
+      "include Tezos_node_updater.Tezos_protocol_environment.Make(struct let name = \"alpha\" end)()"))))
 
 (rule
  ((targets (registerer.ml))
@@ -12,7 +12,7 @@
     (write-file ${@}
        "
 let () =
-  let module Ignored = State.Register_embedded_protocol
+  let module Ignored = Tezos_node_shell.State.Register_embedded_protocol
     (Tezos_embedded_protocol_environment_alpha.Environment)
     (Tezos_embedded_raw_protocol_alpha.Main)
     (struct
@@ -28,7 +28,7 @@ let () =
  ((name tezos_embedded_protocol_environment_alpha)
   (public_name tezos-embedded-protocol-alpha.environment)
   (library_flags (:standard -linkall))
-  (libraries (tezos.node.updater))
+  (libraries (tezos-node-updater))
   (modules (Environment))))
 
 (library
@@ -49,5 +49,5 @@ let () =
  ((name tezos_embedded_protocol_alpha)
   (public_name tezos-embedded-protocol-alpha)
   (library_flags (:standard -linkall))
-  (libraries (tezos_embedded_raw_protocol_alpha tezos.node.shell))
+  (libraries (tezos_embedded_raw_protocol_alpha tezos-node-shell))
   (modules (Registerer))))