Remove tezos_protocol_packer

src/Makefile

@@ -42,30 +42,6 @@ partial-clean::
 	rm -f ${SIGS_PACKER}
 	rm -f ${PACKED_SIGS_V1}.ml
 
-############################################################################
-## Protocol packer
-############################################################################
-
-PACKER_OBJS := \
-   ${PACKER_LIB_IMPLS:.ml=.cmx} ${PACKER_LIB_IMPLS:.ml=.ml.deps} \
-   ${PACKER_LIB_INTFS:.mli=.cmi} ${PACKER_LIB_INTFS:.mli=.mli.deps} \
-   ${PACKER_IMPLS:.ml=.cmx} ${PACKER_IMPLS:.ml=.ml.deps} \
-
-${PACKER_OBJS}: PACKAGES=
-${PACKER_OBJS}: SOURCE_DIRECTORIES=${PACKER_DIRECTORIES}
-${PACKER_OBJS}: TARGET="(packer.cmxa)"
-${PACKER_OBJS}: OPENED_MODULES=
-
-packer.cmxa: ${PACKER_LIB_IMPLS:.ml=.cmx}
-	@echo LINK $(notdir $@)
-	@${OCAMLOPT} ${OCAMLFLAGS} -a -o $@ $^
-
-${TZPROTOCOLPACKER}: packer.cmxa ${PACKER_IMPLS:.ml=.cmx}
-	@echo LINK $(notdir $@)
-	@$(OCAMLOPT) -o $@ $^
-
-clean::
-	rm -rf ${TZPROTOCOLPACKER}
 
 ############################################################################
 ## Protocol compiler (also embedded in the node)
@@ -94,7 +70,7 @@ compiler.cmxa: ${COMPILER_LIB_IMPLS:.ml=.cmx}
 	@echo LINK $(notdir $@)
 	@${OCAMLOPT} ${OCAMLFLAGS} -a -o $@ $^
 
-${TZCOMPILER}: packer.cmxa minutils.cmxa utils.cmxa compiler.cmxa ${COMPILER_IMPLS:.ml=.cmx}
+${TZCOMPILER}: minutils.cmxa utils.cmxa compiler.cmxa ${COMPILER_IMPLS:.ml=.cmx}
 	@echo LINK $(notdir $@)
 	@$(OCAMLOPT) -linkpkg $(patsubst %, -package %, $(COMPILER_PACKAGES)) -o $@ $^
 
@@ -182,7 +158,7 @@ node.cmxa: ${NODE_LIB_IMPLS:.ml=.cmx}
 	@${OCAMLOPT} ${OCAMLFLAGS} -a -o $@ $^
 
  ${NODE_IMPLS:.ml=.cmx}: ${EMBEDDED_NODE_PROTOCOLS}
-${TZNODE}: packer.cmxa minutils.cmxa utils.cmxa compiler.cmxa node.cmxa ${EMBEDDED_NODE_PROTOCOLS} ${NODE_IMPLS:.ml=.cmx}
+${TZNODE}: minutils.cmxa utils.cmxa compiler.cmxa node.cmxa ${EMBEDDED_NODE_PROTOCOLS} ${NODE_IMPLS:.ml=.cmx}
 	@echo LINK $(notdir $@)
 	@${OCAMLOPT} -linkall -linkpkg ${OCAMLFLAGS} -o $@ $^
 
@@ -230,7 +206,7 @@ client.cmxa: ${CLIENT_LIB_IMPLS:.ml=.cmx}
 ${EMBEDDED_CLIENT_VERSIONS}: client.cmxa ${EMBEDDED_CLIENT_PROTOCOLS}
 ${CLIENT_IMPLS:.ml=.cmx}: ${EMBEDDED_CLIENT_VERSIONS}
 
-${TZCLIENT}: packer.cmxa minutils.cmxa utils.cmxa compiler.cmxa node.cmxa \
+${TZCLIENT}: minutils.cmxa utils.cmxa compiler.cmxa node.cmxa \
              client.cmxa \
              ${EMBEDDED_CLIENT_PROTOCOLS} \
              ${EMBEDDED_CLIENT_VERSIONS} \
@@ -275,7 +251,6 @@ ifneq ($(MAKECMDGOALS),clean)
 include .depend
 endif
 DEPENDS := $(filter-out $(NO_DEPS), \
-  $(PACKER_LIB_INTFS) $(PACKER_LIB_IMPLS) $(PACKER_IMPLS) \
   $(MINUTILS_LIB_INTFS) $(MINUTILS_LIB_IMPLS) \
   $(UTILS_LIB_INTFS) $(UTILS_LIB_IMPLS) \
   ${COMPILER_PRECOMPILED_INTFS} \

src/Makefile.files

@@ -40,18 +40,6 @@ $(addprefix environment/v1/, \
   updater.mli \
 )
 
-PACKER_DIRECTORIES := \
-  ${SRCDIR}/packer
-
-PACKER_LIB_INTFS := \
-  packer/tezos_protocol_packer.mli
-
-PACKER_LIB_IMPLS := \
-  packer/tezos_protocol_packer.ml
-
-PACKER_IMPLS := \
-  packer_main.ml
-
 ############################################################################
 ## Minimal utils library compatible with js_of_ocaml
 ############################################################################
@@ -152,7 +140,6 @@ UTILS_PACKAGES := \
 
 COMPILER_SOURCE_DIRECTORIES := \
   ${ENVIRONMENT_SOURCE_DIRECTORIES} \
-  ${PACKER_DIRECTORIES} \
   ${UTILS_SOURCE_DIRECTORIES} \
   ${SRCDIR}/compiler
 
@@ -173,11 +160,13 @@ COMPILER_IMPLS := \
 COMPILER_LIB_INTFS := \
   compiler/tezos_compiler_embedded_cmis.mli \
   compiler/tezos_protocol_registerer.mli \
+  compiler/packer.mli \
   compiler/tezos_compiler.mli \
 
 COMPILER_LIB_IMPLS := \
   compiler/tezos_compiler_embedded_cmis.ml \
   compiler/tezos_protocol_registerer.ml \
+  compiler/packer.ml \
   compiler/tezos_compiler.ml \
 
 COMPILER_IMPLS := \

src/compiler/tezos_compiler.ml

@@ -286,7 +286,7 @@ let main () =
   (* Generate the 'functor' *)
   let functor_file = build_dir // "functor.ml" in
   let oc = open_out functor_file in
-  Tezos_protocol_packer.dump oc
+  Packer.dump oc
     (Array.map
        begin fun { Protocol.name }  ->
          let name_lowercase = String.uncapitalize_ascii name in

src/packer_main.ml

@@ -1,10 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*    Copyright (c) 2014 - 2016.                                          *)
-(*    Dynamic Ledger Solutions, Inc. <contact@tezos.com>                  *)
-(*                                                                        *)
-(*    All rights reserved. No warranty, explicit or implicit, provided.   *)
-(*                                                                        *)
-(**************************************************************************)
-
-let () = Tezos_protocol_packer.main ()

test/Makefile.shared

@@ -36,7 +36,6 @@ ${TESTLIB}: $(shell find ${SRCDIR}/../test/lib -name \*.ml -or -name \*.mli)
 ## External packages
 ############################################################################
 
-PACKERLIB := ${SRCDIR}/packer.cmxa
 MINUTILSLIB := ${SRCDIR}/minutils.cmxa
 UTILSLIB := ${SRCDIR}/utils.cmxa
 COMPILERLIB := ${SRCDIR}/compiler.cmxa

test/p2p/Makefile

@@ -10,7 +10,7 @@ include ../Makefile.shared
 
 SOURCE_DIRECTORIES := ${NODE_SOURCE_DIRECTORIES} ../lib
 
-LIB := ${PACKERLIB} ${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} ${NODELIB} ${TESTLIB}
+LIB := ${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} ${NODELIB} ${TESTLIB}
 
 PACKAGES := \
   ${NODE_PACKAGES} \

test/proto_alpha/Makefile

@@ -17,7 +17,7 @@ SOURCE_DIRECTORIES := \
   ../lib
 
 LIB := \
-  ${PACKERLIB} ${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} \
+  ${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} \
   ${NODELIB} ${EMBEDDED_CLIENT_PROTOCOLS} ${CLIENTLIB} ${TESTLIB}
 
 PACKAGES := \

test/shell/Makefile

@@ -10,7 +10,7 @@ include ../Makefile.shared
 
 SOURCE_DIRECTORIES := ${NODE_SOURCE_DIRECTORIES} ../lib
 
-LIB := ${PACKERLIB} ${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} ${NODELIB} ${EMBEDDED_NODE_PROTOCOLS} ${TESTLIB}
+LIB := ${MINUTILSLIB} ${UTILSLIB} ${COMPILERLIB} ${NODELIB} ${EMBEDDED_NODE_PROTOCOLS} ${TESTLIB}
 
 PACKAGES := \
   ${NODE_PACKAGES} \