balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compiler: allow not to generate Registerer

Browse Source
This commit is contained in:
Grégoire Henry 2018-01-29 01:03:24 +01:00
parent 0c2acd2d48
commit acc0c5c512
4 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib_protocol_compiler/native.ml
View File

@ -198,9 +198,11 @@ let main () =
Random.self_init () ;
let anonymous = ref []
and static = ref false
and register = ref false
and build_dir = ref None in
let args_spec = [
"-static", Arg.Set static, " Only build the static library (no .cmxs)";
"-register", Arg.Set register, " Generete the `Registerer` module";
"-bin-annot", Arg.Set Clflags.binary_annotations, " (see ocamlopt)" ;
"-g", Arg.Set Clflags.debug, " (see ocamlopt)" ;
"-build-dir", Arg.String (fun s -> build_dir := Some s),
@ -253,21 +255,27 @@ let main () =
load_embeded_cmis tezos_protocol_env ;
let packed_protocol_object = compile_ml ~for_pack functor_file in
load_embeded_cmis register_env ;
load_cmi_from_file proto_cmi ;
(* Compiler the 'registering module' *)
let register_file = Filename.dirname functor_file // "register.ml" in
create_file register_file
(Printf.sprintf
"module Name = struct let name = %S end\n\
\ let () = Tezos_protocol_compiler__Registerer.register Name.name (module %s.Make)"
(Protocol_hash.to_b58check hash)
functor_unit) ;
let register_object = compile_ml ~for_pack register_file in
let register_objects =
if not !register then
[]
else begin
load_embeded_cmis register_env ;
load_cmi_from_file proto_cmi ;
(* Compiler the 'registering module' *)
let register_file = Filename.dirname functor_file // "register.ml" in
create_file register_file
(Printf.sprintf
"module Name = struct let name = %S end\n\
\ let () = Tezos_protocol_compiler__Registerer.register Name.name (module %s.Make)"
(Protocol_hash.to_b58check hash)
functor_unit) ;
let register_object = compile_ml ~for_pack register_file in
[ register_object ]
end
in
let resulting_object =
pack_objects output [ packed_protocol_object ; register_object ] in
pack_objects output (packed_protocol_object :: register_objects) in
(* Create the final [cmxs] *)
if not !static then begin

8
src/lib_protocol_updater/register.ml
View File

@ -1,8 +0,0 @@
(**************************************************************************)
(* *)
(* Copyright (c) 2014 - 2017. *)
(* Dynamic Ledger Solutions, Inc. <contact@tezos.com> *)
(* *)
(* All rights reserved. No warranty, explicit or implicit, provided. *)
(* *)
(**************************************************************************)

9
src/lib_protocol_updater/register.mli
View File

@ -1,9 +0,0 @@
(**************************************************************************)
(* *)
(* Copyright (c) 2014 - 2017. *)
(* Dynamic Ledger Solutions, Inc. <contact@tezos.com> *)
(* *)
(* All rights reserved. No warranty, explicit or implicit, provided. *)
(* *)
(**************************************************************************)

2
src/lib_protocol_updater/updater.ml
View File

@ -57,7 +57,7 @@ let do_compile hash p =
Protocol.write_dir source_dir ~hash p >>= fun () ->
let compiler_command =
(Sys.executable_name,
Array.of_list [compiler_name; plugin_file; source_dir]) in
Array.of_list [compiler_name; "-register"; plugin_file; source_dir]) in
let fd = Unix.(openfile log_file [O_WRONLY; O_CREAT; O_TRUNC] 0o644) in
let pi =
Lwt_process.exec