From bbab544e752c210ef13bbb866b2711cdd14902fe Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Fri, 3 Jun 2022 23:33:17 +0200 Subject: [PATCH 1/3] Build: cleanup static build --- dune | 10 ++ manifest/manifest.ml | 93 ++++++------------- manifest/manifest.mli | 12 +-- src/bin_client/dune | 6 +- src/bin_codec/dune | 6 +- src/bin_node/dune | 6 +- src/bin_proxy_server/dune | 6 +- src/bin_signer/dune | 4 +- src/bin_snoop/dune | 6 +- src/bin_validation/bin/dune | 6 +- src/lib_protocol_compiler/bin/dune | 12 ++- src/lib_version/exe/dune | 5 +- src/proto_012_Psithaca/bin_accuser/dune | 4 +- src/proto_012_Psithaca/bin_baker/dune | 4 +- src/proto_013_PtJakart/bin_accuser/dune | 4 +- src/proto_013_PtJakart/bin_baker/dune | 4 +- .../bin_sc_rollup_client/dune | 4 +- .../bin_sc_rollup_node/dune | 4 +- .../bin_tx_rollup_client/dune | 4 +- .../bin_tx_rollup_node/dune | 4 +- src/proto_alpha/bin_accuser/dune | 4 +- src/proto_alpha/bin_baker/dune | 4 +- src/proto_alpha/bin_sc_rollup_client/dune | 4 +- src/proto_alpha/bin_sc_rollup_node/dune | 4 +- src/proto_alpha/bin_tx_rollup_client/dune | 4 +- src/proto_alpha/bin_tx_rollup_node/dune | 4 +- 26 files changed, 97 insertions(+), 131 deletions(-) diff --git a/dune b/dune index 93eb9c2f2679..9fc8d64ca131 100644 --- a/dune +++ b/dune @@ -17,3 +17,13 @@ ;; 70 [missing-mli] (_ (binaries (%{workspace_root}/src/tooling/node_wrapper.exe as node)))) + +; This file is included in the link_flags stanza of binaries for which +; we want a static build. +; If the current dune profile is "static", it contains the flag +; telling the compiler to compile static executables. +; Else it contains no flags. +(rule + (target static-link-flags.sexp) + (action (with-stdout-to %{target} + (system "[ '%{profile}' = 'static' ] && echo '(-ccopt -static)' || echo '()'")))) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 393b4e8d428d..d8b0607f4be9 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -917,7 +917,6 @@ module Target = struct opam_only_deps : t list; release : bool; static : bool; - static_cclibs : string list; synopsis : string option; description : string option; wrapped : bool; @@ -1065,7 +1064,6 @@ module Target = struct ?opam_only_deps:t option list -> ?release:bool -> ?static:bool -> - ?static_cclibs:string list -> ?synopsis:string -> ?description:string -> ?time_measurement_ppx:bool -> @@ -1117,9 +1115,9 @@ module Target = struct ?(modules_without_implementation = []) ?(npm_deps = []) ?ocaml ?opam ?(opam_with_test = Always) ?(opens = []) ?(preprocess = []) ?(preprocessor_deps = []) ?(private_modules = []) ?(opam_only_deps = []) - ?release ?static ?static_cclibs ?synopsis ?description - ?(time_measurement_ppx = false) ?(wrapped = true) ?(cram = false) ?license - ?(extra_authors = []) ~path names = + ?release ?static ?synopsis ?description ?(time_measurement_ppx = false) + ?(wrapped = true) ?(cram = false) ?license ?(extra_authors = []) ~path + names = let conflicts = List.filter_map Fun.id conflicts in let deps = List.filter_map Fun.id deps in let opam_only_deps = List.filter_map Fun.id opam_only_deps in @@ -1261,15 +1259,11 @@ module Target = struct | None -> ( match kind with Public_executable _ -> true | _ -> false) in let static = - match static with - | Some static -> static - | None -> ( - match static_cclibs with - | Some _ -> true - | None -> ( - match kind with Public_executable _ -> true | _ -> false)) + match (static, kind) with + | Some static, _ -> static + | None, Public_executable _ -> true + | None, _ -> false in - let static_cclibs = Option.value static_cclibs ~default:[] in let modules = match (modules, all_modules_except) with | None, None -> All @@ -1360,7 +1354,6 @@ module Target = struct opam_only_deps; release; static; - static_cclibs; synopsis; description; npm_deps; @@ -1651,7 +1644,7 @@ let write filename f = generated_files := String_set.add filename !generated_files ; write_raw filename f -let generate_dune ~dune_file_has_static_profile (internal : Target.internal) = +let generate_dune (internal : Target.internal) = let libraries, empty_files_to_create = let empty_files_to_create = ref [] in let rec get_library (dep : Target.t) = @@ -1707,33 +1700,32 @@ let generate_dune ~dune_file_has_static_profile (internal : Target.internal) = else None in let link_flags = - if internal.linkall && not is_lib then - Some Dune.[S ":standard"; S "-linkall"] - else None + let linkall = internal.linkall && not is_lib in + let static = + if internal.static then + Some Dune.[S ":include"; S "%{workspace_root}/static-link-flags.sexp"] + else None + in + match (linkall, static) with + | false, None -> None + | true, None -> Some Dune.[S ":standard"; S "-linkall"] + | false, Some a -> Some Dune.(V [[S ":standard"]; a]) + | true, Some static -> Some Dune.(V [[S ":standard"; S "-linkall"]; static]) in let open_flags : Dune.s_expr list = internal.opens |> List.map (fun m -> Dune.(H [S "-open"; S m])) in - let minus_flags : Dune.s_expr = - if dune_file_has_static_profile && not internal.static then - (* Disable static compilation for this particular target - (the static profile is global for the dune file). - This must be at the end of the flag list. *) - Dune.(H [S "\\"; S "-ccopt"; S "-static"]) - else Dune.E - in let flags = - match (internal.flags, minus_flags, open_flags) with - | None, Dune.E, [] -> None - | flags, _, _ -> + match (internal.flags, open_flags) with + | None, [] -> None + | flags, _ -> let flags = match flags with None -> Flags.standard () | Some flags -> flags in let flags = - match (flags.standard, minus_flags) with - | false, _ -> flags.rest - | true, E -> Dune.[S ":standard"] :: flags.rest - | true, minus_flags -> Dune.[S ":standard"; minus_flags] :: flags.rest + match flags.standard with + | false -> flags.rest + | true -> Dune.[S ":standard"] :: flags.rest in Some Dune.(V [V (of_list flags); V (of_list open_flags)]) in @@ -1862,23 +1854,6 @@ let generate_dune ~dune_file_has_static_profile (internal : Target.internal) = ?js_of_ocaml:internal.js_of_ocaml :: documentation :: create_empty_files :: internal.dune) -let static_profile (cclibs : string list) = - Env.add - (Profile "static") - ~key:"flags" - Dune. - [ - S ":standard"; - G [S "-ccopt"; S "-static"]; - (match cclibs with - | [] -> E - | _ :: _ -> - let arg = - List.map (fun lib -> "-l" ^ lib) cclibs |> String.concat " " - in - G [S "-cclib"; S arg]); - ] - (* Remove duplicates from a list. Items that are not removed are kept in their original order. In case of duplicates, the first occurrence is kept. @@ -1905,9 +1880,6 @@ let deduplicate_list ?merge get_key list = let generate_dune_files () = Target.iter_internal_by_path @@ fun path internals -> - let has_static = - List.exists (fun (internal : Target.internal) -> internal.static) internals - in let node_preload = List.concat_map (fun (internal : Target.internal) -> @@ -1915,26 +1887,13 @@ let generate_dune_files () = internals |> List.sort_uniq compare in - let dunes = - List.map (generate_dune ~dune_file_has_static_profile:has_static) internals - in + let dunes = List.map generate_dune internals in write (path // "dune") @@ fun fmt -> Format.fprintf fmt "; This file was automatically generated, do not edit.@.; Edit file \ manifest/main.ml instead.@.@." ; let env = Env.empty in - let env = - if has_static then - let cclibs = - List.map - (fun (internal : Target.internal) -> internal.static_cclibs) - internals - |> List.flatten |> deduplicate_list Fun.id - in - static_profile cclibs env - else env - in let env = match node_preload with | [] -> env diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 5a6cf492bdde..2d479e816791 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -619,14 +619,9 @@ type with_test = Always | Never | Only_on_64_arch - [release]: unused for now. The intent is to define whether this should be released. Default is [true] for public executables and [false] for other targets. - - [static]: whether to generate a [(env (static (flags (:standard -ccopt -static ...))))] - stanza to provide a static compilation profile. - Default is [true] for public executables and [false] for other targets, - unless you specify [static_cclibs], in which case default is [true]. - - - [static_cclibs]: list of static libraries to link with for targets - in this [dune] file when building static executables. - Added using [-cclib] to the stanza that is generated when [static] is [true]. + - [static]: whether to incluce [ %{workspace_root}/static-link-flags.sexp ] to the link + flags to provide a static compilation profile. + Default is [true] for public executables and [false] for other targets. - [synopsis]: short description for the [.opam] file. @@ -670,7 +665,6 @@ type 'a maker = ?opam_only_deps:target list -> ?release:bool -> ?static:bool -> - ?static_cclibs:string list -> ?synopsis:string -> ?description:string -> ?time_measurement_ppx:bool -> diff --git a/src/bin_client/dune b/src/bin_client/dune index d774c3f3b585..1d775fcd5d56 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executables (names main_client main_admin) (public_names tezos-client tezos-admin-client) @@ -93,7 +91,9 @@ (select void_for_linking-tezos-protocol-plugin-alpha from (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_codec/dune b/src/bin_codec/dune index 66764027506d..6b966dfa03a9 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name codec) (public_name tezos-codec) @@ -48,7 +46,9 @@ (select void_for_linking-tezos-client-alpha from (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty) (-> void_for_linking-tezos-client-alpha.empty))) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Data_encoding diff --git a/src/bin_node/dune b/src/bin_node/dune index 1e48f00507e9..94f32ecc7146 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main) (public_name tezos-node) @@ -106,7 +104,9 @@ (select void_for_linking-tezos-protocol-plugin-alpha-registerer from (tezos-protocol-plugin-alpha-registerer -> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty) (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty))) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index e6c478b7fd1d..de84641e8d9b 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_proxy_server) (public_name tezos-proxy-server) @@ -98,7 +96,9 @@ (select void_for_linking-tezos-protocol-plugin-alpha from (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 9b94a15f80f8..4da1f174d34f 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_signer) (public_name tezos-signer) @@ -21,6 +19,8 @@ tezos-stdlib-unix tezos-stdlib tezos-signer-backends.unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 5c78016b23c1..61efe7db63ab 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_snoop) (public_name tezos-snoop) @@ -21,7 +19,9 @@ ocamlgraph pyml prbnmcn-stats) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_validation/bin/dune b/src/bin_validation/bin/dune index 8898174fb85c..0a5f5695155c 100644 --- a/src/bin_validation/bin/dune +++ b/src/bin_validation/bin/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_validator) (public_name tezos-validator) @@ -17,7 +15,9 @@ tezos-validation tezos-protocol-updater tezos-validator) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune index cc46cb643f17..319ef7161f9b 100644 --- a/src/lib_protocol_compiler/bin/dune +++ b/src/lib_protocol_compiler/bin/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_native) (public_name tezos-protocol-compiler) @@ -11,7 +9,9 @@ (modes native) (libraries tezos-protocol-compiler.native) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (modules Main_native)) (executable @@ -23,6 +23,8 @@ tezos-base tezos-stdlib-unix tezos-protocol-compiler) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives @@ -40,7 +42,9 @@ tezos-base tezos-base.unix tezos-stdlib-unix) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune index 338b18dce12b..b15e9604d782 100644 --- a/src/lib_version/exe/dune +++ b/src/lib_version/exe/dune @@ -1,14 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name get_git_info) (libraries dune-configurator tezos-version.parser) - (flags (:standard \ -ccopt -static)) (modules get_git_info)) (executable @@ -18,6 +15,8 @@ (libraries tezos-version tezos-base.unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_version) (modules tezos_print_version)) diff --git a/src/proto_012_Psithaca/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune index daa3bf0a3bce..1ea047c89545 100644 --- a/src/proto_012_Psithaca/bin_accuser/dune +++ b/src/proto_012_Psithaca/bin_accuser/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_accuser_012_Psithaca) (public_name tezos-accuser-012-Psithaca) @@ -16,6 +14,8 @@ tezos-baking-012-Psithaca-commands tezos-stdlib-unix tezos-client-base-unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune index 6b2457132959..780e30255ced 100644 --- a/src/proto_012_Psithaca/bin_baker/dune +++ b/src/proto_012_Psithaca/bin_baker/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_baker_012_Psithaca) (public_name tezos-baker-012-Psithaca) @@ -16,6 +14,8 @@ tezos-baking-012-Psithaca-commands tezos-stdlib-unix tezos-client-base-unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_accuser/dune b/src/proto_013_PtJakart/bin_accuser/dune index 4a51c4d009c7..0fbb21098280 100644 --- a/src/proto_013_PtJakart/bin_accuser/dune +++ b/src/proto_013_PtJakart/bin_accuser/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_accuser_013_PtJakart) (public_name tezos-accuser-013-PtJakart) @@ -16,6 +14,8 @@ tezos-baking-013-PtJakart-commands tezos-stdlib-unix tezos-client-base-unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_baker/dune b/src/proto_013_PtJakart/bin_baker/dune index 6dcf377bedc3..90230933da2d 100644 --- a/src/proto_013_PtJakart/bin_baker/dune +++ b/src/proto_013_PtJakart/bin_baker/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_baker_013_PtJakart) (public_name tezos-baker-013-PtJakart) @@ -16,6 +14,8 @@ tezos-baking-013-PtJakart-commands tezos-stdlib-unix tezos-client-base-unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_sc_rollup_client/dune b/src/proto_013_PtJakart/bin_sc_rollup_client/dune index bf2cbc9607a8..69a6b77c573d 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_client/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_sc_rollup_client_013_PtJakart) (public_name tezos-sc-rollup-client-013-PtJakart) @@ -20,6 +18,8 @@ tezos-protocol-013-PtJakart tezos-sc-rollup-013-PtJakart uri) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune index c8f692b950d2..a33ea5cc720d 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_sc_rollup_node_013_PtJakart) (public_name tezos-sc-rollup-node-013-PtJakart) @@ -31,6 +29,8 @@ irmin ringo ringo-lwt) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune index 18a9c17d671f..fa0882783b2d 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_tx_rollup_client_013_PtJakart) (public_name tezos-tx-rollup-client-013-PtJakart) @@ -18,6 +16,8 @@ tezos-tx-rollup-013-PtJakart tezos-protocol-013-PtJakart.raw uri) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/dune b/src/proto_013_PtJakart/bin_tx_rollup_node/dune index c1f148f75c0a..899ed7b111ea 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_node/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_tx_rollup_node_013_PtJakart) (public_name tezos-tx-rollup-node-013-PtJakart) @@ -15,6 +13,8 @@ tezos-client-base tezos-client-base-unix tezos-tx-rollup-013-PtJakart) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 52c6022c9ed8..9b0a6720baba 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_accuser_alpha) (public_name tezos-accuser-alpha) @@ -16,6 +14,8 @@ tezos-baking-alpha-commands tezos-stdlib-unix tezos-client-base-unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 347249fba917..06fbf587d5f2 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_baker_alpha) (public_name tezos-baker-alpha) @@ -16,6 +14,8 @@ tezos-baking-alpha-commands tezos-stdlib-unix tezos-client-base-unix) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index 726c60c9a647..dbf23645523a 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_sc_rollup_client_alpha) (public_name tezos-sc-rollup-client-alpha) @@ -20,6 +18,8 @@ tezos-protocol-alpha tezos-sc-rollup-alpha uri) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 8ee9f184846c..00bd5000b4ff 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_sc_rollup_node_alpha) (public_name tezos-sc-rollup-node-alpha) @@ -31,6 +29,8 @@ irmin ringo ringo-lwt) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune index 67c9308ac670..a8d5bc3c6d7a 100644 --- a/src/proto_alpha/bin_tx_rollup_client/dune +++ b/src/proto_alpha/bin_tx_rollup_client/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_tx_rollup_client_alpha) (public_name tezos-tx-rollup-client-alpha) @@ -18,6 +16,8 @@ tezos-tx-rollup-alpha tezos-protocol-alpha.raw uri) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_tx_rollup_node/dune b/src/proto_alpha/bin_tx_rollup_node/dune index be2887076250..4ceb6cdc6b7e 100644 --- a/src/proto_alpha/bin_tx_rollup_node/dune +++ b/src/proto_alpha/bin_tx_rollup_node/dune @@ -1,8 +1,6 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(env (static (flags (:standard -ccopt -static)))) - (executable (name main_tx_rollup_node_alpha) (public_name tezos-tx-rollup-node-alpha) @@ -15,6 +13,8 @@ tezos-client-base tezos-client-base-unix tezos-tx-rollup-alpha) + (link_flags (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives -- GitLab From 67994adbb3b478af247ad662d42028d835f0a588 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 15 Jun 2022 12:15:05 +0200 Subject: [PATCH 2/3] Manifest: improve flags layout --- manifest/manifest.ml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index d8b0607f4be9..47eab1d6fcd7 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -256,8 +256,8 @@ module Dune = struct | None -> E | Some flags -> S "js_of_ocaml" :: flags); opt library_flags (fun x -> [S "library_flags"; x]); - opt link_flags (fun x -> [S "link_flags"; x]); - opt flags (fun x -> [S "flags"; x]); + opt link_flags (fun l -> [V (of_list (List.cons (S "link_flags") l))]); + opt flags (fun l -> [V (of_list (List.cons (S "flags") l))]); (if not wrapped then [S "wrapped"; S "false"] else E); opt modules (fun x -> S "modules" :: x); opt modules_without_implementation (fun x -> @@ -1708,9 +1708,9 @@ let generate_dune (internal : Target.internal) = in match (linkall, static) with | false, None -> None - | true, None -> Some Dune.[S ":standard"; S "-linkall"] - | false, Some a -> Some Dune.(V [[S ":standard"]; a]) - | true, Some static -> Some Dune.(V [[S ":standard"; S "-linkall"]; static]) + | true, None -> Some [Dune.[S ":standard"; S "-linkall"]] + | false, Some static -> Some [[S ":standard"]; static] + | true, Some static -> Some [[S ":standard"; S "-linkall"]; static] in let open_flags : Dune.s_expr list = internal.opens |> List.map (fun m -> Dune.(H [S "-open"; S m])) @@ -1727,7 +1727,7 @@ let generate_dune (internal : Target.internal) = | false -> flags.rest | true -> Dune.[S ":standard"] :: flags.rest in - Some Dune.(V [V (of_list flags); V (of_list open_flags)]) + Some (flags @ open_flags) in let preprocess = -- GitLab From 9101d4c0be1d16f35634e4da50e70b3a11837e94 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Wed, 15 Jun 2022 12:15:39 +0200 Subject: [PATCH 3/3] Manifest: generate --- src/bin_signer/dune | 5 +++-- src/lib_base/test/dune | 21 +++++++++++-------- src/lib_base/test_helpers/dune | 5 +++-- src/lib_benchmark/dune | 7 ++++--- src/lib_benchmark/example/dune | 5 +++-- .../lib_micheline_rewriting/test/dune | 5 +++-- src/lib_benchmark/test/dune | 5 +++-- src/lib_clic/test/dune | 7 ++++--- src/lib_client_base/test/dune | 5 +++-- src/lib_context/dump/dune | 7 ++++--- src/lib_context/encoding/dune | 7 ++++--- src/lib_context/helpers/dune | 7 ++++--- src/lib_context/memory/test/dune | 7 ++++--- src/lib_context/test/dune | 7 ++++--- src/lib_error_monad/dune | 7 ++++--- src/lib_error_monad/test/dune | 5 +++-- src/lib_lwt_result_stdlib/test/dune | 5 +++-- src/lib_micheline/test/dune | 5 +++-- src/lib_mockup/dune | 5 +++-- src/lib_mockup_proxy/dune | 5 +++-- src/lib_p2p/test/dune | 3 ++- src/lib_p2p_services/dune | 5 +++-- src/lib_polynomial/dune | 5 +++-- src/lib_protocol_compiler/bin/dune | 5 +++-- src/lib_protocol_compiler/dune | 7 ++++--- src/lib_protocol_environment/dune | 12 ++++++----- src/lib_protocol_environment/sigs/dune | 7 ++++--- src/lib_proxy/dune | 5 +++-- src/lib_proxy/rpc/dune | 5 +++-- src/lib_proxy_server_config/dune | 5 +++-- src/lib_proxy_server_config/test/dune | 5 +++-- src/lib_requester/dune | 7 ++++--- src/lib_rpc/dune | 7 ++++--- src/lib_rpc_http/dune | 19 ++++++++++------- src/lib_sapling/test/dune | 3 ++- src/lib_shell_services/test/dune | 7 ++++--- src/lib_shell_services/test_helpers/dune | 5 +++-- src/lib_shell_services/test_helpers/test/dune | 5 +++-- src/lib_stdlib/test-unix/dune | 5 +++-- src/lib_stdlib/test/dune | 5 +++-- src/lib_version/dune | 5 +++-- src/lib_version/exe/dune | 10 +++++---- src/lib_version/test/dune | 5 +++-- src/lib_webassembly/interpreter/dune | 5 +++-- src/lib_webassembly/test/dune | 5 +++-- src/proto_011_PtHangz2/lib_parameters/dune | 3 ++- src/proto_011_PtHangz2/lib_protocol/dune | 21 +++++++++++-------- src/proto_012_Psithaca/bin_accuser/dune | 5 +++-- src/proto_012_Psithaca/bin_baker/dune | 5 +++-- src/proto_012_Psithaca/lib_parameters/dune | 3 ++- src/proto_012_Psithaca/lib_protocol/dune | 21 +++++++++++-------- src/proto_013_PtJakart/bin_accuser/dune | 5 +++-- src/proto_013_PtJakart/bin_baker/dune | 5 +++-- .../bin_sc_rollup_client/dune | 5 +++-- .../bin_sc_rollup_node/dune | 5 +++-- .../bin_tx_rollup_client/dune | 5 +++-- .../bin_tx_rollup_node/dune | 5 +++-- .../lib_delegate/test/tenderbrute/dune | 3 ++- src/proto_013_PtJakart/lib_parameters/dune | 3 ++- src/proto_013_PtJakart/lib_protocol/dune | 21 +++++++++++-------- src/proto_alpha/bin_accuser/dune | 5 +++-- src/proto_alpha/bin_baker/dune | 5 +++-- src/proto_alpha/bin_sc_rollup_client/dune | 5 +++-- src/proto_alpha/bin_sc_rollup_node/dune | 5 +++-- src/proto_alpha/bin_tx_rollup_client/dune | 5 +++-- src/proto_alpha/bin_tx_rollup_node/dune | 5 +++-- .../lib_delegate/test/tenderbrute/dune | 3 ++- src/proto_alpha/lib_parameters/dune | 10 +++++---- src/proto_alpha/lib_protocol/dune | 21 +++++++++++-------- src/proto_demo_counter/lib_protocol/dune | 21 +++++++++++-------- src/proto_demo_noops/lib_protocol/dune | 21 +++++++++++-------- src/proto_genesis/lib_protocol/dune | 21 +++++++++++-------- tezt/lib_performance_regression/dune | 7 ++++--- tezt/self_tests/dune | 9 ++++---- 74 files changed, 321 insertions(+), 226 deletions(-) diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 4da1f174d34f..8cd676d2cc73 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -19,8 +19,9 @@ tezos-stdlib-unix tezos-stdlib tezos-signer-backends.unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index 633a5922696f..92365c90812c 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -13,9 +13,10 @@ qcheck-alcotest tezos-test-helpers) (js_of_ocaml) - (flags (:standard) - -open Tezos_base - -open Tezos_error_monad) + (flags + (:standard) + -open Tezos_base + -open Tezos_error_monad) (modules test_bounded test_time test_protocol)) (rule @@ -58,9 +59,10 @@ qcheck-alcotest tezos-test-helpers) (js_of_ocaml) - (flags (:standard) - -open Tezos_base - -open Tezos_error_monad) + (flags + (:standard) + -open Tezos_base + -open Tezos_error_monad) (modules test_p2p_addr)) (rule @@ -85,9 +87,10 @@ qcheck-alcotest tezos-test-helpers) (js_of_ocaml) - (flags (:standard) - -open Tezos_base - -open Tezos_error_monad) + (flags + (:standard) + -open Tezos_base + -open Tezos_error_monad) (modules test_sized)) (rule diff --git a/src/lib_base/test_helpers/dune b/src/lib_base/test_helpers/dune index c67f9c3a36d1..4fc8819afbc7 100644 --- a/src/lib_base/test_helpers/dune +++ b/src/lib_base/test_helpers/dune @@ -14,5 +14,6 @@ alcotest-lwt qcheck-alcotest) (library_flags (:standard -linkall)) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_benchmark/dune b/src/lib_benchmark/dune index e5786f0cedaa..821ca5e27642 100644 --- a/src/lib_benchmark/dune +++ b/src/lib_benchmark/dune @@ -18,7 +18,8 @@ pringo pyml ocaml-migrate-parsetree) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib_unix) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib_unix) (foreign_stubs (language c) (flags (:standard)) (names snoop_stubs))) diff --git a/src/lib_benchmark/example/dune b/src/lib_benchmark/example/dune index 270df02850ce..96a532e3cb8e 100644 --- a/src/lib_benchmark/example/dune +++ b/src/lib_benchmark/example/dune @@ -10,5 +10,6 @@ tezos-stdlib-unix tezos-crypto tezos-benchmark) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index 5dab467223f1..135a05a95c97 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -10,8 +10,9 @@ tezos-error-monad tezos-client-alpha alcotest-lwt) - (flags (:standard) - -open Tezos_micheline)) + (flags + (:standard) + -open Tezos_micheline)) (rule (alias runtest) diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index 961ff42ce298..92dcc40e7cd5 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -12,8 +12,9 @@ tezos-crypto tezos-benchmark tezos-benchmark-examples) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) (rule (alias runtest) diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index 2ddfa6c673c4..673a7dc59c05 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -7,9 +7,10 @@ tezos-stdlib tezos-clic alcotest-lwt) - (flags (:standard) - -open Tezos_stdlib - -open Tezos_clic)) + (flags + (:standard) + -open Tezos_stdlib + -open Tezos_clic)) (rule (alias runtest) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index c5395e1776cb..fb8dfdfb7e0d 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -11,8 +11,9 @@ tezos-client-base alcotest) (js_of_ocaml) - (flags (:standard) - -open Tezos_client_base)) + (flags + (:standard) + -open Tezos_client_base)) (rule (alias runtest) diff --git a/src/lib_context/dump/dune b/src/lib_context/dump/dune index bbfa8b28bc62..f10c89bb3798 100644 --- a/src/lib_context/dump/dune +++ b/src/lib_context/dump/dune @@ -9,6 +9,7 @@ tezos-base tezos-stdlib-unix fmt) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib_unix)) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib_unix)) diff --git a/src/lib_context/encoding/dune b/src/lib_context/encoding/dune index f46f172120f6..7819ff793273 100644 --- a/src/lib_context/encoding/dune +++ b/src/lib_context/encoding/dune @@ -10,6 +10,7 @@ tezos-stdlib irmin irmin-pack) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib)) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib)) diff --git a/src/lib_context/helpers/dune b/src/lib_context/helpers/dune index aae7f71419e3..57531f62f255 100644 --- a/src/lib_context/helpers/dune +++ b/src/lib_context/helpers/dune @@ -12,6 +12,7 @@ tezos-context.sigs irmin irmin-pack) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib)) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib)) diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune index 3004c24aa335..187be6350deb 100644 --- a/src/lib_context/memory/test/dune +++ b/src/lib_context/memory/test/dune @@ -10,9 +10,10 @@ tezos-context.memory tezos-stdlib-unix alcotest-lwt) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib_unix)) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib_unix)) (rule (alias runtest) diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index d33f72a62b85..886bc6300482 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -13,9 +13,10 @@ tezos-test-helpers tezos-test-helpers-extra alcotest-lwt) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib_unix) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib_unix) (modules test_context test)) (rule diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 1e65874dda8e..9ca5d807ecb9 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -12,6 +12,7 @@ lwt tezos-lwt-result-stdlib) (js_of_ocaml) - (flags (:standard) - -open Tezos_stdlib - -open Data_encoding)) + (flags + (:standard) + -open Tezos_stdlib + -open Data_encoding)) diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index bcfb9b7f2244..8af814890519 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -9,8 +9,9 @@ data-encoding alcotest) (js_of_ocaml) - (flags (:standard) - -open Tezos_error_monad)) + (flags + (:standard) + -open Tezos_error_monad)) (rule (alias runtest) diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 827d8d029789..d63201a05efb 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -20,8 +20,9 @@ alcotest-lwt qcheck-alcotest tezos-test-helpers) - (flags (:standard) - -open Tezos_lwt_result_stdlib)) + (flags + (:standard) + -open Tezos_lwt_result_stdlib)) (rule (alias runtest) diff --git a/src/lib_micheline/test/dune b/src/lib_micheline/test/dune index 039eb5c02ae1..ca91c27e0e56 100644 --- a/src/lib_micheline/test/dune +++ b/src/lib_micheline/test/dune @@ -8,8 +8,9 @@ tezos-micheline alcotest) (js_of_ocaml) - (flags (:standard) - -open Tezos_micheline)) + (flags + (:standard) + -open Tezos_micheline)) (rule (alias runtest) diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index e5e62fbd3088..02610de07af4 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -11,8 +11,9 @@ tezos-shell-services tezos-protocol-environment uri) - (flags (:standard) - -open Tezos_base.TzPervasives) + (flags + (:standard) + -open Tezos_base.TzPervasives) (modules registration registration_intf mockup_args)) (library diff --git a/src/lib_mockup_proxy/dune b/src/lib_mockup_proxy/dune index 6e644049851f..8f8e0f1c89b4 100644 --- a/src/lib_mockup_proxy/dune +++ b/src/lib_mockup_proxy/dune @@ -14,5 +14,6 @@ tezos-rpc-http-client tezos-shell-services uri) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index 02fea7044a79..6f85f6120da5 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -23,7 +23,8 @@ tezos-p2p-services alcotest-lwt astring) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_p2p_services/dune b/src/lib_p2p_services/dune index 144be3955b9c..e51d9a99ef08 100644 --- a/src/lib_p2p_services/dune +++ b/src/lib_p2p_services/dune @@ -11,5 +11,6 @@ tezos-base) (js_of_ocaml) (library_flags (:standard -linkall)) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_polynomial/dune b/src/lib_polynomial/dune index deb9a5a7985b..391470defaac 100644 --- a/src/lib_polynomial/dune +++ b/src/lib_polynomial/dune @@ -9,8 +9,9 @@ data-encoding bls12-381) (library_flags (:standard -linkall)) - (flags (:standard) - -open Data_encoding) + (flags + (:standard) + -open Data_encoding) (modules Carray Fr_generation diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune index 319ef7161f9b..3aeda8a38508 100644 --- a/src/lib_protocol_compiler/bin/dune +++ b/src/lib_protocol_compiler/bin/dune @@ -23,8 +23,9 @@ tezos-base tezos-stdlib-unix tezos-protocol-compiler) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index f02df288fc74..cfc9e84c0305 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -8,9 +8,10 @@ (libraries tezos-base tezos-protocol-environment.sigs) - (flags (:standard) - -opaque - -open Tezos_base.TzPervasives) + (flags + (:standard) + -opaque + -open Tezos_base.TzPervasives) (modules Registerer)) (rule diff --git a/src/lib_protocol_environment/dune b/src/lib_protocol_environment/dune index ce5da4e3d9c5..cd5be010896c 100644 --- a/src/lib_protocol_environment/dune +++ b/src/lib_protocol_environment/dune @@ -19,9 +19,10 @@ tezos-context.memory tezos-scoru-wasm tezos-event-logging) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_micheline) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_micheline) (wrapped false) (modules Tezos_protocol_environment @@ -53,8 +54,9 @@ tezos-base tezos-protocol-environment tezos-context) - (flags (:standard) - -open Tezos_base.TzPervasives) + (flags + (:standard) + -open Tezos_base.TzPervasives) (modules Proxy_delegate_maker Shell_context)) (library diff --git a/src/lib_protocol_environment/sigs/dune b/src/lib_protocol_environment/sigs/dune index c895848d9a57..f12d0587f2ae 100644 --- a/src/lib_protocol_environment/sigs/dune +++ b/src/lib_protocol_environment/sigs/dune @@ -7,9 +7,10 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-protocol-environment.sigs.stdlib-compat) - (flags (:standard) - -nostdlib - -nopervasives) + (flags + (:standard) + -nostdlib + -nopervasives) (modules V0 V1 V2 V3 V4 V5 V6)) (include v0.dune.inc) diff --git a/src/lib_proxy/dune b/src/lib_proxy/dune index e9450836835a..9c3fa4a856ac 100644 --- a/src/lib_proxy/dune +++ b/src/lib_proxy/dune @@ -15,5 +15,6 @@ tezos-shell-services tezos-context.memory uri) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_proxy/rpc/dune b/src/lib_proxy/rpc/dune index 9d656e384533..6028ed4d0853 100644 --- a/src/lib_proxy/rpc/dune +++ b/src/lib_proxy/rpc/dune @@ -12,5 +12,6 @@ tezos-rpc tezos-proxy uri) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_proxy_server_config/dune b/src/lib_proxy_server_config/dune index 32f74f1771b4..026cc437f66a 100644 --- a/src/lib_proxy_server_config/dune +++ b/src/lib_proxy_server_config/dune @@ -9,5 +9,6 @@ tezos-base tezos-stdlib-unix uri) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune index 7696e7e5e54e..0ff177467dde 100644 --- a/src/lib_proxy_server_config/test/dune +++ b/src/lib_proxy_server_config/test/dune @@ -11,8 +11,9 @@ qcheck-alcotest alcotest-lwt uri) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) (rule (alias runtest) diff --git a/src/lib_requester/dune b/src/lib_requester/dune index 9ac46aca3b4d..3a59ba3da0b5 100644 --- a/src/lib_requester/dune +++ b/src/lib_requester/dune @@ -9,6 +9,7 @@ tezos-base tezos-stdlib-unix lwt-watcher) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_stdlib_unix)) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_stdlib_unix)) diff --git a/src/lib_rpc/dune b/src/lib_rpc/dune index d103ddedb2b0..b17c0d099546 100644 --- a/src/lib_rpc/dune +++ b/src/lib_rpc/dune @@ -12,6 +12,7 @@ resto-directory uri) (js_of_ocaml) - (flags (:standard) - -open Data_encoding - -open Tezos_error_monad)) + (flags + (:standard) + -open Data_encoding + -open Tezos_error_monad)) diff --git a/src/lib_rpc_http/dune b/src/lib_rpc_http/dune index 70052af75a73..6c9b3f3a24e3 100644 --- a/src/lib_rpc_http/dune +++ b/src/lib_rpc_http/dune @@ -9,8 +9,9 @@ tezos-base resto-cohttp uri) - (flags (:standard) - -open Tezos_base.TzPervasives) + (flags + (:standard) + -open Tezos_base.TzPervasives) (modules RPC_client_errors media_type)) (library @@ -21,9 +22,10 @@ tezos-base resto-cohttp-client tezos-rpc-http) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_rpc_http) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_rpc_http) (modules RPC_client)) (library @@ -36,9 +38,10 @@ cohttp-lwt-unix resto-cohttp-client tezos-rpc-http-client) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_rpc_http_client) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_rpc_http_client) (modules RPC_client_unix)) (library diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index 2db116f142b9..19028be5b4a5 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -62,7 +62,8 @@ tezos-sapling tezos-hacl) (js_of_ocaml) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (modules test_js)) (rule diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index 6935d0a634e4..41f4f37bf967 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -11,9 +11,10 @@ tezos-shell-services alcotest) (js_of_ocaml) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_shell_services)) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_shell_services)) (rule (alias runtest) diff --git a/src/lib_shell_services/test_helpers/dune b/src/lib_shell_services/test_helpers/dune index c1556e3d2498..9703a6db3345 100644 --- a/src/lib_shell_services/test_helpers/dune +++ b/src/lib_shell_services/test_helpers/dune @@ -10,5 +10,6 @@ tezos-test-helpers qcheck-core) (library_flags (:standard -linkall)) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) diff --git a/src/lib_shell_services/test_helpers/test/dune b/src/lib_shell_services/test_helpers/test/dune index 2ffe9b0db5b4..118fb038dfe6 100644 --- a/src/lib_shell_services/test_helpers/test/dune +++ b/src/lib_shell_services/test_helpers/test/dune @@ -11,8 +11,9 @@ tezos-shell-services-test-helpers qcheck-alcotest alcotest-lwt) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) (rule (alias runtest) diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune index 9f5f5285b125..418985a78612 100644 --- a/src/lib_stdlib/test-unix/dune +++ b/src/lib_stdlib/test-unix/dune @@ -16,8 +16,9 @@ lwt.unix tezos-test-helpers qcheck-alcotest) - (flags (:standard) - -open Tezos_stdlib)) + (flags + (:standard) + -open Tezos_stdlib)) (rule (alias runtest) diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index 97d93db6fa22..08787a317586 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -18,8 +18,9 @@ tezos-test-helpers qcheck-alcotest) (js_of_ocaml) - (flags (:standard) - -open Tezos_stdlib)) + (flags + (:standard) + -open Tezos_stdlib)) (rule (alias runtest) diff --git a/src/lib_version/dune b/src/lib_version/dune index 4b7a680e8b43..856941bec0fb 100644 --- a/src/lib_version/dune +++ b/src/lib_version/dune @@ -11,8 +11,9 @@ tezos-base tezos-version.parser) (js_of_ocaml) - (flags (:standard) - -open Tezos_base.TzPervasives)) + (flags + (:standard) + -open Tezos_base.TzPervasives)) (rule (targets generated_git_info.ml) diff --git a/src/lib_version/exe/dune b/src/lib_version/exe/dune index b15e9604d782..09ab40938448 100644 --- a/src/lib_version/exe/dune +++ b/src/lib_version/exe/dune @@ -15,8 +15,10 @@ (libraries tezos-version tezos-base.unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) - (flags (:standard) - -open Tezos_version) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) + (flags + (:standard) + -open Tezos_version) (modules tezos_print_version)) diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune index a84b182b3156..37000ed1a73c 100644 --- a/src/lib_version/test/dune +++ b/src/lib_version/test/dune @@ -11,8 +11,9 @@ tezos-version.parser alcotest) (js_of_ocaml) - (flags (:standard) - -open Tezos_version)) + (flags + (:standard) + -open Tezos_version)) (rule (alias runtest) diff --git a/src/lib_webassembly/interpreter/dune b/src/lib_webassembly/interpreter/dune index 87c2c2be05e3..eef6fe995c0c 100644 --- a/src/lib_webassembly/interpreter/dune +++ b/src/lib_webassembly/interpreter/dune @@ -16,6 +16,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-webassembly-interpreter) - (flags (:standard) - -open Tezos_webassembly_interpreter) + (flags + (:standard) + -open Tezos_webassembly_interpreter) (modules main)) diff --git a/src/lib_webassembly/test/dune b/src/lib_webassembly/test/dune index afa6877dcb55..2d1f38eb4e84 100644 --- a/src/lib_webassembly/test/dune +++ b/src/lib_webassembly/test/dune @@ -8,8 +8,9 @@ qcheck-core qcheck-alcotest alcotest) - (flags (:standard) - -open Tezos_webassembly_interpreter)) + (flags + (:standard) + -open Tezos_webassembly_interpreter)) (rule (alias runtest) diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index f6aa1419c821..39df9f62b2a5 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -21,7 +21,8 @@ (libraries tezos-base tezos-protocol-011-PtHangz2.parameters) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_011_PtHangz2/lib_protocol/dune b/src/proto_011_PtHangz2/lib_protocol/dune index 693fb21ff8fd..ac5b0b6701f6 100644 --- a/src/proto_011_PtHangz2/lib_protocol/dune +++ b/src/proto_011_PtHangz2/lib_protocol/dune @@ -140,9 +140,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2.raw) - (flags -w +a-4-40..42-44-45-48-51-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -376,9 +377,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-011-PtHangz2.raw) - (flags -w +a-4-40..42-44-45-48-51-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -497,9 +499,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-51-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/src/proto_012_Psithaca/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune index 1ea047c89545..4a7c9ba5761c 100644 --- a/src/proto_012_Psithaca/bin_accuser/dune +++ b/src/proto_012_Psithaca/bin_accuser/dune @@ -14,8 +14,9 @@ tezos-baking-012-Psithaca-commands tezos-stdlib-unix tezos-client-base-unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune index 780e30255ced..94b726ad423c 100644 --- a/src/proto_012_Psithaca/bin_baker/dune +++ b/src/proto_012_Psithaca/bin_baker/dune @@ -14,8 +14,9 @@ tezos-baking-012-Psithaca-commands tezos-stdlib-unix tezos-client-base-unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 47c29e8dce25..732a223c033d 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -22,7 +22,8 @@ tezos-base tezos-protocol-012-Psithaca.parameters tezos-protocol-012-Psithaca) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/lib_protocol/dune b/src/proto_012_Psithaca/lib_protocol/dune index 45f319b15b18..903eb32fe8db 100644 --- a/src/proto_012_Psithaca/lib_protocol/dune +++ b/src/proto_012_Psithaca/lib_protocol/dune @@ -157,9 +157,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-012-Psithaca.raw) - (flags -w +a-4-40..42-44-45-48-51-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -427,9 +428,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-012-Psithaca.raw) - (flags -w +a-4-40..42-44-45-48-51-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -565,9 +567,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-51-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/src/proto_013_PtJakart/bin_accuser/dune b/src/proto_013_PtJakart/bin_accuser/dune index 0fbb21098280..04210c11d41d 100644 --- a/src/proto_013_PtJakart/bin_accuser/dune +++ b/src/proto_013_PtJakart/bin_accuser/dune @@ -14,8 +14,9 @@ tezos-baking-013-PtJakart-commands tezos-stdlib-unix tezos-client-base-unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_baker/dune b/src/proto_013_PtJakart/bin_baker/dune index 90230933da2d..ccc4f03888a0 100644 --- a/src/proto_013_PtJakart/bin_baker/dune +++ b/src/proto_013_PtJakart/bin_baker/dune @@ -14,8 +14,9 @@ tezos-baking-013-PtJakart-commands tezos-stdlib-unix tezos-client-base-unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_sc_rollup_client/dune b/src/proto_013_PtJakart/bin_sc_rollup_client/dune index 69a6b77c573d..d1f27c48852c 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_client/dune @@ -18,8 +18,9 @@ tezos-protocol-013-PtJakart tezos-sc-rollup-013-PtJakart uri) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune index a33ea5cc720d..a1db0066b916 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune @@ -29,8 +29,9 @@ irmin ringo ringo-lwt) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune index fa0882783b2d..cf9430bf95d9 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune @@ -16,8 +16,9 @@ tezos-tx-rollup-013-PtJakart tezos-protocol-013-PtJakart.raw uri) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/dune b/src/proto_013_PtJakart/bin_tx_rollup_node/dune index 899ed7b111ea..aa082bffab66 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_node/dune @@ -13,8 +13,9 @@ tezos-client-base tezos-client-base-unix tezos-tx-rollup-013-PtJakart) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune index 4de96f7b4bee..b748774fdd59 100644 --- a/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune +++ b/src/proto_013_PtJakart/lib_delegate/test/tenderbrute/dune @@ -9,7 +9,8 @@ tezos-client-013-PtJakart tezos-protocol-013-PtJakart tezos-baking-013-PtJakart.tenderbrute) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 9df035d1b5b9..7836339820f8 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -22,7 +22,8 @@ tezos-base tezos-protocol-013-PtJakart.parameters tezos-protocol-013-PtJakart) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_protocol/dune b/src/proto_013_PtJakart/lib_protocol/dune index e7fc45e8f115..299a9f59a5ad 100644 --- a/src/proto_013_PtJakart/lib_protocol/dune +++ b/src/proto_013_PtJakart/lib_protocol/dune @@ -222,9 +222,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-013-PtJakart.raw) - (flags -w +a-4-40..42-44-45-48-51-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -624,9 +625,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-013-PtJakart.raw) - (flags -w +a-4-40..42-44-45-48-51-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -828,9 +830,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-51-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-51-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 9b0a6720baba..224537d64175 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -14,8 +14,9 @@ tezos-baking-alpha-commands tezos-stdlib-unix tezos-client-base-unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 06fbf587d5f2..5d1b3748f549 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -14,8 +14,9 @@ tezos-baking-alpha-commands tezos-stdlib-unix tezos-client-base-unix) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index dbf23645523a..f657b4f98d73 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -18,8 +18,9 @@ tezos-protocol-alpha tezos-sc-rollup-alpha uri) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 00bd5000b4ff..f16b4510fd82 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -29,8 +29,9 @@ irmin ringo ringo-lwt) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune index a8d5bc3c6d7a..689f1653b61e 100644 --- a/src/proto_alpha/bin_tx_rollup_client/dune +++ b/src/proto_alpha/bin_tx_rollup_client/dune @@ -16,8 +16,9 @@ tezos-tx-rollup-alpha tezos-protocol-alpha.raw uri) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_tx_rollup_node/dune b/src/proto_alpha/bin_tx_rollup_node/dune index 4ceb6cdc6b7e..f9c1cd6b5e2f 100644 --- a/src/proto_alpha/bin_tx_rollup_node/dune +++ b/src/proto_alpha/bin_tx_rollup_node/dune @@ -13,8 +13,9 @@ tezos-client-base tezos-client-base-unix tezos-tx-rollup-alpha) - (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (link_flags + (:standard) + (:include %{workspace_root}/static-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index 5bba20e18a7a..aec676a97675 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -9,7 +9,8 @@ tezos-client-alpha tezos-protocol-alpha tezos-baking-alpha.tenderbrute) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index 25fac718610e..ba6228fc1b09 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -10,9 +10,10 @@ tezos-protocol-environment tezos-protocol-alpha) (library_flags (:standard -linkall)) - (flags (:standard) - -open Tezos_base.TzPervasives - -open Tezos_protocol_alpha) + (flags + (:standard) + -open Tezos_base.TzPervasives + -open Tezos_protocol_alpha) (modules (:standard \ gen))) (executable @@ -21,7 +22,8 @@ tezos-base tezos-protocol-alpha.parameters tezos-protocol-alpha) - (link_flags (:standard -linkall)) + (link_flags + (:standard -linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune index ee039990e78f..027974698992 100644 --- a/src/proto_alpha/lib_protocol/dune +++ b/src/proto_alpha/lib_protocol/dune @@ -241,9 +241,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-alpha.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -682,9 +683,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-alpha.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -906,9 +908,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/src/proto_demo_counter/lib_protocol/dune b/src/proto_demo_counter/lib_protocol/dune index 2ea77e8ad30c..01575880f2a1 100644 --- a/src/proto_demo_counter/lib_protocol/dune +++ b/src/proto_demo_counter/lib_protocol/dune @@ -52,9 +52,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-demo-counter.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -112,9 +113,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-demo-counter.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -145,9 +147,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/src/proto_demo_noops/lib_protocol/dune b/src/proto_demo_noops/lib_protocol/dune index 507d65017a65..385aa9eea747 100644 --- a/src/proto_demo_noops/lib_protocol/dune +++ b/src/proto_demo_noops/lib_protocol/dune @@ -43,9 +43,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-demo-noops.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -83,9 +84,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-demo-noops.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -107,9 +109,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune index 319306c5f134..6b08fb73c284 100644 --- a/src/proto_genesis/lib_protocol/dune +++ b/src/proto_genesis/lib_protocol/dune @@ -43,9 +43,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-genesis.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Protocol)) (install @@ -87,9 +88,10 @@ tezos-protocol-environment tezos-protocol-environment.sigs tezos-protocol-genesis.raw) - (flags -w +a-4-40..42-44-45-48-70 - -warn-error +a - -nopervasives) + (flags + -w +a-4-40..42-44-45-48-70 + -warn-error +a + -nopervasives) (modules Functor)) (rule @@ -113,9 +115,10 @@ tezos-protocol-updater tezos-protocol-environment) (library_flags (:standard -linkall)) - (flags (:standard) - -w +a-4-40..42-44-45-48-70 - -warn-error +a) + (flags + (:standard) + -w +a-4-40..42-44-45-48-70 + -warn-error +a) (modules Registerer)) (rule diff --git a/tezt/lib_performance_regression/dune b/tezt/lib_performance_regression/dune index 53e45d9b1db2..5aa7dcb43042 100644 --- a/tezt/lib_performance_regression/dune +++ b/tezt/lib_performance_regression/dune @@ -8,6 +8,7 @@ tezt uri cohttp-lwt-unix) - (flags (:standard) - -open Tezt - -open Tezt.Base)) + (flags + (:standard) + -open Tezt + -open Tezt.Base)) diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune index e0ab5fa475d7..f038e2ee5a06 100644 --- a/tezt/self_tests/dune +++ b/tezt/self_tests/dune @@ -8,9 +8,10 @@ (libraries tezt tezt-tezos) - (flags (:standard) - -open Tezt - -open Tezt.Base - -open Tezt_tezos)) + (flags + (:standard) + -open Tezt + -open Tezt.Base + -open Tezt_tezos)) (cram (package tezt-self-tests) (deps tezt.sh main.exe)) -- GitLab