From dc5c4910cf5ffabbfeeb383b9f3763a9b48e8030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Fri, 27 Oct 2017 20:21:36 +0200 Subject: [PATCH] Rename `tezos_compiler_embedded_cmis.ml` --- src/Makefile | 16 ++++++++-------- src/Makefile.files | 4 ++-- ...piler_embedded_cmis.mli => embedded_cmis.mli} | 0 src/compiler/tezos_compiler.ml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) rename src/compiler/{tezos_compiler_embedded_cmis.mli => embedded_cmis.mli} (100%) diff --git a/src/Makefile b/src/Makefile index 3e312bf1e..a3f7375e3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -59,10 +59,10 @@ ${COMPILER_OBJS}: OPENED_MODULES=${COMPILER_OPENED_MODULES} compiler/registerer.cmi: EXTRA_OCAMLFLAGS = -opaque -.INTERMEDIATE: compiler/tezos_compiler_embedded_cmis.ml -compiler/tezos_compiler_embedded_cmis.cmx: compiler/tezos_compiler_embedded_cmis.cmi +.INTERMEDIATE: compiler/embedded_cmis.ml +compiler/embedded_cmis.cmx: compiler/embedded_cmis.cmi -compiler/tezos_compiler_embedded_cmis.ml: ${COMPILER_EMBEDDED_CMIS} +compiler/embedded_cmis.ml: ${COMPILER_EMBEDDED_CMIS} @echo OCAMLRES ${TARGET} $(notdir $@) @$(OCAMLRES) -format ocaml -o $@ $^ @@ -75,7 +75,7 @@ ${TZCOMPILER}: minutils.cmxa utils.cmxa compiler.cmxa ${COMPILER_IMPLS:.ml=.cmx} @$(OCAMLOPT) -linkpkg $(patsubst %, -package %, $(COMPILER_PACKAGES)) -o $@ $^ partial-clean:: - rm -f compiler/tezos_compiler_embedded_cmis.ml + rm -f compiler/embedded_cmis.ml clean:: rm -f ${TZCOMPILER} @@ -243,9 +243,9 @@ partial-clean:: ## Dependencies NO_DEPS += \ - compiler/tezos_compiler_embedded_cmis.ml \ - compiler/tezos_compiler_embedded_cmis.mli -compiler/tezos_compiler_embedded_cmis.cmx compiler/tezos_compiler_embedded_cmis.cmi: OPENED_MODULES= + compiler/embedded_cmis.ml \ + compiler/embedded_cmis.mli +compiler/embedded_cmis.cmx compiler/embedded_cmis.cmi: OPENED_MODULES= ifneq ($(MAKECMDGOALS),clean) include .depend @@ -268,7 +268,7 @@ DEPENDS_BYTECODE := \ predepend: ${PACKED_SIGS_V1}.ml compiler/tezos_compiler.cmo compiler/tezos_compiler.cmx: \ - compiler/tezos_compiler_embedded_cmis.cmi compiler/tezos_compiler_embedded_cmis.cmx + compiler/embedded_cmis.cmi compiler/embedded_cmis.cmx .SECONDARY: $(patsubst %,%.deps,${DEPENDS}) $(patsubst %,%.deps.byte,${DEPENDS_BYTECODE}) .depend: $(patsubst %,%.deps,${DEPENDS}) $(patsubst %,%.deps.byte,${DEPENDS_BYTECODE}) diff --git a/src/Makefile.files b/src/Makefile.files index 1dca8bde5..86637e668 100644 --- a/src/Makefile.files +++ b/src/Makefile.files @@ -158,13 +158,13 @@ COMPILER_IMPLS := \ compiler_main.ml \ COMPILER_LIB_INTFS := \ - compiler/tezos_compiler_embedded_cmis.mli \ + compiler/embedded_cmis.mli \ compiler/registerer.mli \ compiler/packer.mli \ compiler/tezos_compiler.mli \ COMPILER_LIB_IMPLS := \ - compiler/tezos_compiler_embedded_cmis.ml \ + compiler/embedded_cmis.ml \ compiler/registerer.ml \ compiler/packer.ml \ compiler/tezos_compiler.ml \ diff --git a/src/compiler/tezos_compiler_embedded_cmis.mli b/src/compiler/embedded_cmis.mli similarity index 100% rename from src/compiler/tezos_compiler_embedded_cmis.mli rename to src/compiler/embedded_cmis.mli diff --git a/src/compiler/tezos_compiler.ml b/src/compiler/tezos_compiler.ml index b603789eb..5ccc545f8 100644 --- a/src/compiler/tezos_compiler.ml +++ b/src/compiler/tezos_compiler.ml @@ -106,14 +106,14 @@ let load_embeded_cmis cmis = List.iter load_embeded_cmi cmis let tezos_protocol_env = - let open Tezos_compiler_embedded_cmis in + let open Embedded_cmis in [ "CamlinternalFormatBasics", camlinternalFormatBasics_cmi ; "Tezos_protocol_environment_sigs_v1", tezos_protocol_environment_sigs_v1_cmi ; ] let register_env = - let open Tezos_compiler_embedded_cmis in + let open Embedded_cmis in [ "registerer", registerer_cmi ; ]