From 166201fd84a10015e73e3f3071fb45af62663b9b Mon Sep 17 00:00:00 2001 From: Vivien Date: Tue, 24 Sep 2024 18:57:21 +0200 Subject: [PATCH] proto_manager: move from ./src to ./devtools --- .gitignore | 1 - {src/bin_proto_manager => devtools/proto_manager}/dune | 7 +++---- {src/bin_proto_manager => devtools/proto_manager}/log.ml | 0 {src/bin_proto_manager => devtools/proto_manager}/log.mli | 0 {src/bin_proto_manager => devtools/proto_manager}/main.ml | 7 +------ .../proto_manager}/proto_manager.ml | 0 dune-project | 2 +- manifest/product_octez.ml | 8 -------- manifest/product_tooling.ml | 8 ++++++++ opam/{octez-proto-manager.opam => proto-manager.opam} | 1 - script-inputs/dev-executables | 1 - tezt/lib_tezos/constant.ml | 3 --- 12 files changed, 13 insertions(+), 25 deletions(-) rename {src/bin_proto_manager => devtools/proto_manager}/dune (72%) rename {src/bin_proto_manager => devtools/proto_manager}/log.ml (100%) rename {src/bin_proto_manager => devtools/proto_manager}/log.mli (100%) rename {src/bin_proto_manager => devtools/proto_manager}/main.ml (92%) rename {src/bin_proto_manager => devtools/proto_manager}/proto_manager.ml (100%) rename opam/{octez-proto-manager.opam => proto-manager.opam} (94%) diff --git a/.gitignore b/.gitignore index b39ec2757c95..143a3d8a4ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -62,7 +62,6 @@ __pycache__ /safety-checker /octez-teztale-archiver /octez-teztale-server -/octez-proto-manager /octez-agnostic-baker /src/riscv/riscv-sandbox* diff --git a/src/bin_proto_manager/dune b/devtools/proto_manager/dune similarity index 72% rename from src/bin_proto_manager/dune rename to devtools/proto_manager/dune index 9f05e7a7a32f..849cc06070b1 100644 --- a/src/bin_proto_manager/dune +++ b/devtools/proto_manager/dune @@ -3,13 +3,12 @@ (executable (name main) - (public_name octez-proto-manager) - (package octez-proto-manager) + (public_name proto-manager) + (package proto-manager) (instrumentation (backend bisect_ppx)) (libraries unix - cmdliner - octez-version.value) + cmdliner) (link_flags (:standard) (:include %{workspace_root}/static-link-flags.sexp))) diff --git a/src/bin_proto_manager/log.ml b/devtools/proto_manager/log.ml similarity index 100% rename from src/bin_proto_manager/log.ml rename to devtools/proto_manager/log.ml diff --git a/src/bin_proto_manager/log.mli b/devtools/proto_manager/log.mli similarity index 100% rename from src/bin_proto_manager/log.mli rename to devtools/proto_manager/log.mli diff --git a/src/bin_proto_manager/main.ml b/devtools/proto_manager/main.ml similarity index 92% rename from src/bin_proto_manager/main.ml rename to devtools/proto_manager/main.ml index eafe8e5300ea..43d3934f8be7 100644 --- a/src/bin_proto_manager/main.ml +++ b/devtools/proto_manager/main.ml @@ -44,12 +44,7 @@ let cmd = "help to automatize most of the process involved in the new \ stabilisation/release of protocol amendments" in - let info = - Cmd.info - "octez-proto-manager" - ~version:Tezos_version_value.Bin_version.octez_version_string - ~doc - in + let info = Cmd.info "proto-manager" ~version:"0.1" ~doc in Cmd.group info [stabilise; snapshot; hash] let () = exit (Cmd.eval cmd) diff --git a/src/bin_proto_manager/proto_manager.ml b/devtools/proto_manager/proto_manager.ml similarity index 100% rename from src/bin_proto_manager/proto_manager.ml rename to devtools/proto_manager/proto_manager.ml diff --git a/dune-project b/dune-project index 8bcf6ba4bfde..921b8f49b69b 100644 --- a/dune-project +++ b/dune-project @@ -38,7 +38,6 @@ (package (name octez-node)) (package (name octez-node-config)) (package (name octez-proto-libs)) -(package (name octez-proto-manager)) (package (name octez-protocol-000-Ps9mPmXa-libs)) (package (name octez-protocol-001-PtCJ7pwo-libs)) (package (name octez-protocol-002-PsYLVpVv-libs)) @@ -88,6 +87,7 @@ (package (name octez-teztale)) (package (name octez-version)) (package (name octogram)) +(package (name proto-manager)) (package (name tezos-benchmark)) (package (name tezos-benchmark-020-PsParisC)) (package (name tezos-benchmark-021-PsquebeC)) diff --git a/manifest/product_octez.ml b/manifest/product_octez.ml index fc5148073ed7..b0cc0d4b8525 100644 --- a/manifest/product_octez.ml +++ b/manifest/product_octez.ml @@ -4306,14 +4306,6 @@ let _octogram_bin = yaml; ] -let _octez_proto_manager = - public_exe - "octez-proto-manager" - ~path:"src/bin_proto_manager" - ~internal_name:"main" - ~synopsis:"Tezos protocol manager" - ~deps:[unix; cmdliner; octez_version_value] - let octez_openapi = public_lib "tezos-openapi" diff --git a/manifest/product_tooling.ml b/manifest/product_tooling.ml index cde976488e36..644947b3842f 100644 --- a/manifest/product_tooling.ml +++ b/manifest/product_tooling.ml @@ -73,3 +73,11 @@ let _benchmark_tools_occupy_memory = ~deps:[] ~static:false ~bisect_ppx:No + +let _octez_proto_manager = + public_exe + "proto-manager" + ~path:"devtools/proto_manager" + ~internal_name:"main" + ~synopsis:"Tezos protocol manager" + ~deps:[unix; cmdliner] diff --git a/opam/octez-proto-manager.opam b/opam/proto-manager.opam similarity index 94% rename from opam/octez-proto-manager.opam rename to opam/proto-manager.opam index 6f812e3d6702..ce1835bdc58a 100644 --- a/opam/octez-proto-manager.opam +++ b/opam/proto-manager.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "base-unix" "cmdliner" { >= "1.1.0" } - "octez-version" { = version } ] build: [ ["rm" "-r" "vendors" "contrib"] diff --git a/script-inputs/dev-executables b/script-inputs/dev-executables index a8c548b8832c..809b24b55955 100644 --- a/script-inputs/dev-executables +++ b/script-inputs/dev-executables @@ -1,3 +1,2 @@ octez-protocol-compiler octez-snoop -octez-proto-manager diff --git a/tezt/lib_tezos/constant.ml b/tezt/lib_tezos/constant.ml index 9c4425d73cb2..1680e93efc2f 100644 --- a/tezt/lib_tezos/constant.ml +++ b/tezt/lib_tezos/constant.ml @@ -135,9 +135,6 @@ module WASM = struct Uses.make ~tag:"tx_kernel_dal" ~path:"tx_kernel_dal.wasm" () end -let _octez_proto_manager = - Uses.make ~tag:"proto_manager" ~path:"./octez-proto-manager" - (* TODO: tezos/tezos#4803 Can we do better than to depend on script-inputs? *) -- GitLab