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

Jbuilder: Wrap Tezos_protocol_environment_sigs

Browse Source
This commit is contained in:
Grégoire Henry 2017-10-27 21:42:44 +02:00 committed by Benjamin Canou
parent 05da5a73b8
commit 108fe7799f
9 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/embedded_cmis.mli
View File

@ -8,5 +8,6 @@
(**************************************************************************) (**************************************************************************)
val camlinternalFormatBasics_cmi: string val camlinternalFormatBasics_cmi: string
val tezos_protocol_environment_sigs_v1_cmi: string val tezos_protocol_environment_sigs_cmi: string
val tezos_protocol_environment_sigs__V1_cmi: string
val tezos_protocol_compiler__Registerer_cmi: string val tezos_protocol_compiler__Registerer_cmi: string

3
src/compiler/jbuild
View File

@ -6,7 +6,8 @@
(run ${bin:ocp-ocamlres} -format ocaml -o ${@} (run ${bin:ocp-ocamlres} -format ocaml -o ${@}
${lib:stdlib:camlinternalFormatBasics.cmi} ${lib:stdlib:camlinternalFormatBasics.cmi}
${path:tezos_protocol_compiler__Registerer.cmi} ${path:tezos_protocol_compiler__Registerer.cmi}
${path:../environment/tezos_protocol_environment_sigs_v1.cmi})))) ${path:../environment/tezos_protocol_environment_sigs.cmi}
${path:../environment/tezos_protocol_environment_sigs__V1.cmi}))))
(library (library
((name tezos_protocol_compiler) ((name tezos_protocol_compiler)

3
src/compiler/native.ml
View File

@ -109,7 +109,8 @@ let tezos_protocol_env =
let open Embedded_cmis in let open Embedded_cmis in
[ [
"CamlinternalFormatBasics", camlinternalFormatBasics_cmi ; "CamlinternalFormatBasics", camlinternalFormatBasics_cmi ;
"Tezos_protocol_environment_sigs_v1", tezos_protocol_environment_sigs_v1_cmi ; "Tezos_protocol_environment_sigs", tezos_protocol_environment_sigs_cmi ;
"Tezos_protocol_environment_sigs__V1", tezos_protocol_environment_sigs__V1_cmi ;
] ]
let register_env = let register_env =

2
src/compiler/packer.ml
View File

@ -50,7 +50,7 @@ let opened_modules = [
let dump oc files = let dump oc files =
Printf.fprintf oc Printf.fprintf oc
"module Make (Tezos_protocol_environment : Tezos_protocol_environment_sigs_v1.T) = struct\n" ; "module Make (Tezos_protocol_environment : Tezos_protocol_environment_sigs__V1.T) = struct\n" ;
Printf.fprintf oc "[@@@ocaml.warning \"-33\"]\n" ; Printf.fprintf oc "[@@@ocaml.warning \"-33\"]\n" ;
List.iter (Printf.fprintf oc "open %s\n") opened_modules ; List.iter (Printf.fprintf oc "open %s\n") opened_modules ;
Printf.fprintf oc "[@@@ocaml.warning \"+33\"]\n" ; Printf.fprintf oc "[@@@ocaml.warning \"+33\"]\n" ;

2
src/compiler/registerer.ml
View File

@ -8,7 +8,7 @@
(**************************************************************************) (**************************************************************************)
module type PROTOCOL_V1 = module type PROTOCOL_V1 =
functor (Env : Tezos_protocol_environment_sigs_v1.T) -> Env.Updater.PROTOCOL functor (Env : Tezos_protocol_environment_sigs.V1.T) -> Env.Updater.PROTOCOL
module VersionTable = Protocol_hash.Table module VersionTable = Protocol_hash.Table

2
src/compiler/registerer.mli
View File

@ -8,7 +8,7 @@
(**************************************************************************) (**************************************************************************)
module type PROTOCOL_V1 = module type PROTOCOL_V1 =
functor (Env : Tezos_protocol_environment_sigs_v1.T) -> Env.Updater.PROTOCOL functor (Env : Tezos_protocol_environment_sigs.V1.T) -> Env.Updater.PROTOCOL
val register: string -> (module PROTOCOL_V1) -> unit val register: string -> (module PROTOCOL_V1) -> unit

5
src/environment/jbuild
View File

@ -1,7 +1,7 @@
(jbuild_version 1) (jbuild_version 1)
(rule (rule
((targets (tezos_protocol_environment_sigs_v1.ml)) ((targets (v1.ml))
(deps (deps
( (
;; Part of OCaml stdlib ;; Part of OCaml stdlib
@ -51,5 +51,4 @@
(library (library
((name tezos_protocol_environment_sigs) ((name tezos_protocol_environment_sigs)
(flags (:standard -nopervasives)) (flags (:standard -nopervasives))
(wrapped false) (modules ("V1"))))
(modules ("Tezos_protocol_environment_sigs_v1"))))

2
src/node/updater/updater.ml
View File

@ -117,7 +117,7 @@ module Node_protocol_environment_sigs = struct
module type V1 = sig module type V1 = sig
include Tezos_protocol_environment_sigs_v1.T include Tezos_protocol_environment_sigs.V1.T
with type Format.formatter = Format.formatter with type Format.formatter = Format.formatter
and type 'a Data_encoding.t = 'a Data_encoding.t and type 'a Data_encoding.t = 'a Data_encoding.t
and type 'a Lwt.t = 'a Lwt.t and type 'a Lwt.t = 'a Lwt.t

2
src/node/updater/updater.mli
View File

@ -83,7 +83,7 @@ module Node_protocol_environment_sigs : sig
module type V1 = sig module type V1 = sig
include Tezos_protocol_environment_sigs_v1.T include Tezos_protocol_environment_sigs.V1.T
with type Format.formatter = Format.formatter with type Format.formatter = Format.formatter
and type 'a Data_encoding.t = 'a Data_encoding.t and type 'a Data_encoding.t = 'a Data_encoding.t
and type 'a Lwt.t = 'a Lwt.t and type 'a Lwt.t = 'a Lwt.t