From 3314ef9fbc070b2b00fdd73fc6c97d788d9e4220 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Tue, 30 May 2023 11:22:06 +0200 Subject: [PATCH 1/6] Manifest: Add dune_with_test argument to tests --- manifest/main.ml | 8 +++++--- manifest/manifest.ml | 31 +++++++++++++++++++++++++++---- manifest/manifest.mli | 11 +++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index a4e0ba208c9d..d54569fae907 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -409,7 +409,7 @@ let tezt_core_lib = let tezt_js_lib = external_sublib tezt_lib ~js_compatible:true "tezt.js" let tezt ~opam ~path ?js_compatible ?modes ?(deps = []) ?dep_globs - ?dep_globs_rec ?dep_files ?opam_with_test ?synopsis + ?dep_globs_rec ?dep_files ?opam_with_test ?dune_with_test ?synopsis ?(with_macos_security_framework = false) ?flags ?dune ?preprocess ?preprocessor_deps l = tezt_without_tezt_lib_dependency @@ -426,6 +426,7 @@ let tezt ~opam ~path ?js_compatible ?modes ?(deps = []) ?dep_globs ?dep_globs_rec ?dep_files ?opam_with_test + ?dune_with_test ?flags ?dune ?preprocess @@ -466,7 +467,8 @@ let registered_octez_libs : sub_lib_documentation_link list ref = ref [] let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs ?documentation ?conflicts ?flags ?time_measurement_ppx ?deps ?dune ?modules ?linkall ?js_compatible ?bisect_ppx ?preprocess ?opam_only_deps ?cram - ?release_status ?ctypes ?c_library_flags ?synopsis:_ public_name ~path = + ?release_status ?ctypes ?c_library_flags ?opam_with_test ?synopsis:_ + public_name ~path = let name = let s = Option.value ~default:public_name internal_name in String.map @@ -492,7 +494,7 @@ let octez_lib ?internal_name ?js_of_ocaml ?inline_tests ?foreign_stubs ~internal_name:name ~opam:"octez-libs" ~synopsis:"Octez libs" - ~opam_with_test:Always + ?opam_with_test ?linkall ?js_compatible ?bisect_ppx diff --git a/manifest/manifest.ml b/manifest/manifest.ml index a61c54f4364e..f5f0163f72e3 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -89,6 +89,8 @@ module Dune = struct names : string list; } + let dand s1 s2 = S "and" :: s1 :: s2 + (* Test whether an s-expression is empty. *) let rec is_empty = function | E -> true @@ -1732,13 +1734,29 @@ module Target = struct | head :: tail -> Private_executable (head, tail) let test ?(alias = "runtest") ?dep_files ?dep_globs ?dep_globs_rec ?locks - ?enabled_if ?(lib_deps = []) = + ?enabled_if ?(dune_with_test = Always) ?(lib_deps = []) = (match (alias, enabled_if, locks) with | "", Some _, _ | "", _, Some _ -> invalid_arg "Target.tests: cannot specify enabled_if or locks without alias" | _ -> ()) ; - let runtest_alias = if alias = "" then None else Some alias in + (* Ensures that there is an alias in case there is test constraint *) + let runtest_alias = + if alias = "" then + match dune_with_test with Always -> None | _ -> Some "runtest" + else Some alias + in + let enabled_if = + match dune_with_test with + | Always -> enabled_if + | Only_on_64_arch -> ( + let enabled_if_dune_with_test = Dune.(S "%{arch_sixtyfour}") in + match enabled_if with + | Some enabled_if -> + Some Dune.(dand enabled_if_dune_with_test [enabled_if]) + | None -> Some enabled_if_dune_with_test) + | Never -> Some Dune.(S "false") + in internal ?dep_files ?dep_globs ?dep_globs_rec @@ fun test_name -> Test_executable {names = (test_name, []); runtest_alias; locks; enabled_if; lib_deps} @@ -1885,6 +1903,7 @@ type tezt_target = { modes : Dune.mode list option; synopsis : string option; opam_with_test : with_test option; + dune_with_test : with_test option; with_macos_security_framework : bool; flags : Flags.t option; dune : Dune.s_expr; @@ -1897,8 +1916,9 @@ let tezt_targets_by_path : tezt_target String_map.t ref = ref String_map.empty let tezt ~opam ~path ?js_compatible ?modes ?(lib_deps = []) ?(exe_deps = []) ?(js_deps = []) ?(dep_globs = []) ?(dep_globs_rec = []) ?(dep_files = []) - ?synopsis ?opam_with_test ?(with_macos_security_framework = false) ?flags - ?(dune = Dune.[]) ?(preprocess = []) ?(preprocessor_deps = []) modules = + ?synopsis ?opam_with_test ?dune_with_test + ?(with_macos_security_framework = false) ?flags ?(dune = Dune.[]) + ?(preprocess = []) ?(preprocessor_deps = []) modules = if String_map.mem path !tezt_targets_by_path then invalid_arg ("cannot call Manifest.tezt twice for the same directory: " ^ path) ; @@ -1934,6 +1954,7 @@ let tezt ~opam ~path ?js_compatible ?modes ?(lib_deps = []) ?(exe_deps = []) modes; synopsis; opam_with_test; + dune_with_test; with_macos_security_framework; flags; dune; @@ -1958,6 +1979,7 @@ let register_tezt_targets ~make_tezt_exe = modes; synopsis; opam_with_test; + dune_with_test; with_macos_security_framework; flags; tezt_local_test_lib; @@ -1995,6 +2017,7 @@ let register_tezt_targets ~make_tezt_exe = ~dep_files ~modules:[exe_name] ?opam_with_test + ?dune_with_test ~preprocess ~preprocessor_deps ?flags diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 56c455f25ded..761c44377c2c 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -925,6 +925,15 @@ val private_exes : string list maker - [dep_globs_rec]: a list of files to add as dependencies using [(deps (glob_files_rec ...))] in the [dune] file. + - [dune_with_test]: Specifies a condition for the test to be run on the dune file. + If set to [Only_on_64_arch], [%{arch_sixtyfour}] is added to the [enabled_if] clause. + If set to [Always], nothing is added to the [enabled_if] clause. + If set to [Never], [false] is added to the [enabled_if] clause. + + - [enabled_if]: add a custom [enabled_if] clause. If both [dune_with_test] and + [enabled_if] are set, then logically, the resulting clause is the conjunction + of the two (i.e. [(and )]) + Since tests are private, they have no public name: the ['a] argument of [maker] is the internal name. *) val test : @@ -934,6 +943,7 @@ val test : ?dep_globs_rec:string list -> ?locks:string -> ?enabled_if:Dune.s_expr -> + ?dune_with_test:with_test -> ?lib_deps:target list -> string maker @@ -988,6 +998,7 @@ val tezt : ?dep_files:string list -> ?synopsis:string -> ?opam_with_test:with_test -> + ?dune_with_test:with_test -> ?with_macos_security_framework:bool -> ?flags:Flags.t -> ?dune:Dune.s_expr -> -- GitLab From a07c24e904305bfd76a3dba2111e8b500ae17bf8 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Wed, 28 Jun 2023 14:50:25 +0200 Subject: [PATCH 2/6] Manifest: Replace opam_with_test by dune_with_test in lwt-result --- manifest/main.ml | 10 +--------- opam/tezos-lwt-result-stdlib.opam | 2 +- src/lib_lwt_result_stdlib/test/dune | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index d54569fae907..6d1229623f90 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -644,7 +644,6 @@ let octez_lwt_result_stdlib_bare_functor_outputs = ~internal_name:"bare_functor_outputs" ~js_compatible:true ~deps:[lwt] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_bare_sigs = public_lib @@ -653,7 +652,6 @@ let octez_lwt_result_stdlib_bare_sigs = ~internal_name:"bare_sigs" ~js_compatible:true ~deps:[seqes; lwt; octez_lwt_result_stdlib_bare_functor_outputs] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_bare_structs = public_lib @@ -662,7 +660,6 @@ let octez_lwt_result_stdlib_bare_structs = ~internal_name:"bare_structs" ~js_compatible:true ~deps:[seqes; lwt; octez_lwt_result_stdlib_bare_sigs] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_traced_functor_outputs = public_lib @@ -671,7 +668,6 @@ let octez_lwt_result_stdlib_traced_functor_outputs = ~internal_name:"traced_functor_outputs" ~js_compatible:true ~deps:[lwt; octez_lwt_result_stdlib_bare_sigs] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_traced_sigs = public_lib @@ -686,7 +682,6 @@ let octez_lwt_result_stdlib_traced_sigs = octez_lwt_result_stdlib_bare_structs; octez_lwt_result_stdlib_traced_functor_outputs; ] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_traced_structs = public_lib @@ -700,7 +695,6 @@ let octez_lwt_result_stdlib_traced_structs = octez_lwt_result_stdlib_traced_sigs; octez_lwt_result_stdlib_bare_structs; ] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib = public_lib @@ -717,7 +711,6 @@ let octez_lwt_result_stdlib = octez_lwt_result_stdlib_traced_sigs; octez_lwt_result_stdlib_traced_structs; ] - ~opam_with_test:Only_on_64_arch let octez_lwt_result_stdlib_examples_traces = public_lib @@ -730,7 +723,6 @@ let octez_lwt_result_stdlib_examples_traces = octez_lwt_result_stdlib_bare_structs; octez_lwt_result_stdlib_traced_sigs; ] - ~opam_with_test:Only_on_64_arch let _octez_lwt_result_stdlib_tests = tezt @@ -758,7 +750,7 @@ let _octez_lwt_result_stdlib_tests = qcheck_alcotest; octez_test_helpers |> open_; ] - ~opam_with_test:Only_on_64_arch + ~dune_with_test:Only_on_64_arch let octez_error_monad = octez_lib diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam index de226728c41a..e8d4ef2356dd 100644 --- a/opam/tezos-lwt-result-stdlib.opam +++ b/opam/tezos-lwt-result-stdlib.opam @@ -20,6 +20,6 @@ depends: [ build: [ ["rm" "-r" "vendors" "contrib"] ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] { with-test & arch != "arm32" & arch != "x86_32" } + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] synopsis: "Tezos: error-aware stdlib replacement" diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 3ecf4d8d1376..6d3a95535586 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -44,7 +44,7 @@ (rule (alias runtest) (package tezos-lwt-result-stdlib) - (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (enabled_if (and %{arch_sixtyfour} (<> false %{env:RUNTEZTALIAS=true}))) (action (run %{dep:./main.exe}))) (rule -- GitLab From 1c4a0381447097d0a9428d445d879f51075e8ed6 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 20 Jul 2023 11:18:17 +0200 Subject: [PATCH 3/6] Manifest: Add Tezos-lwt-result-stdlib to Octez-libs --- .gitlab/ci/jobs/packaging/opam_package.yml | 7 ------ dune-project | 1 - manifest/main.ml | 25 +++++++++++-------- opam/octez-libs.opam | 2 +- opam/tezos-clic.opam | 1 - opam/tezos-lwt-result-stdlib.opam | 25 ------------------- opam/tezos-protocol-environment.opam | 1 - opam/tezos-sapling.opam | 1 - opam/tezos-scoru-wasm.opam | 1 - opam/tezos-webassembly-interpreter.opam | 1 - src/lib_base/index.mld | 8 ++++++ src/lib_clic/dune | 2 +- src/lib_clic/unix/dune | 2 +- src/lib_crypto/dune | 2 +- src/lib_error_monad/dune | 2 +- src/lib_event_logging/dune | 2 +- src/lib_event_logging/test_helpers/dune | 2 +- src/lib_hacl/test/dune | 2 +- .../bare/functor_outputs/dune | 2 +- src/lib_lwt_result_stdlib/bare/sigs/dune | 4 +-- src/lib_lwt_result_stdlib/bare/structs/dune | 4 +-- src/lib_lwt_result_stdlib/dune | 12 ++++----- .../examples/traces/dune | 6 ++--- src/lib_lwt_result_stdlib/test/dune | 6 ++--- ...{index.mld => tezos_lwt_result_stdlib.mld} | 0 .../traced/functor_outputs/dune | 4 +-- src/lib_lwt_result_stdlib/traced/sigs/dune | 8 +++--- src/lib_lwt_result_stdlib/traced/structs/dune | 6 ++--- src/lib_protocol_environment/structs/dune | 2 +- src/lib_sapling/dune | 2 +- src/lib_scoru_wasm/dune | 2 +- src/lib_stdlib_unix/dune | 2 +- src/lib_tree_encoding/dune | 2 +- src/lib_webassembly/dune | 2 +- 34 files changed, 63 insertions(+), 88 deletions(-) delete mode 100644 opam/tezos-lwt-result-stdlib.opam rename src/lib_lwt_result_stdlib/{index.mld => tezos_lwt_result_stdlib.mld} (100%) diff --git a/.gitlab/ci/jobs/packaging/opam_package.yml b/.gitlab/ci/jobs/packaging/opam_package.yml index 995ab965b2d6..da395bbd4b15 100644 --- a/.gitlab/ci/jobs/packaging/opam_package.yml +++ b/.gitlab/ci/jobs/packaging/opam_package.yml @@ -1237,13 +1237,6 @@ opam:tezos-layer2-utils-018-Proxford: # Ignoring unreleased package tezos-lazy-containers-tests. -opam:tezos-lwt-result-stdlib: - extends: - - .opam_template - - .rules_template__trigger_all_opam_batch_7 - variables: - package: tezos-lwt-result-stdlib - # Ignoring unreleased package tezos-micheline-rewriting. opam:tezos-mockup: diff --git a/dune-project b/dune-project index b2ee2e58b2a9..f16e255a7997 100644 --- a/dune-project +++ b/dune-project @@ -152,7 +152,6 @@ (package (name tezos-layer2-utils-018-Proxford)) (package (name tezos-layer2-utils-alpha)) (package (name tezos-lazy-containers-tests)(allow_empty)) -(package (name tezos-lwt-result-stdlib)) (package (name tezos-micheline-rewriting)) (package (name tezos-mockup)) (package (name tezos-mockup-commands)) diff --git a/manifest/main.ml b/manifest/main.ml index 6d1229623f90..46b48d080ed2 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -638,7 +638,7 @@ let _octez_stdlib_test_unix = ] let octez_lwt_result_stdlib_bare_functor_outputs = - public_lib + octez_lib "tezos-lwt-result-stdlib.bare.functor-outputs" ~path:"src/lib_lwt_result_stdlib/bare/functor_outputs" ~internal_name:"bare_functor_outputs" @@ -646,7 +646,7 @@ let octez_lwt_result_stdlib_bare_functor_outputs = ~deps:[lwt] let octez_lwt_result_stdlib_bare_sigs = - public_lib + octez_lib "tezos-lwt-result-stdlib.bare.sigs" ~path:"src/lib_lwt_result_stdlib/bare/sigs" ~internal_name:"bare_sigs" @@ -654,7 +654,7 @@ let octez_lwt_result_stdlib_bare_sigs = ~deps:[seqes; lwt; octez_lwt_result_stdlib_bare_functor_outputs] let octez_lwt_result_stdlib_bare_structs = - public_lib + octez_lib "tezos-lwt-result-stdlib.bare.structs" ~path:"src/lib_lwt_result_stdlib/bare/structs" ~internal_name:"bare_structs" @@ -662,7 +662,7 @@ let octez_lwt_result_stdlib_bare_structs = ~deps:[seqes; lwt; octez_lwt_result_stdlib_bare_sigs] let octez_lwt_result_stdlib_traced_functor_outputs = - public_lib + octez_lib "tezos-lwt-result-stdlib.traced.functor-outputs" ~path:"src/lib_lwt_result_stdlib/traced/functor_outputs" ~internal_name:"traced_functor_outputs" @@ -670,7 +670,7 @@ let octez_lwt_result_stdlib_traced_functor_outputs = ~deps:[lwt; octez_lwt_result_stdlib_bare_sigs] let octez_lwt_result_stdlib_traced_sigs = - public_lib + octez_lib "tezos-lwt-result-stdlib.traced.sigs" ~path:"src/lib_lwt_result_stdlib/traced/sigs" ~internal_name:"traced_sigs" @@ -684,7 +684,7 @@ let octez_lwt_result_stdlib_traced_sigs = ] let octez_lwt_result_stdlib_traced_structs = - public_lib + octez_lib "tezos-lwt-result-stdlib.traced.structs" ~path:"src/lib_lwt_result_stdlib/traced/structs" ~internal_name:"traced_structs" @@ -697,12 +697,17 @@ let octez_lwt_result_stdlib_traced_structs = ] let octez_lwt_result_stdlib = - public_lib + octez_lib "tezos-lwt-result-stdlib" ~path:"src/lib_lwt_result_stdlib" ~synopsis:"Tezos: error-aware stdlib replacement" ~js_compatible:true - ~documentation:[Dune.[S "package"; S "tezos-lwt-result-stdlib"]] + ~documentation: + Dune. + [ + [S "package"; S "octez-libs"]; + [S "mld_files"; S "tezos_lwt_result_stdlib"]; + ] ~deps: [ lwt; @@ -713,7 +718,7 @@ let octez_lwt_result_stdlib = ] let octez_lwt_result_stdlib_examples_traces = - public_lib + octez_lib "tezos-lwt-result-stdlib.examples.traces" ~path:"src/lib_lwt_result_stdlib/examples/traces" ~internal_name:"traces" @@ -740,7 +745,7 @@ let _octez_lwt_result_stdlib_tests = "test_fuzzing_map_against_stdlib"; ] ~path:"src/lib_lwt_result_stdlib/test" - ~opam:"tezos-lwt-result-stdlib" + ~opam:"octez-libs" ~deps: [ octez_lwt_result_stdlib |> open_; diff --git a/opam/octez-libs.opam b/opam/octez-libs.opam index 26f6a0a39e6f..ee1e5de84ddb 100644 --- a/opam/octez-libs.opam +++ b/opam/octez-libs.opam @@ -16,9 +16,9 @@ depends: [ "zarith_stubs_js" "lwt" { >= "5.6.0" } "aches" { >= "1.0.0" } + "seqes" { >= "0.2" } "data-encoding" { >= "0.7.1" & < "1.0.0" } "lwt-canceler" { >= "0.3" & < "0.4" } - "tezos-lwt-result-stdlib" "hacl-star" { >= "0.7.1" & < "0.8" } "hacl-star-raw" "ctypes_stubs_js" diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index 714fa6148f29..0dda5d27b955 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -13,7 +13,6 @@ depends: [ "octez-libs" "lwt" { >= "5.6.0" } "re" { >= "1.9.0" } - "tezos-lwt-result-stdlib" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam deleted file mode 100644 index e8d4ef2356dd..000000000000 --- a/opam/tezos-lwt-result-stdlib.opam +++ /dev/null @@ -1,25 +0,0 @@ -# This file was automatically generated, do not edit. -# Edit file manifest/main.ml instead. -opam-version: "2.0" -maintainer: "contact@tezos.com" -authors: ["Tezos devteam"] -homepage: "https://www.tezos.com/" -bug-reports: "https://gitlab.com/tezos/tezos/issues" -dev-repo: "git+https://gitlab.com/tezos/tezos.git" -license: "MIT" -depends: [ - "dune" { >= "3.0" } - "ocaml" { >= "4.14" } - "lwt" { >= "5.6.0" } - "seqes" { >= "0.2" } - "tezt" { with-test & >= "3.1.1" } - "octez-alcotezt" {with-test} - "qcheck-alcotest" { with-test & >= "0.20" } - "tezos-test-helpers" {with-test} -] -build: [ - ["rm" "-r" "vendors" "contrib"] - ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] {with-test} -] -synopsis: "Tezos: error-aware stdlib replacement" diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 7ab209f8c466..f82432179e3c 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14.0" & < "4.15" } "octez-libs" - "tezos-lwt-result-stdlib" "tezos-scoru-wasm" "data-encoding" { >= "0.7.1" & < "1.0.0" } "bls12-381" diff --git a/opam/tezos-sapling.opam b/opam/tezos-sapling.opam index fae7a094177a..9f4a253f6905 100644 --- a/opam/tezos-sapling.opam +++ b/opam/tezos-sapling.opam @@ -19,7 +19,6 @@ depends: [ "octez-libs" "tezos-rust-libs" { = "1.6" } "tezos-sapling-parameters" { >= "1.1.0" } - "tezos-lwt-result-stdlib" "tezt" { with-test & >= "3.1.1" } "octez-alcotezt" {with-test} ] diff --git a/opam/tezos-scoru-wasm.opam b/opam/tezos-scoru-wasm.opam index 7394a1522898..212fdba185a0 100644 --- a/opam/tezos-scoru-wasm.opam +++ b/opam/tezos-scoru-wasm.opam @@ -12,7 +12,6 @@ depends: [ "ocaml" { >= "4.14" } "octez-libs" "tezos-webassembly-interpreter" - "tezos-lwt-result-stdlib" "data-encoding" { >= "0.7.1" & < "1.0.0" } ] build: [ diff --git a/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 0dfd13f883b4..7d387ab83f4b 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -11,7 +11,6 @@ depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } "ppx_deriving" - "tezos-lwt-result-stdlib" "octez-libs" "zarith" { >= "1.12" & < "1.13" } "tezt" { with-test & >= "3.1.1" } diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index 35aac0b6aebf..db68ab9a0aca 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -4,6 +4,9 @@ This is a package containing some libraries used by the Octez project. It contains the following libraries: +- {{!module-Bare_functor_outputs}Bare_functor_outputs} +- {{!module-Bare_sigs}Bare_sigs} +- {{!module-Bare_structs}Bare_structs} - {{!module-Octez_bls12_381_polynomial}Octez_bls12_381_polynomial} - {{!module-Polynomial}Polynomial} - {{!module-Tezos_base}Tezos_base} @@ -42,4 +45,9 @@ It contains the following libraries: - {{!module-Tezos_version}Tezos_version} - {{!module-Tezos_version_parser}Tezos_version_parser} - {{!module-Tezt_tezos}Tezt_tezos} +- {{!module-Traced_functor_outputs}Traced_functor_outputs} +- {{!module-Traced_sigs}Traced_sigs} +- {{!module-Traced_structs}Traced_structs} +- {{!module-Traces}Traces} +- {{!page-tezos_lwt_result_stdlib}tezos_lwt_result_stdlib} - {{!page-tezos_workers}tezos_workers} \ No newline at end of file diff --git a/src/lib_clic/dune b/src/lib_clic/dune index 1a24ebea0565..a5fb8c9a1d95 100644 --- a/src/lib_clic/dune +++ b/src/lib_clic/dune @@ -10,7 +10,7 @@ lwt re octez-libs.tezos-error-monad - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_clic/unix/dune b/src/lib_clic/unix/dune index 72974a49f862..031908b96c77 100644 --- a/src/lib_clic/unix/dune +++ b/src/lib_clic/unix/dune @@ -10,7 +10,7 @@ tezos-clic octez-libs.tezos-stdlib-unix octez-libs.tezos-error-monad - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_crypto/dune b/src/lib_crypto/dune index 47777450266f..263602fed010 100644 --- a/src/lib_crypto/dune +++ b/src/lib_crypto/dune @@ -10,7 +10,7 @@ (libraries octez-libs.tezos-stdlib data-encoding - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib lwt octez-libs.tezos-hacl secp256k1-internal diff --git a/src/lib_error_monad/dune b/src/lib_error_monad/dune index 55c6e26e1ebb..25c0e1dc5ff3 100644 --- a/src/lib_error_monad/dune +++ b/src/lib_error_monad/dune @@ -10,7 +10,7 @@ data-encoding lwt-canceler lwt - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (js_of_ocaml) (flags (:standard) diff --git a/src/lib_event_logging/dune b/src/lib_event_logging/dune index a6a51551fa92..72eb70f0b244 100644 --- a/src/lib_event_logging/dune +++ b/src/lib_event_logging/dune @@ -9,7 +9,7 @@ octez-libs.tezos-stdlib data-encoding octez-libs.tezos-error-monad - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib uri) (js_of_ocaml) (flags diff --git a/src/lib_event_logging/test_helpers/dune b/src/lib_event_logging/test_helpers/dune index 4e7c08bb3e8c..d1edc19bdf77 100644 --- a/src/lib_event_logging/test_helpers/dune +++ b/src/lib_event_logging/test_helpers/dune @@ -6,7 +6,7 @@ (public_name octez-libs.tezos-event-logging-test-helpers) (libraries octez-libs.tezos-stdlib - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib data-encoding octez-libs.tezos-error-monad octez-libs.tezos-event-logging diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune index 2ca3980c1ef2..1d3da7d21343 100644 --- a/src/lib_hacl/test/dune +++ b/src/lib_hacl/test/dune @@ -10,7 +10,7 @@ tezt.core octez-libs.tezos-stdlib octez-libs.tezos-error-monad - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib zarith zarith_stubs_js data-encoding diff --git a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune index 94cbb784456b..eca2e26415ef 100644 --- a/src/lib_lwt_result_stdlib/bare/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/bare/functor_outputs/dune @@ -3,7 +3,7 @@ (library (name bare_functor_outputs) - (public_name tezos-lwt-result-stdlib.bare.functor-outputs) + (public_name octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs) (instrumentation (backend bisect_ppx)) (libraries lwt) diff --git a/src/lib_lwt_result_stdlib/bare/sigs/dune b/src/lib_lwt_result_stdlib/bare/sigs/dune index 4b2eb3666b10..38a5e298ca6d 100644 --- a/src/lib_lwt_result_stdlib/bare/sigs/dune +++ b/src/lib_lwt_result_stdlib/bare/sigs/dune @@ -3,10 +3,10 @@ (library (name bare_sigs) - (public_name tezos-lwt-result-stdlib.bare.sigs) + (public_name octez-libs.tezos-lwt-result-stdlib.bare.sigs) (instrumentation (backend bisect_ppx)) (libraries seqes lwt - tezos-lwt-result-stdlib.bare.functor-outputs) + octez-libs.tezos-lwt-result-stdlib.bare.functor-outputs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/bare/structs/dune b/src/lib_lwt_result_stdlib/bare/structs/dune index ba667d43a85c..711ccc12cb5a 100644 --- a/src/lib_lwt_result_stdlib/bare/structs/dune +++ b/src/lib_lwt_result_stdlib/bare/structs/dune @@ -3,10 +3,10 @@ (library (name bare_structs) - (public_name tezos-lwt-result-stdlib.bare.structs) + (public_name octez-libs.tezos-lwt-result-stdlib.bare.structs) (instrumentation (backend bisect_ppx)) (libraries seqes lwt - tezos-lwt-result-stdlib.bare.sigs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/dune b/src/lib_lwt_result_stdlib/dune index f78603486b82..d7891ab8aa91 100644 --- a/src/lib_lwt_result_stdlib/dune +++ b/src/lib_lwt_result_stdlib/dune @@ -3,14 +3,14 @@ (library (name tezos_lwt_result_stdlib) - (public_name tezos-lwt-result-stdlib) + (public_name octez-libs.tezos-lwt-result-stdlib) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs - tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.sigs - tezos-lwt-result-stdlib.traced.structs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs + octez-libs.tezos-lwt-result-stdlib.bare.structs + octez-libs.tezos-lwt-result-stdlib.traced.sigs + octez-libs.tezos-lwt-result-stdlib.traced.structs) (js_of_ocaml)) -(documentation (package tezos-lwt-result-stdlib)) +(documentation (package octez-libs) (mld_files tezos_lwt_result_stdlib)) diff --git a/src/lib_lwt_result_stdlib/examples/traces/dune b/src/lib_lwt_result_stdlib/examples/traces/dune index 6b61c718e119..f77cf6ff11f9 100644 --- a/src/lib_lwt_result_stdlib/examples/traces/dune +++ b/src/lib_lwt_result_stdlib/examples/traces/dune @@ -3,9 +3,9 @@ (library (name traces) - (public_name tezos-lwt-result-stdlib.examples.traces) + (public_name octez-libs.tezos-lwt-result-stdlib.examples.traces) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.sigs)) + octez-libs.tezos-lwt-result-stdlib.bare.structs + octez-libs.tezos-lwt-result-stdlib.traced.sigs)) diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 6d3a95535586..59f2b489105c 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -6,8 +6,8 @@ (instrumentation (backend bisect_ppx)) (libraries tezt.core - tezos-lwt-result-stdlib - tezos-lwt-result-stdlib.examples.traces + octez-libs.tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib.examples.traces lwt.unix octez-alcotezt qcheck-alcotest @@ -43,7 +43,7 @@ (rule (alias runtest) - (package tezos-lwt-result-stdlib) + (package octez-libs) (enabled_if (and %{arch_sixtyfour} (<> false %{env:RUNTEZTALIAS=true}))) (action (run %{dep:./main.exe}))) diff --git a/src/lib_lwt_result_stdlib/index.mld b/src/lib_lwt_result_stdlib/tezos_lwt_result_stdlib.mld similarity index 100% rename from src/lib_lwt_result_stdlib/index.mld rename to src/lib_lwt_result_stdlib/tezos_lwt_result_stdlib.mld diff --git a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune index b2d25e4f43e6..d4fb0e8ba29e 100644 --- a/src/lib_lwt_result_stdlib/traced/functor_outputs/dune +++ b/src/lib_lwt_result_stdlib/traced/functor_outputs/dune @@ -3,9 +3,9 @@ (library (name traced_functor_outputs) - (public_name tezos-lwt-result-stdlib.traced.functor-outputs) + (public_name octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/sigs/dune b/src/lib_lwt_result_stdlib/traced/sigs/dune index 2ca0ef41c25d..9504b8d93b3a 100644 --- a/src/lib_lwt_result_stdlib/traced/sigs/dune +++ b/src/lib_lwt_result_stdlib/traced/sigs/dune @@ -3,11 +3,11 @@ (library (name traced_sigs) - (public_name tezos-lwt-result-stdlib.traced.sigs) + (public_name octez-libs.tezos-lwt-result-stdlib.traced.sigs) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.bare.sigs - tezos-lwt-result-stdlib.bare.structs - tezos-lwt-result-stdlib.traced.functor-outputs) + octez-libs.tezos-lwt-result-stdlib.bare.sigs + octez-libs.tezos-lwt-result-stdlib.bare.structs + octez-libs.tezos-lwt-result-stdlib.traced.functor-outputs) (js_of_ocaml)) diff --git a/src/lib_lwt_result_stdlib/traced/structs/dune b/src/lib_lwt_result_stdlib/traced/structs/dune index 2e8ce184357b..de70664091f6 100644 --- a/src/lib_lwt_result_stdlib/traced/structs/dune +++ b/src/lib_lwt_result_stdlib/traced/structs/dune @@ -3,10 +3,10 @@ (library (name traced_structs) - (public_name tezos-lwt-result-stdlib.traced.structs) + (public_name octez-libs.tezos-lwt-result-stdlib.traced.structs) (instrumentation (backend bisect_ppx)) (libraries lwt - tezos-lwt-result-stdlib.traced.sigs - tezos-lwt-result-stdlib.bare.structs) + octez-libs.tezos-lwt-result-stdlib.traced.sigs + octez-libs.tezos-lwt-result-stdlib.bare.structs) (js_of_ocaml)) diff --git a/src/lib_protocol_environment/structs/dune b/src/lib_protocol_environment/structs/dune index 89faa5889dcd..86086e65fad2 100644 --- a/src/lib_protocol_environment/structs/dune +++ b/src/lib_protocol_environment/structs/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-stdlib octez-libs.tezos-crypto - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib tezos-scoru-wasm data-encoding bls12-381 diff --git a/src/lib_sapling/dune b/src/lib_sapling/dune index 57e893d7b012..4ae456eb0054 100644 --- a/src/lib_sapling/dune +++ b/src/lib_sapling/dune @@ -16,7 +16,7 @@ octez-libs.tezos-stdlib octez-libs.tezos-crypto octez-libs.tezos-error-monad - tezos-lwt-result-stdlib) + octez-libs.tezos-lwt-result-stdlib) (js_of_ocaml (javascript_files runtime.js)) (flags (:standard) diff --git a/src/lib_scoru_wasm/dune b/src/lib_scoru_wasm/dune index 3567d4ac5af8..e8dd3b586f0c 100644 --- a/src/lib_scoru_wasm/dune +++ b/src/lib_scoru_wasm/dune @@ -12,7 +12,7 @@ tezos-webassembly-interpreter octez-libs.tezos-context.sigs octez-libs.tezos-context.memory - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib data-encoding) (flags (:standard) diff --git a/src/lib_stdlib_unix/dune b/src/lib_stdlib_unix/dune index 49e72a487633..ac9959436ad3 100644 --- a/src/lib_stdlib_unix/dune +++ b/src/lib_stdlib_unix/dune @@ -8,7 +8,7 @@ (libraries unix octez-libs.tezos-error-monad - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib octez-libs.tezos-event-logging octez-libs.tezos-stdlib data-encoding diff --git a/src/lib_tree_encoding/dune b/src/lib_tree_encoding/dune index 0378e2499a31..8aa81d6d2319 100644 --- a/src/lib_tree_encoding/dune +++ b/src/lib_tree_encoding/dune @@ -8,7 +8,7 @@ (libraries octez-libs.tezos-base octez-libs.tezos-context.sigs - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib data-encoding) (flags (:standard) diff --git a/src/lib_webassembly/dune b/src/lib_webassembly/dune index cfa8f6c9a0aa..84e48184623f 100644 --- a/src/lib_webassembly/dune +++ b/src/lib_webassembly/dune @@ -6,7 +6,7 @@ (public_name tezos-webassembly-interpreter) (instrumentation (backend bisect_ppx)) (libraries - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib octez-libs.tezos-stdlib octez-libs.tezos-error-monad zarith -- GitLab From dd44d88149e956d1e23de0d03ed295e396fa6104 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 29 Jun 2023 14:54:19 +0200 Subject: [PATCH 4/6] Docs: Fix tezos-lwt-result-stdlib ref --- docs/developer/guidelines.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer/guidelines.rst b/docs/developer/guidelines.rst index 32d2d28fdb8b..7ec7752e4bac 100644 --- a/docs/developer/guidelines.rst +++ b/docs/developer/guidelines.rst @@ -658,7 +658,7 @@ Lwtreslib provides additional combinators ``List.concat_map_s``, ``List.concat_map_e``, and ``List.concat_map_es`` to replace the non-vanilla compositions. -Check the :package-api:`online documentation `. +Check the :package-api:`online documentation `. Coding conventions ------------------ -- GitLab From d97b16fd0888c5044a509c18ebea7fa644af42fa Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 29 Jun 2023 16:08:37 +0200 Subject: [PATCH 5/6] Long_tests: Fix dune --- tezt/long_tests/dune | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index e7b63f67dba2..33970e6813f5 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -3,7 +3,7 @@ (libraries tezt octez-libs.tezt-tezos tezt-performance-regression - tezos-lwt-result-stdlib + octez-libs.tezos-lwt-result-stdlib tezos-alpha-test-helpers octez-libs.tezos-micheline tezos-openapi -- GitLab From 22a6b4b79ff67f73a520cc5e59d6156a59a74deb Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Mon, 31 Jul 2023 17:07:20 +0200 Subject: [PATCH 6/6] Manifest: Capitalize octez-libs for doc --- manifest/main.ml | 10 ++++++++-- src/lib_base/index.mld | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 46b48d080ed2..b0de8eaf284a 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -527,7 +527,11 @@ let pp_octez_libs_index fmt registered_octez_libs = | Module registered -> Format.fprintf pp "- {{!module-%s}%s}" registered registered | Page registered -> - Format.fprintf pp "- {{!page-%s}%s}" registered registered + Format.fprintf + pp + "- {{!page-%s}%s}" + registered + (String.capitalize_ascii registered) in Format.fprintf fmt @@ -543,7 +547,9 @@ let pp_octez_libs_index fmt registered_octez_libs = | Page n1, Module n2 | Module n1, Page n2 | Module n1, Module n2 -> - String.compare n1 n2) + String.compare + (String.capitalize_ascii n1) + (String.capitalize_ascii n2)) registered_octez_libs let octez_test_helpers = diff --git a/src/lib_base/index.mld b/src/lib_base/index.mld index db68ab9a0aca..e397cdbe3a1f 100644 --- a/src/lib_base/index.mld +++ b/src/lib_base/index.mld @@ -29,6 +29,7 @@ It contains the following libraries: - {{!module-Tezos_event_logging_test_helpers}Tezos_event_logging_test_helpers} - {{!module-Tezos_hacl}Tezos_hacl} - {{!module-Tezos_lazy_containers}Tezos_lazy_containers} +- {{!page-tezos_lwt_result_stdlib}Tezos_lwt_result_stdlib} - {{!module-Tezos_micheline}Tezos_micheline} - {{!module-Tezos_p2p}Tezos_p2p} - {{!module-Tezos_p2p_services}Tezos_p2p_services} @@ -44,10 +45,9 @@ It contains the following libraries: - {{!module-Tezos_tree_encoding}Tezos_tree_encoding} - {{!module-Tezos_version}Tezos_version} - {{!module-Tezos_version_parser}Tezos_version_parser} +- {{!page-tezos_workers}Tezos_workers} - {{!module-Tezt_tezos}Tezt_tezos} - {{!module-Traced_functor_outputs}Traced_functor_outputs} - {{!module-Traced_sigs}Traced_sigs} - {{!module-Traced_structs}Traced_structs} -- {{!module-Traces}Traces} -- {{!page-tezos_lwt_result_stdlib}tezos_lwt_result_stdlib} -- {{!page-tezos_workers}tezos_workers} \ No newline at end of file +- {{!module-Traces}Traces} \ No newline at end of file -- GitLab