From 395b4890ebd6c018136748c45fd4576383aeb583 Mon Sep 17 00:00:00 2001 From: Lesenechal Remi Date: Wed, 12 Feb 2020 19:00:40 +0100 Subject: [PATCH] update the `dune.inc` magic trick --- .../ligo-utils/tezos-protocol-alpha/dune.inc | 46 +++++++++---------- ...tezos-embedded-protocol-006-PsCARTHA.opam} | 6 +-- ....opam => tezos-protocol-006-PsCARTHA.opam} | 4 +- 3 files changed, 28 insertions(+), 28 deletions(-) rename vendors/ligo-utils/tezos-protocol-alpha/{tezos-embedded-protocol-005-PsBabyM1.opam => tezos-embedded-protocol-006-PsCARTHA.opam} (89%) rename vendors/ligo-utils/tezos-protocol-alpha/{tezos-protocol-005-PsBabyM1.opam => tezos-protocol-006-PsCARTHA.opam} (92%) diff --git a/vendors/ligo-utils/tezos-protocol-alpha/dune.inc b/vendors/ligo-utils/tezos-protocol-alpha/dune.inc index cf411a5e3..1d0ec5fae 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha/dune.inc +++ b/vendors/ligo-utils/tezos-protocol-alpha/dune.inc @@ -11,7 +11,7 @@ (targets environment.ml) (action (write-file %{targets} - "module Name = struct let name = \"005-PsBabyM1\" end + "module Name = struct let name = \"006-PsCARTHA\" end include Tezos_protocol_environment.MakeV1(Name)() module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end "))) @@ -22,7 +22,7 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end (:src_dir TEZOS_PROTOCOL)) (action (with-stdout-to %{targets} - (chdir %{workspace_root} (run %{bin:tezos-embedded-protocol-packer} "%{src_dir}" "005_PsBabyM1"))))) + (chdir %{workspace_root} (run %{bin:tezos-embedded-protocol-packer} "%{src_dir}" "006_PsCARTHA"))))) (rule (targets functor.ml) @@ -37,67 +37,67 @@ module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end (deps misc.mli misc.ml storage_description.mli storage_description.ml state_hash.ml nonce_hash.ml script_expr_hash.ml contract_hash.ml blinded_public_key_hash.mli blinded_public_key_hash.ml qty_repr.ml tez_repr.mli tez_repr.ml period_repr.mli period_repr.ml time_repr.mli time_repr.ml constants_repr.ml fitness_repr.ml raw_level_repr.mli raw_level_repr.ml voting_period_repr.mli voting_period_repr.ml cycle_repr.mli cycle_repr.ml level_repr.mli level_repr.ml seed_repr.mli seed_repr.ml gas_limit_repr.mli gas_limit_repr.ml script_int_repr.mli script_int_repr.ml script_timestamp_repr.mli script_timestamp_repr.ml michelson_v1_primitives.mli michelson_v1_primitives.ml script_repr.mli script_repr.ml legacy_script_support_repr.mli legacy_script_support_repr.ml contract_repr.mli contract_repr.ml roll_repr.mli roll_repr.ml vote_repr.mli vote_repr.ml block_header_repr.mli block_header_repr.ml operation_repr.mli operation_repr.ml manager_repr.mli manager_repr.ml commitment_repr.mli commitment_repr.ml parameters_repr.mli parameters_repr.ml raw_context.mli raw_context.ml storage_sigs.ml storage_functors.mli storage_functors.ml storage.mli storage.ml constants_storage.ml level_storage.mli level_storage.ml nonce_storage.mli nonce_storage.ml seed_storage.mli seed_storage.ml roll_storage.mli roll_storage.ml delegate_storage.mli delegate_storage.ml contract_storage.mli contract_storage.ml bootstrap_storage.mli bootstrap_storage.ml fitness_storage.ml vote_storage.mli vote_storage.ml commitment_storage.mli commitment_storage.ml init_storage.ml fees_storage.mli fees_storage.ml alpha_context.mli alpha_context.ml script_typed_ir.ml script_tc_errors.ml michelson_v1_gas.mli michelson_v1_gas.ml script_ir_annot.mli script_ir_annot.ml script_ir_translator.mli script_ir_translator.ml script_tc_errors_registration.ml script_interpreter.mli script_interpreter.ml baking.mli baking.ml amendment.mli amendment.ml apply_results.mli apply_results.ml apply.ml services_registration.ml constants_services.mli constants_services.ml contract_services.mli contract_services.ml delegate_services.mli delegate_services.ml helpers_services.mli helpers_services.ml voting_services.mli voting_services.ml alpha_services.mli alpha_services.ml main.mli main.ml) (action (write-file %{targets} - "module Environment = Tezos_protocol_environment_005_PsBabyM1.Environment -let hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsBabyM1eUXZseaJdmXFApDSBqj8YBfwELoxZHHW77EMcAbbwAS\" + "module Environment = Tezos_protocol_environment_006_PsCARTHA.Environment +let hash = Tezos_crypto.Protocol_hash.of_b58check_exn \"PsCARTHAGazKbHtnKfLzQg3kms52kSRpgnDY982a9oYsSXRLQEb\" let name = Environment.Name.name -include Tezos_raw_protocol_005_PsBabyM1 -include Tezos_raw_protocol_005_PsBabyM1.Main +include Tezos_raw_protocol_006_PsCARTHA +include Tezos_raw_protocol_006_PsCARTHA.Main "))) (library - (name tezos_protocol_environment_005_PsBabyM1) - (public_name tezos-protocol-005-PsBabyM1.environment) + (name tezos_protocol_environment_006_PsCARTHA) + (public_name tezos-protocol-006-PsCARTHA.environment) (library_flags (:standard -linkall)) (libraries tezos-protocol-environment) (modules Environment)) (library - (name tezos_raw_protocol_005_PsBabyM1) - (public_name tezos-protocol-005-PsBabyM1.raw) - (libraries tezos_protocol_environment_005_PsBabyM1) + (name tezos_raw_protocol_006_PsCARTHA) + (public_name tezos-protocol-006-PsCARTHA.raw) + (libraries tezos_protocol_environment_006_PsCARTHA) (library_flags (:standard -linkall)) (flags (:standard -nopervasives -nostdlib -w +a-4-6-7-9-29-32-40..42-44-45-48 -warn-error -a+8 - -open Tezos_protocol_environment_005_PsBabyM1__Environment + -open Tezos_protocol_environment_006_PsCARTHA__Environment -open Pervasives -open Error_monad)) (modules Misc Storage_description State_hash Nonce_hash Script_expr_hash Contract_hash Blinded_public_key_hash Qty_repr Tez_repr Period_repr Time_repr Constants_repr Fitness_repr Raw_level_repr Voting_period_repr Cycle_repr Level_repr Seed_repr Gas_limit_repr Script_int_repr Script_timestamp_repr Michelson_v1_primitives Script_repr Legacy_script_support_repr Contract_repr Roll_repr Vote_repr Block_header_repr Operation_repr Manager_repr Commitment_repr Parameters_repr Raw_context Storage_sigs Storage_functors Storage Constants_storage Level_storage Nonce_storage Seed_storage Roll_storage Delegate_storage Contract_storage Bootstrap_storage Fitness_storage Vote_storage Commitment_storage Init_storage Fees_storage Alpha_context Script_typed_ir Script_tc_errors Michelson_v1_gas Script_ir_annot Script_ir_translator Script_tc_errors_registration Script_interpreter Baking Amendment Apply_results Apply Services_registration Constants_services Contract_services Delegate_services Helpers_services Voting_services Alpha_services Main)) (install (section lib) - (package tezos-protocol-005-PsBabyM1) + (package tezos-protocol-006-PsCARTHA) (files (TEZOS_PROTOCOL as raw/TEZOS_PROTOCOL))) (library - (name tezos_protocol_005_PsBabyM1) - (public_name tezos-protocol-005-PsBabyM1) + (name tezos_protocol_006_PsCARTHA) + (public_name tezos-protocol-006-PsCARTHA) (libraries tezos-protocol-environment tezos-protocol-environment-sigs - tezos_raw_protocol_005_PsBabyM1) + tezos_raw_protocol_006_PsCARTHA) (flags -w "+a-4-6-7-9-29-40..42-44-45-48" -warn-error "-a+8" -nopervasives) (modules Protocol)) (library - (name tezos_protocol_005_PsBabyM1_functor) - (public_name tezos-protocol-005-PsBabyM1.functor) + (name tezos_protocol_006_PsCARTHA_functor) + (public_name tezos-protocol-006-PsCARTHA.functor) (libraries tezos-protocol-environment tezos-protocol-environment-sigs - tezos_raw_protocol_005_PsBabyM1) + tezos_raw_protocol_006_PsCARTHA) (flags -w "+a-4-6-7-9-29-40..42-44-45-48" -warn-error "-a+8" -nopervasives) (modules Functor)) (library - (name tezos_embedded_protocol_005_PsBabyM1) - (public_name tezos-embedded-protocol-005-PsBabyM1) + (name tezos_embedded_protocol_006_PsCARTHA) + (public_name tezos-embedded-protocol-006-PsCARTHA) (library_flags (:standard -linkall)) - (libraries tezos-protocol-005-PsBabyM1 + (libraries tezos-protocol-006-PsCARTHA tezos-protocol-updater tezos-protocol-environment) (flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48 @@ -106,4 +106,4 @@ include Tezos_raw_protocol_005_PsBabyM1.Main (alias (name runtest_sandbox) - (deps .tezos_protocol_005_PsBabyM1.objs/native/tezos_protocol_005_PsBabyM1.cmx)) + (deps .tezos_protocol_006_PsCARTHA.objs/native/tezos_protocol_006_PsCARTHA.cmx)) diff --git a/vendors/ligo-utils/tezos-protocol-alpha/tezos-embedded-protocol-005-PsBabyM1.opam b/vendors/ligo-utils/tezos-protocol-alpha/tezos-embedded-protocol-006-PsCARTHA.opam similarity index 89% rename from vendors/ligo-utils/tezos-protocol-alpha/tezos-embedded-protocol-005-PsBabyM1.opam rename to vendors/ligo-utils/tezos-protocol-alpha/tezos-embedded-protocol-006-PsCARTHA.opam index d1468da55..02c8d046d 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha/tezos-embedded-protocol-005-PsBabyM1.opam +++ b/vendors/ligo-utils/tezos-protocol-alpha/tezos-embedded-protocol-006-PsCARTHA.opam @@ -8,9 +8,9 @@ license: "MIT" depends: [ "tezos-tooling" { with-test } "ocamlfind" { build } - "dune" { build & >= "1.7" } + "dune" { >= "1.7" } "tezos-base" - "tezos-protocol-005-PsBabyM1" + "tezos-protocol-006-PsCARTHA" "tezos-protocol-compiler" "tezos-protocol-updater" ] @@ -19,7 +19,7 @@ build: [ "%{tezos-protocol-compiler:lib}%/replace" "%{tezos-protocol-compiler:lib}%/dune_protocol.template" "dune" - "005_PsBabyM1" + "006_PsCARTHA" ] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} diff --git a/vendors/ligo-utils/tezos-protocol-alpha/tezos-protocol-005-PsBabyM1.opam b/vendors/ligo-utils/tezos-protocol-alpha/tezos-protocol-006-PsCARTHA.opam similarity index 92% rename from vendors/ligo-utils/tezos-protocol-alpha/tezos-protocol-005-PsBabyM1.opam rename to vendors/ligo-utils/tezos-protocol-alpha/tezos-protocol-006-PsCARTHA.opam index d1497019b..08f2c0c57 100644 --- a/vendors/ligo-utils/tezos-protocol-alpha/tezos-protocol-005-PsBabyM1.opam +++ b/vendors/ligo-utils/tezos-protocol-alpha/tezos-protocol-006-PsCARTHA.opam @@ -8,7 +8,7 @@ license: "MIT" depends: [ "tezos-tooling" { with-test } "ocamlfind" { build } - "dune" { build & >= "1.7" } + "dune" { >= "1.7" } "tezos-base" "tezos-protocol-compiler" ] @@ -17,7 +17,7 @@ build: [ "%{tezos-protocol-compiler:lib}%/replace" "%{tezos-protocol-compiler:lib}%/dune_protocol.template" "dune" - "005_PsBabyM1" + "006_PsCARTHA" ] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test}