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

Rename client_alpha.cmx into client_embedded_alpha.cmx

Browse Source
This commit is contained in:
Milo Davis 2017-10-27 21:39:13 +02:00 committed by Benjamin Canou
parent 26b05ae292
commit 47d77acfd7
11 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -309,14 +309,14 @@ partial-clean::
## Embedded client protocol modules
client/embedded/client_%.cmx: \
client/embedded/client_embedded_%.cmx: \
$(patsubst %.ml, %.cmx, $(NODE_LIB_IMPLS) $(CLIENT_LIB_IMPLS)) \
proto/tezos_embedded_protocol_%.cmx \
$$(shell find client/embedded/% \( -name _tzbuild \) -prune -or \( -name \*.ml -print -or -name \*.mli -print \))
@$(MAKE) -C client/embedded/$* ../client_$*.cmx
@$(MAKE) -C client/embedded/$* ../client_embedded_$*.cmx
client/embedded/client_genesis.cmx: \
client/embedded/client_alpha.cmx
client/embedded/client_embedded_genesis.cmx: \
client/embedded/client_embedded_alpha.cmx
partial-clean::
-for d in $$(ls -d client/embedded/*/) ; do make clean -C $$d ; done

2
src/Makefile.files
View File

@ -359,7 +359,7 @@ CLIENT_VERSIONS := \
$(shell ls -d ${SRCDIR}/client/embedded/*/))
EMBEDDED_CLIENT_VERSIONS := \
$(patsubst %,${SRCDIR}/client/embedded/client_%.cmx, \
$(patsubst %,${SRCDIR}/client/embedded/client_embedded_%.cmx, \
${CLIENT_VERSIONS})

16
src/client/embedded/Makefile.shared
View File

@ -1,6 +1,6 @@
all: \
../client_$(PROTO_VERSION).cmx
../client_embedded_$(PROTO_VERSION).cmx
-include ../../../Makefile.local
include ../../../Makefile.config
@ -31,15 +31,15 @@ OBJS := \
OBJS_DEPS := \
${CLIENT_IMPLS:.ml=.ml.deps} ${CLIENT_INTFS:.mli=.mli.deps}
${OBJS} ${OBJS_DEPS}: TARGET="(client_$(PROTO_VERSION).cmx)"
${OBJS}: EXTRA_OCAMLFLAGS = -for-pack Client_$(PROTO_VERSION)
../client_$(PROTO_VERSION).cmx: EXTRA_OCAMLFLAGS =
${OBJS} ${OBJS_DEPS} ../client_$(PROTO_VERSION).cmx: \
${OBJS} ${OBJS_DEPS}: TARGET="(client_embedded_$(PROTO_VERSION).cmx)"
${OBJS}: EXTRA_OCAMLFLAGS = -for-pack Client_embedded_$(PROTO_VERSION)
../client_embedded_$(PROTO_VERSION).cmx: EXTRA_OCAMLFLAGS =
${OBJS} ${OBJS_DEPS} ../client_embedded_$(PROTO_VERSION).cmx: \
PACKAGES=lwt ocplib-json-typed sodium ocplib-ocamlres uutf ocplib-endian zarith
${OBJS} ${OBJS_DEPS} ../client_$(PROTO_VERSION).cmx: \
${OBJS} ${OBJS_DEPS} ../client_embedded_$(PROTO_VERSION).cmx: \
../../../proto/tezos_embedded_protocol_${PROTO_VERSION}.cmx
../client_$(PROTO_VERSION).cmx: $(patsubst %.ml, %.cmx, ${CLIENT_IMPLS})
../client_embedded_$(PROTO_VERSION).cmx: $(patsubst %.ml, %.cmx, ${CLIENT_IMPLS})
@echo LINK $(notdir $@)
@$(OCAMLOPT) -linkall ${OCAMLFLAGS} -pack -o $@ \
$(patsubst %.ml, %.cmx, ${CLIENT_IMPLS})
@ -58,7 +58,7 @@ ${OBJS} ${OBJS_DEPS} ../client_$(PROTO_VERSION).cmx: \
.PHONY: clean
clean::
-rm -f ../client_$(PROTO_VERSION).cm* ../client_$(PROTO_VERSION).o
-rm -f ../client_embedded_$(PROTO_VERSION).cm* ../client_embedded_$(PROTO_VERSION).o
-rm -f *.cm* *~ *.o *.a *.deps *.deps.byte
-rm -rf _tzbuild
-rm -f .depend

7
src/client/embedded/alpha/Makefile
View File

@ -41,14 +41,7 @@ CLIENT_IMPLS := \
client_mining_daemon.ml \
client_mining_main.ml
-include baker/Makefile
include ../Makefile.shared
${OBJS_DEPS} ${OBJS}: OPENED_MODULES += Client_proto_alpha Tezos_context
client_proto_alpha.ml.deps client_proto_alpha.cmx: OPENED_MODULES :=
.PHONY: clean
clean::
-rm -f baker/*.cm* baker/*~ baker/*.o baker/*.a
-rm -f baker/*.deps baker/*.deps.byte

4
src/client/embedded/genesis/Makefile
View File

@ -12,8 +12,8 @@ include ../Makefile.shared
SOURCE_DIRECTORIES += ..
${OBJS_DEPS} ${OBJS}: ../client_alpha.cmx
${OBJS_DEPS} ${OBJS}: ../client_embedded_alpha.cmx
${OBJS_DEPS} ${OBJS}: OPENED_MODULES += Client_proto_genesis
client_proto_genesis.ml.deps client_proto_genesis.cmx: OPENED_MODULES :=
../client_alpha.cmx:
../client_embedded_alpha.cmx:

4
src/client/embedded/genesis/client_proto_main.ml
View File

@ -73,7 +73,7 @@ let commands () =
@@ stop)
begin fun timestamp hash fitness seckey cctxt ->
let fitness =
Client_alpha.Client_proto_alpha.Fitness_repr.from_int64 fitness in
Client_embedded_alpha.Client_proto_alpha.Fitness_repr.from_int64 fitness in
mine cctxt.rpc_config ?timestamp cctxt.config.block
(Activate hash) fitness seckey >>=? fun hash ->
cctxt.answer "Injected %a" Block_hash.pp_short hash >>= fun () ->
@ -96,7 +96,7 @@ let commands () =
@@ stop)
begin fun timestamp hash fitness seckey cctxt ->
let fitness =
Client_alpha.Client_proto_alpha.Fitness_repr.from_int64 fitness in
Client_embedded_alpha.Client_proto_alpha.Fitness_repr.from_int64 fitness in
mine cctxt.rpc_config ?timestamp cctxt.config.block
(Activate_testnet (hash, Int64.mul 24L 3600L))
fitness seckey >>=? fun hash ->

2
test/Makefile.shared
View File

@ -43,7 +43,7 @@ NODELIB := ${SRCDIR}/node.cmxa
CLIENTLIB := ${SRCDIR}/client.cmxa \
$(patsubst ${SRCDIR}/client/embedded/%/, \
${SRCDIR}/client/embedded/client_%.cmx, \
${SRCDIR}/client/embedded/client_embedded_%.cmx, \
$(shell ls -d ${SRCDIR}/client/embedded/*/))
${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} ${NODELIB} ${CLIENTLIB}:

6
test/proto_alpha/Makefile
View File

@ -26,12 +26,12 @@ PACKAGES := \
OPENED_MODULES := \
${CLIENT_OPENED_MODULES} \
Client_alpha Client_proto_alpha Tezos_context
Client_embedded_alpha Client_proto_alpha Tezos_context
${SRCDIR}/client/embedded/alpha/%.cmi: ${SRCDIR}/client/embedded/alpha/%.mli
${MAKE} -C ${SRCDIR} client/embedded/client_alpha.cmx
${MAKE} -C ${SRCDIR} client/embedded/client_embedded_alpha.cmx
${SRCDIR}/client/embedded/alpha/%.cmx: ${SRCDIR}/client/embedded/alpha/%.ml
${MAKE} -C ${SRCDIR} client/embedded/client_alpha.cmx
${MAKE} -C ${SRCDIR} client/embedded/client_embedded_alpha.cmx
############################################################################
## Transactions

4
test/proto_alpha/proto_alpha_helpers.ml
View File

@ -27,7 +27,7 @@ let dictator_sk =
let activate_alpha () =
let fitness = Fitness_repr.from_int64 0L in
Client_genesis.Client_proto_main.mine
Client_embedded_genesis.Client_proto_main.mine
rpc_config (`Head 0)
(Activate Client_proto_main.protocol)
fitness dictator_sk
@ -49,7 +49,7 @@ let init ?(sandbox = "sandbox.json") () =
return (pid, hash)
let level block =
Client_alpha.Client_proto_rpcs.Context.level rpc_config block
Client_proto_rpcs.Context.level rpc_config block
module Account = struct

4
test/proto_alpha/proto_alpha_helpers.mli
View File

@ -107,11 +107,11 @@ module Endorse : sig
val endorse :
?slot:int ->
Account.t ->
Client_alpha.Client_proto_rpcs.block ->
Client_proto_rpcs.block ->
Operation.raw tzresult Lwt.t
val endorsers_list :
Client_alpha.Client_proto_rpcs.block ->
Client_proto_rpcs.block ->
Account.t array tzresult Lwt.t
val endorsement_rights :

2
test/proto_alpha/test_michelson_parser.ml
View File

@ -7,9 +7,7 @@
(* *)
(**************************************************************************)
open Client_embedded_proto_alpha
open Tezos_context.Script
open Client_alpha
module Helpers = Proto_alpha_helpers
module Assert = Helpers.Assert