diff --git a/Makefile b/Makefile index c2db71170..30dbda58a 100644 --- a/Makefile +++ b/Makefile @@ -38,12 +38,12 @@ endif done PROTOCOLS := genesis alpha demo -DUNE_INCS=$(patsubst %,src/proto_%/lib_protocol/src/dune.inc, ${PROTOCOLS}) +DUNE_INCS=$(patsubst %,src/proto_%/lib_protocol/dune.inc, ${PROTOCOLS}) generate_dune: ${DUNE_INCS} -${DUNE_INCS}:: src/proto_%/lib_protocol/src/dune.inc: \ - src/proto_%/lib_protocol/src/TEZOS_PROTOCOL +${DUNE_INCS}:: src/proto_%/lib_protocol/dune.inc: \ + src/proto_%/lib_protocol/TEZOS_PROTOCOL dune build @$(dir $@)/runtest_dune_template --auto-promote touch $@ diff --git a/src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL b/src/proto_alpha/lib_protocol/TEZOS_PROTOCOL similarity index 100% rename from src/proto_alpha/lib_protocol/src/TEZOS_PROTOCOL rename to src/proto_alpha/lib_protocol/TEZOS_PROTOCOL diff --git a/src/proto_alpha/lib_protocol/src/alpha_context.ml b/src/proto_alpha/lib_protocol/alpha_context.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/alpha_context.ml rename to src/proto_alpha/lib_protocol/alpha_context.ml diff --git a/src/proto_alpha/lib_protocol/src/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/alpha_context.mli rename to src/proto_alpha/lib_protocol/alpha_context.mli diff --git a/src/proto_alpha/lib_protocol/src/alpha_services.ml b/src/proto_alpha/lib_protocol/alpha_services.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/alpha_services.ml rename to src/proto_alpha/lib_protocol/alpha_services.ml diff --git a/src/proto_alpha/lib_protocol/src/alpha_services.mli b/src/proto_alpha/lib_protocol/alpha_services.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/alpha_services.mli rename to src/proto_alpha/lib_protocol/alpha_services.mli diff --git a/src/proto_alpha/lib_protocol/src/amendment.ml b/src/proto_alpha/lib_protocol/amendment.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/amendment.ml rename to src/proto_alpha/lib_protocol/amendment.ml diff --git a/src/proto_alpha/lib_protocol/src/amendment.mli b/src/proto_alpha/lib_protocol/amendment.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/amendment.mli rename to src/proto_alpha/lib_protocol/amendment.mli diff --git a/src/proto_alpha/lib_protocol/src/apply.ml b/src/proto_alpha/lib_protocol/apply.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/apply.ml rename to src/proto_alpha/lib_protocol/apply.ml diff --git a/src/proto_alpha/lib_protocol/src/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/apply_results.ml rename to src/proto_alpha/lib_protocol/apply_results.ml diff --git a/src/proto_alpha/lib_protocol/src/apply_results.mli b/src/proto_alpha/lib_protocol/apply_results.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/apply_results.mli rename to src/proto_alpha/lib_protocol/apply_results.mli diff --git a/src/proto_alpha/lib_protocol/src/baking.ml b/src/proto_alpha/lib_protocol/baking.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/baking.ml rename to src/proto_alpha/lib_protocol/baking.ml diff --git a/src/proto_alpha/lib_protocol/src/baking.mli b/src/proto_alpha/lib_protocol/baking.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/baking.mli rename to src/proto_alpha/lib_protocol/baking.mli diff --git a/src/proto_alpha/lib_protocol/src/blinded_public_key_hash.ml b/src/proto_alpha/lib_protocol/blinded_public_key_hash.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/blinded_public_key_hash.ml rename to src/proto_alpha/lib_protocol/blinded_public_key_hash.ml diff --git a/src/proto_alpha/lib_protocol/src/blinded_public_key_hash.mli b/src/proto_alpha/lib_protocol/blinded_public_key_hash.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/blinded_public_key_hash.mli rename to src/proto_alpha/lib_protocol/blinded_public_key_hash.mli diff --git a/src/proto_alpha/lib_protocol/src/block_header_repr.ml b/src/proto_alpha/lib_protocol/block_header_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/block_header_repr.ml rename to src/proto_alpha/lib_protocol/block_header_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/block_header_repr.mli b/src/proto_alpha/lib_protocol/block_header_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/block_header_repr.mli rename to src/proto_alpha/lib_protocol/block_header_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/bootstrap_storage.ml b/src/proto_alpha/lib_protocol/bootstrap_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/bootstrap_storage.ml rename to src/proto_alpha/lib_protocol/bootstrap_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/bootstrap_storage.mli b/src/proto_alpha/lib_protocol/bootstrap_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/bootstrap_storage.mli rename to src/proto_alpha/lib_protocol/bootstrap_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/commitment_repr.ml b/src/proto_alpha/lib_protocol/commitment_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/commitment_repr.ml rename to src/proto_alpha/lib_protocol/commitment_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/commitment_repr.mli b/src/proto_alpha/lib_protocol/commitment_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/commitment_repr.mli rename to src/proto_alpha/lib_protocol/commitment_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/commitment_storage.ml b/src/proto_alpha/lib_protocol/commitment_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/commitment_storage.ml rename to src/proto_alpha/lib_protocol/commitment_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/commitment_storage.mli b/src/proto_alpha/lib_protocol/commitment_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/commitment_storage.mli rename to src/proto_alpha/lib_protocol/commitment_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/constants_repr.ml b/src/proto_alpha/lib_protocol/constants_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/constants_repr.ml rename to src/proto_alpha/lib_protocol/constants_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/constants_services.ml b/src/proto_alpha/lib_protocol/constants_services.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/constants_services.ml rename to src/proto_alpha/lib_protocol/constants_services.ml diff --git a/src/proto_alpha/lib_protocol/src/constants_services.mli b/src/proto_alpha/lib_protocol/constants_services.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/constants_services.mli rename to src/proto_alpha/lib_protocol/constants_services.mli diff --git a/src/proto_alpha/lib_protocol/src/constants_storage.ml b/src/proto_alpha/lib_protocol/constants_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/constants_storage.ml rename to src/proto_alpha/lib_protocol/constants_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/contract_hash.ml b/src/proto_alpha/lib_protocol/contract_hash.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_hash.ml rename to src/proto_alpha/lib_protocol/contract_hash.ml diff --git a/src/proto_alpha/lib_protocol/src/contract_repr.ml b/src/proto_alpha/lib_protocol/contract_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_repr.ml rename to src/proto_alpha/lib_protocol/contract_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/contract_repr.mli b/src/proto_alpha/lib_protocol/contract_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_repr.mli rename to src/proto_alpha/lib_protocol/contract_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/contract_services.ml b/src/proto_alpha/lib_protocol/contract_services.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_services.ml rename to src/proto_alpha/lib_protocol/contract_services.ml diff --git a/src/proto_alpha/lib_protocol/src/contract_services.mli b/src/proto_alpha/lib_protocol/contract_services.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_services.mli rename to src/proto_alpha/lib_protocol/contract_services.mli diff --git a/src/proto_alpha/lib_protocol/src/contract_storage.ml b/src/proto_alpha/lib_protocol/contract_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_storage.ml rename to src/proto_alpha/lib_protocol/contract_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/contract_storage.mli b/src/proto_alpha/lib_protocol/contract_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/contract_storage.mli rename to src/proto_alpha/lib_protocol/contract_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/cycle_repr.ml b/src/proto_alpha/lib_protocol/cycle_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/cycle_repr.ml rename to src/proto_alpha/lib_protocol/cycle_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/cycle_repr.mli b/src/proto_alpha/lib_protocol/cycle_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/cycle_repr.mli rename to src/proto_alpha/lib_protocol/cycle_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/delegate_services.ml b/src/proto_alpha/lib_protocol/delegate_services.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/delegate_services.ml rename to src/proto_alpha/lib_protocol/delegate_services.ml diff --git a/src/proto_alpha/lib_protocol/src/delegate_services.mli b/src/proto_alpha/lib_protocol/delegate_services.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/delegate_services.mli rename to src/proto_alpha/lib_protocol/delegate_services.mli diff --git a/src/proto_alpha/lib_protocol/src/delegate_storage.ml b/src/proto_alpha/lib_protocol/delegate_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/delegate_storage.ml rename to src/proto_alpha/lib_protocol/delegate_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/delegate_storage.mli b/src/proto_alpha/lib_protocol/delegate_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/delegate_storage.mli rename to src/proto_alpha/lib_protocol/delegate_storage.mli diff --git a/src/proto_alpha/lib_protocol/dune b/src/proto_alpha/lib_protocol/dune new file mode 120000 index 000000000..235c3740e --- /dev/null +++ b/src/proto_alpha/lib_protocol/dune @@ -0,0 +1 @@ +../../lib_protocol_compiler/dune_protocol \ No newline at end of file diff --git a/src/proto_alpha/lib_protocol/src/dune.inc b/src/proto_alpha/lib_protocol/dune.inc similarity index 100% rename from src/proto_alpha/lib_protocol/src/dune.inc rename to src/proto_alpha/lib_protocol/dune.inc diff --git a/src/proto_alpha/lib_protocol/src/fees_storage.ml b/src/proto_alpha/lib_protocol/fees_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/fees_storage.ml rename to src/proto_alpha/lib_protocol/fees_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/fees_storage.mli b/src/proto_alpha/lib_protocol/fees_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/fees_storage.mli rename to src/proto_alpha/lib_protocol/fees_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/fitness_repr.ml b/src/proto_alpha/lib_protocol/fitness_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/fitness_repr.ml rename to src/proto_alpha/lib_protocol/fitness_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/fitness_storage.ml b/src/proto_alpha/lib_protocol/fitness_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/fitness_storage.ml rename to src/proto_alpha/lib_protocol/fitness_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/gas_limit_repr.ml b/src/proto_alpha/lib_protocol/gas_limit_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/gas_limit_repr.ml rename to src/proto_alpha/lib_protocol/gas_limit_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/gas_limit_repr.mli b/src/proto_alpha/lib_protocol/gas_limit_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/gas_limit_repr.mli rename to src/proto_alpha/lib_protocol/gas_limit_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/helpers_services.ml b/src/proto_alpha/lib_protocol/helpers_services.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/helpers_services.ml rename to src/proto_alpha/lib_protocol/helpers_services.ml diff --git a/src/proto_alpha/lib_protocol/src/helpers_services.mli b/src/proto_alpha/lib_protocol/helpers_services.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/helpers_services.mli rename to src/proto_alpha/lib_protocol/helpers_services.mli diff --git a/src/proto_alpha/lib_protocol/src/init_storage.ml b/src/proto_alpha/lib_protocol/init_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/init_storage.ml rename to src/proto_alpha/lib_protocol/init_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/level_repr.ml b/src/proto_alpha/lib_protocol/level_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/level_repr.ml rename to src/proto_alpha/lib_protocol/level_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/level_repr.mli b/src/proto_alpha/lib_protocol/level_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/level_repr.mli rename to src/proto_alpha/lib_protocol/level_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/level_storage.ml b/src/proto_alpha/lib_protocol/level_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/level_storage.ml rename to src/proto_alpha/lib_protocol/level_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/level_storage.mli b/src/proto_alpha/lib_protocol/level_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/level_storage.mli rename to src/proto_alpha/lib_protocol/level_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/main.ml b/src/proto_alpha/lib_protocol/main.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/main.ml rename to src/proto_alpha/lib_protocol/main.ml diff --git a/src/proto_alpha/lib_protocol/src/main.mli b/src/proto_alpha/lib_protocol/main.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/main.mli rename to src/proto_alpha/lib_protocol/main.mli diff --git a/src/proto_alpha/lib_protocol/src/manager_repr.ml b/src/proto_alpha/lib_protocol/manager_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/manager_repr.ml rename to src/proto_alpha/lib_protocol/manager_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/manager_repr.mli b/src/proto_alpha/lib_protocol/manager_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/manager_repr.mli rename to src/proto_alpha/lib_protocol/manager_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/michelson_v1_gas.ml b/src/proto_alpha/lib_protocol/michelson_v1_gas.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/michelson_v1_gas.ml rename to src/proto_alpha/lib_protocol/michelson_v1_gas.ml diff --git a/src/proto_alpha/lib_protocol/src/michelson_v1_gas.mli b/src/proto_alpha/lib_protocol/michelson_v1_gas.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/michelson_v1_gas.mli rename to src/proto_alpha/lib_protocol/michelson_v1_gas.mli diff --git a/src/proto_alpha/lib_protocol/src/michelson_v1_primitives.ml b/src/proto_alpha/lib_protocol/michelson_v1_primitives.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/michelson_v1_primitives.ml rename to src/proto_alpha/lib_protocol/michelson_v1_primitives.ml diff --git a/src/proto_alpha/lib_protocol/src/michelson_v1_primitives.mli b/src/proto_alpha/lib_protocol/michelson_v1_primitives.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/michelson_v1_primitives.mli rename to src/proto_alpha/lib_protocol/michelson_v1_primitives.mli diff --git a/src/proto_alpha/lib_protocol/src/misc.ml b/src/proto_alpha/lib_protocol/misc.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/misc.ml rename to src/proto_alpha/lib_protocol/misc.ml diff --git a/src/proto_alpha/lib_protocol/src/misc.mli b/src/proto_alpha/lib_protocol/misc.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/misc.mli rename to src/proto_alpha/lib_protocol/misc.mli diff --git a/src/proto_alpha/lib_protocol/src/nonce_hash.ml b/src/proto_alpha/lib_protocol/nonce_hash.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/nonce_hash.ml rename to src/proto_alpha/lib_protocol/nonce_hash.ml diff --git a/src/proto_alpha/lib_protocol/src/nonce_storage.ml b/src/proto_alpha/lib_protocol/nonce_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/nonce_storage.ml rename to src/proto_alpha/lib_protocol/nonce_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/nonce_storage.mli b/src/proto_alpha/lib_protocol/nonce_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/nonce_storage.mli rename to src/proto_alpha/lib_protocol/nonce_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/operation_repr.ml rename to src/proto_alpha/lib_protocol/operation_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/operation_repr.mli rename to src/proto_alpha/lib_protocol/operation_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/parameters_repr.ml b/src/proto_alpha/lib_protocol/parameters_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/parameters_repr.ml rename to src/proto_alpha/lib_protocol/parameters_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/parameters_repr.mli b/src/proto_alpha/lib_protocol/parameters_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/parameters_repr.mli rename to src/proto_alpha/lib_protocol/parameters_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/period_repr.ml b/src/proto_alpha/lib_protocol/period_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/period_repr.ml rename to src/proto_alpha/lib_protocol/period_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/period_repr.mli b/src/proto_alpha/lib_protocol/period_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/period_repr.mli rename to src/proto_alpha/lib_protocol/period_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/qty_repr.ml b/src/proto_alpha/lib_protocol/qty_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/qty_repr.ml rename to src/proto_alpha/lib_protocol/qty_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/raw_context.ml b/src/proto_alpha/lib_protocol/raw_context.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/raw_context.ml rename to src/proto_alpha/lib_protocol/raw_context.ml diff --git a/src/proto_alpha/lib_protocol/src/raw_context.mli b/src/proto_alpha/lib_protocol/raw_context.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/raw_context.mli rename to src/proto_alpha/lib_protocol/raw_context.mli diff --git a/src/proto_alpha/lib_protocol/src/raw_level_repr.ml b/src/proto_alpha/lib_protocol/raw_level_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/raw_level_repr.ml rename to src/proto_alpha/lib_protocol/raw_level_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/raw_level_repr.mli b/src/proto_alpha/lib_protocol/raw_level_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/raw_level_repr.mli rename to src/proto_alpha/lib_protocol/raw_level_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/roll_repr.ml b/src/proto_alpha/lib_protocol/roll_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/roll_repr.ml rename to src/proto_alpha/lib_protocol/roll_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/roll_repr.mli b/src/proto_alpha/lib_protocol/roll_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/roll_repr.mli rename to src/proto_alpha/lib_protocol/roll_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/roll_storage.ml b/src/proto_alpha/lib_protocol/roll_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/roll_storage.ml rename to src/proto_alpha/lib_protocol/roll_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/roll_storage.mli b/src/proto_alpha/lib_protocol/roll_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/roll_storage.mli rename to src/proto_alpha/lib_protocol/roll_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/script_expr_hash.ml b/src/proto_alpha/lib_protocol/script_expr_hash.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_expr_hash.ml rename to src/proto_alpha/lib_protocol/script_expr_hash.ml diff --git a/src/proto_alpha/lib_protocol/src/script_int_repr.ml b/src/proto_alpha/lib_protocol/script_int_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_int_repr.ml rename to src/proto_alpha/lib_protocol/script_int_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/script_int_repr.mli b/src/proto_alpha/lib_protocol/script_int_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_int_repr.mli rename to src/proto_alpha/lib_protocol/script_int_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/script_interpreter.ml b/src/proto_alpha/lib_protocol/script_interpreter.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_interpreter.ml rename to src/proto_alpha/lib_protocol/script_interpreter.ml diff --git a/src/proto_alpha/lib_protocol/src/script_interpreter.mli b/src/proto_alpha/lib_protocol/script_interpreter.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_interpreter.mli rename to src/proto_alpha/lib_protocol/script_interpreter.mli diff --git a/src/proto_alpha/lib_protocol/src/script_ir_annot.ml b/src/proto_alpha/lib_protocol/script_ir_annot.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_ir_annot.ml rename to src/proto_alpha/lib_protocol/script_ir_annot.ml diff --git a/src/proto_alpha/lib_protocol/src/script_ir_annot.mli b/src/proto_alpha/lib_protocol/script_ir_annot.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_ir_annot.mli rename to src/proto_alpha/lib_protocol/script_ir_annot.mli diff --git a/src/proto_alpha/lib_protocol/src/script_ir_translator.ml b/src/proto_alpha/lib_protocol/script_ir_translator.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_ir_translator.ml rename to src/proto_alpha/lib_protocol/script_ir_translator.ml diff --git a/src/proto_alpha/lib_protocol/src/script_ir_translator.mli b/src/proto_alpha/lib_protocol/script_ir_translator.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_ir_translator.mli rename to src/proto_alpha/lib_protocol/script_ir_translator.mli diff --git a/src/proto_alpha/lib_protocol/src/script_repr.ml b/src/proto_alpha/lib_protocol/script_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_repr.ml rename to src/proto_alpha/lib_protocol/script_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/script_repr.mli b/src/proto_alpha/lib_protocol/script_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_repr.mli rename to src/proto_alpha/lib_protocol/script_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/script_tc_errors.ml b/src/proto_alpha/lib_protocol/script_tc_errors.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_tc_errors.ml rename to src/proto_alpha/lib_protocol/script_tc_errors.ml diff --git a/src/proto_alpha/lib_protocol/src/script_tc_errors_registration.ml b/src/proto_alpha/lib_protocol/script_tc_errors_registration.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_tc_errors_registration.ml rename to src/proto_alpha/lib_protocol/script_tc_errors_registration.ml diff --git a/src/proto_alpha/lib_protocol/src/script_timestamp_repr.ml b/src/proto_alpha/lib_protocol/script_timestamp_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_timestamp_repr.ml rename to src/proto_alpha/lib_protocol/script_timestamp_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/script_timestamp_repr.mli b/src/proto_alpha/lib_protocol/script_timestamp_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_timestamp_repr.mli rename to src/proto_alpha/lib_protocol/script_timestamp_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/script_typed_ir.ml b/src/proto_alpha/lib_protocol/script_typed_ir.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/script_typed_ir.ml rename to src/proto_alpha/lib_protocol/script_typed_ir.ml diff --git a/src/proto_alpha/lib_protocol/src/seed_repr.ml b/src/proto_alpha/lib_protocol/seed_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/seed_repr.ml rename to src/proto_alpha/lib_protocol/seed_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/seed_repr.mli b/src/proto_alpha/lib_protocol/seed_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/seed_repr.mli rename to src/proto_alpha/lib_protocol/seed_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/seed_storage.ml b/src/proto_alpha/lib_protocol/seed_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/seed_storage.ml rename to src/proto_alpha/lib_protocol/seed_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/seed_storage.mli b/src/proto_alpha/lib_protocol/seed_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/seed_storage.mli rename to src/proto_alpha/lib_protocol/seed_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/services_registration.ml b/src/proto_alpha/lib_protocol/services_registration.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/services_registration.ml rename to src/proto_alpha/lib_protocol/services_registration.ml diff --git a/src/proto_alpha/lib_protocol/src/dune b/src/proto_alpha/lib_protocol/src/dune deleted file mode 120000 index 3f5647096..000000000 --- a/src/proto_alpha/lib_protocol/src/dune +++ /dev/null @@ -1 +0,0 @@ -../../../lib_protocol_compiler/dune_protocol \ No newline at end of file diff --git a/src/proto_alpha/lib_protocol/src/state_hash.ml b/src/proto_alpha/lib_protocol/state_hash.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/state_hash.ml rename to src/proto_alpha/lib_protocol/state_hash.ml diff --git a/src/proto_alpha/lib_protocol/src/storage.ml b/src/proto_alpha/lib_protocol/storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage.ml rename to src/proto_alpha/lib_protocol/storage.ml diff --git a/src/proto_alpha/lib_protocol/src/storage.mli b/src/proto_alpha/lib_protocol/storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage.mli rename to src/proto_alpha/lib_protocol/storage.mli diff --git a/src/proto_alpha/lib_protocol/src/storage_description.ml b/src/proto_alpha/lib_protocol/storage_description.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage_description.ml rename to src/proto_alpha/lib_protocol/storage_description.ml diff --git a/src/proto_alpha/lib_protocol/src/storage_description.mli b/src/proto_alpha/lib_protocol/storage_description.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage_description.mli rename to src/proto_alpha/lib_protocol/storage_description.mli diff --git a/src/proto_alpha/lib_protocol/src/storage_functors.ml b/src/proto_alpha/lib_protocol/storage_functors.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage_functors.ml rename to src/proto_alpha/lib_protocol/storage_functors.ml diff --git a/src/proto_alpha/lib_protocol/src/storage_functors.mli b/src/proto_alpha/lib_protocol/storage_functors.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage_functors.mli rename to src/proto_alpha/lib_protocol/storage_functors.mli diff --git a/src/proto_alpha/lib_protocol/src/storage_sigs.ml b/src/proto_alpha/lib_protocol/storage_sigs.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/storage_sigs.ml rename to src/proto_alpha/lib_protocol/storage_sigs.ml diff --git a/src/proto_alpha/lib_protocol/src/tez_repr.ml b/src/proto_alpha/lib_protocol/tez_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/tez_repr.ml rename to src/proto_alpha/lib_protocol/tez_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/tez_repr.mli b/src/proto_alpha/lib_protocol/tez_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/tez_repr.mli rename to src/proto_alpha/lib_protocol/tez_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/time_repr.ml b/src/proto_alpha/lib_protocol/time_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/time_repr.ml rename to src/proto_alpha/lib_protocol/time_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/time_repr.mli b/src/proto_alpha/lib_protocol/time_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/time_repr.mli rename to src/proto_alpha/lib_protocol/time_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/vote_repr.ml b/src/proto_alpha/lib_protocol/vote_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/vote_repr.ml rename to src/proto_alpha/lib_protocol/vote_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/vote_repr.mli b/src/proto_alpha/lib_protocol/vote_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/vote_repr.mli rename to src/proto_alpha/lib_protocol/vote_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/vote_storage.ml b/src/proto_alpha/lib_protocol/vote_storage.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/vote_storage.ml rename to src/proto_alpha/lib_protocol/vote_storage.ml diff --git a/src/proto_alpha/lib_protocol/src/vote_storage.mli b/src/proto_alpha/lib_protocol/vote_storage.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/vote_storage.mli rename to src/proto_alpha/lib_protocol/vote_storage.mli diff --git a/src/proto_alpha/lib_protocol/src/voting_period_repr.ml b/src/proto_alpha/lib_protocol/voting_period_repr.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/voting_period_repr.ml rename to src/proto_alpha/lib_protocol/voting_period_repr.ml diff --git a/src/proto_alpha/lib_protocol/src/voting_period_repr.mli b/src/proto_alpha/lib_protocol/voting_period_repr.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/voting_period_repr.mli rename to src/proto_alpha/lib_protocol/voting_period_repr.mli diff --git a/src/proto_alpha/lib_protocol/src/voting_services.ml b/src/proto_alpha/lib_protocol/voting_services.ml similarity index 100% rename from src/proto_alpha/lib_protocol/src/voting_services.ml rename to src/proto_alpha/lib_protocol/voting_services.ml diff --git a/src/proto_alpha/lib_protocol/src/voting_services.mli b/src/proto_alpha/lib_protocol/voting_services.mli similarity index 100% rename from src/proto_alpha/lib_protocol/src/voting_services.mli rename to src/proto_alpha/lib_protocol/voting_services.mli diff --git a/src/proto_demo/lib_protocol/src/TEZOS_PROTOCOL b/src/proto_demo/lib_protocol/TEZOS_PROTOCOL similarity index 100% rename from src/proto_demo/lib_protocol/src/TEZOS_PROTOCOL rename to src/proto_demo/lib_protocol/TEZOS_PROTOCOL diff --git a/src/proto_demo/lib_protocol/dune b/src/proto_demo/lib_protocol/dune new file mode 120000 index 000000000..235c3740e --- /dev/null +++ b/src/proto_demo/lib_protocol/dune @@ -0,0 +1 @@ +../../lib_protocol_compiler/dune_protocol \ No newline at end of file diff --git a/src/proto_demo/lib_protocol/src/dune.inc b/src/proto_demo/lib_protocol/dune.inc similarity index 100% rename from src/proto_demo/lib_protocol/src/dune.inc rename to src/proto_demo/lib_protocol/dune.inc diff --git a/src/proto_demo/lib_protocol/src/error.ml b/src/proto_demo/lib_protocol/error.ml similarity index 100% rename from src/proto_demo/lib_protocol/src/error.ml rename to src/proto_demo/lib_protocol/error.ml diff --git a/src/proto_demo/lib_protocol/src/main.ml b/src/proto_demo/lib_protocol/main.ml similarity index 100% rename from src/proto_demo/lib_protocol/src/main.ml rename to src/proto_demo/lib_protocol/main.ml diff --git a/src/proto_demo/lib_protocol/src/main.mli b/src/proto_demo/lib_protocol/main.mli similarity index 100% rename from src/proto_demo/lib_protocol/src/main.mli rename to src/proto_demo/lib_protocol/main.mli diff --git a/src/proto_demo/lib_protocol/src/services.ml b/src/proto_demo/lib_protocol/services.ml similarity index 100% rename from src/proto_demo/lib_protocol/src/services.ml rename to src/proto_demo/lib_protocol/services.ml diff --git a/src/proto_demo/lib_protocol/src/services.mli b/src/proto_demo/lib_protocol/services.mli similarity index 100% rename from src/proto_demo/lib_protocol/src/services.mli rename to src/proto_demo/lib_protocol/services.mli diff --git a/src/proto_demo/lib_protocol/src/dune b/src/proto_demo/lib_protocol/src/dune deleted file mode 120000 index 3f5647096..000000000 --- a/src/proto_demo/lib_protocol/src/dune +++ /dev/null @@ -1 +0,0 @@ -../../../lib_protocol_compiler/dune_protocol \ No newline at end of file diff --git a/src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL b/src/proto_genesis/lib_protocol/TEZOS_PROTOCOL similarity index 100% rename from src/proto_genesis/lib_protocol/src/TEZOS_PROTOCOL rename to src/proto_genesis/lib_protocol/TEZOS_PROTOCOL diff --git a/src/proto_genesis/lib_protocol/src/data.ml b/src/proto_genesis/lib_protocol/data.ml similarity index 100% rename from src/proto_genesis/lib_protocol/src/data.ml rename to src/proto_genesis/lib_protocol/data.ml diff --git a/src/proto_genesis/lib_protocol/dune b/src/proto_genesis/lib_protocol/dune new file mode 120000 index 000000000..235c3740e --- /dev/null +++ b/src/proto_genesis/lib_protocol/dune @@ -0,0 +1 @@ +../../lib_protocol_compiler/dune_protocol \ No newline at end of file diff --git a/src/proto_genesis/lib_protocol/dune.inc b/src/proto_genesis/lib_protocol/dune.inc index 8b1378917..3b1045f41 100644 --- a/src/proto_genesis/lib_protocol/dune.inc +++ b/src/proto_genesis/lib_protocol/dune.inc @@ -1 +1,78 @@ + +; +; /!\ /!\ Do not modify this file /!\ /!\ +; +; but the original template in `tezos-protocol-compiler` +; + + +(rule + (targets environment.ml) + (action + (write-file %{targets} + "include Tezos_protocol_environment_shell.MakeV1(struct let name = \"genesis\" end)() + module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end +"))) + +(rule + (targets registerer.ml) + (deps tezos_embedded_protocol_environment_genesis.cmxa + (:src_dir TEZOS_PROTOCOL)) + (action + (with-stdout-to %{targets} + (chdir %{workspace_root} (run %{bin:tezos-embedded-protocol-packer} "%{src_dir}" "genesis"))))) + + +(rule + (targets functor.ml) + (deps data.ml services.ml main.mli main.ml + (:src_dir TEZOS_PROTOCOL)) + (action (with-stdout-to %{targets} + (chdir %{workspace_root} + (run %{bin:tezos-protocol-compiler.tezos-protocol-packer} %{src_dir}))))) + +(library + (name tezos_protocol_genesis) + (public_name tezos-protocol-genesis) + (libraries tezos-protocol-environment-sigs) + (flags -w "+a-4-6-7-9-29-40..42-44-45-48" + -warn-error "-a+8" + -safe-string -nopervasives) + (modules Functor)) + +(library + (name tezos_embedded_protocol_environment_genesis) + (public_name tezos-embedded-protocol-genesis.environment) + (library_flags (:standard -linkall)) + (libraries tezos-protocol-environment-shell) + (modules Environment)) + +(library + (name tezos_embedded_raw_protocol_genesis) + (public_name tezos-embedded-protocol-genesis.raw) + (libraries tezos_embedded_protocol_environment_genesis) + (library_flags (:standard -linkall)) + (flags (:standard -nopervasives -nostdlib -safe-string + -w +a-4-6-7-9-29-32-40..42-44-45-48 + -warn-error -a+8 + -open Tezos_embedded_protocol_environment_genesis__Environment + -open Pervasives + -open Error_monad)) + (modules Data Services Main)) + +(library + (name tezos_embedded_protocol_genesis) + (public_name tezos-embedded-protocol-genesis) + (library_flags (:standard -linkall)) + (libraries tezos_embedded_raw_protocol_genesis + tezos-protocol-updater + tezos-protocol-environment-shell) + (flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48 + -warn-error -a+8)) + (modules Registerer)) + +(alias + (name runtest_sandbox) + (deps .tezos_protocol_genesis.objs/tezos_protocol_genesis.cmx)) + diff --git a/src/proto_genesis/lib_protocol/src/main.ml b/src/proto_genesis/lib_protocol/main.ml similarity index 100% rename from src/proto_genesis/lib_protocol/src/main.ml rename to src/proto_genesis/lib_protocol/main.ml diff --git a/src/proto_genesis/lib_protocol/src/main.mli b/src/proto_genesis/lib_protocol/main.mli similarity index 100% rename from src/proto_genesis/lib_protocol/src/main.mli rename to src/proto_genesis/lib_protocol/main.mli diff --git a/src/proto_genesis/lib_protocol/src/services.ml b/src/proto_genesis/lib_protocol/services.ml similarity index 100% rename from src/proto_genesis/lib_protocol/src/services.ml rename to src/proto_genesis/lib_protocol/services.ml diff --git a/src/proto_genesis/lib_protocol/src/dune b/src/proto_genesis/lib_protocol/src/dune deleted file mode 120000 index 3f5647096..000000000 --- a/src/proto_genesis/lib_protocol/src/dune +++ /dev/null @@ -1 +0,0 @@ -../../../lib_protocol_compiler/dune_protocol \ No newline at end of file diff --git a/src/proto_genesis/lib_protocol/src/dune.inc b/src/proto_genesis/lib_protocol/src/dune.inc deleted file mode 100644 index 3b1045f41..000000000 --- a/src/proto_genesis/lib_protocol/src/dune.inc +++ /dev/null @@ -1,78 +0,0 @@ - - -; -; /!\ /!\ Do not modify this file /!\ /!\ -; -; but the original template in `tezos-protocol-compiler` -; - - -(rule - (targets environment.ml) - (action - (write-file %{targets} - "include Tezos_protocol_environment_shell.MakeV1(struct let name = \"genesis\" end)() - module CamlinternalFormatBasics = struct include CamlinternalFormatBasics end -"))) - -(rule - (targets registerer.ml) - (deps tezos_embedded_protocol_environment_genesis.cmxa - (:src_dir TEZOS_PROTOCOL)) - (action - (with-stdout-to %{targets} - (chdir %{workspace_root} (run %{bin:tezos-embedded-protocol-packer} "%{src_dir}" "genesis"))))) - - -(rule - (targets functor.ml) - (deps data.ml services.ml main.mli main.ml - (:src_dir TEZOS_PROTOCOL)) - (action (with-stdout-to %{targets} - (chdir %{workspace_root} - (run %{bin:tezos-protocol-compiler.tezos-protocol-packer} %{src_dir}))))) - -(library - (name tezos_protocol_genesis) - (public_name tezos-protocol-genesis) - (libraries tezos-protocol-environment-sigs) - (flags -w "+a-4-6-7-9-29-40..42-44-45-48" - -warn-error "-a+8" - -safe-string -nopervasives) - (modules Functor)) - -(library - (name tezos_embedded_protocol_environment_genesis) - (public_name tezos-embedded-protocol-genesis.environment) - (library_flags (:standard -linkall)) - (libraries tezos-protocol-environment-shell) - (modules Environment)) - -(library - (name tezos_embedded_raw_protocol_genesis) - (public_name tezos-embedded-protocol-genesis.raw) - (libraries tezos_embedded_protocol_environment_genesis) - (library_flags (:standard -linkall)) - (flags (:standard -nopervasives -nostdlib -safe-string - -w +a-4-6-7-9-29-32-40..42-44-45-48 - -warn-error -a+8 - -open Tezos_embedded_protocol_environment_genesis__Environment - -open Pervasives - -open Error_monad)) - (modules Data Services Main)) - -(library - (name tezos_embedded_protocol_genesis) - (public_name tezos-embedded-protocol-genesis) - (library_flags (:standard -linkall)) - (libraries tezos_embedded_raw_protocol_genesis - tezos-protocol-updater - tezos-protocol-environment-shell) - (flags (:standard -w +a-4-6-7-9-29-32-40..42-44-45-48 - -warn-error -a+8)) - (modules Registerer)) - -(alias - (name runtest_sandbox) - (deps .tezos_protocol_genesis.objs/tezos_protocol_genesis.cmx)) -