From e24b1dda75da00086e163f077a83e1a88da486c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Henry?= Date: Mon, 27 Nov 2017 06:13:12 +0100 Subject: [PATCH] Jbuilder: move `protocol_environment_sigs` in its own OPAM package --- .../jbuild | 4 ++-- .../sigs_packer/jbuild | 4 +--- .../sigs_packer/sigs_packer.ml | 0 .../tezos-protocol-environment-sigs.opam | 19 +++++++++++++++++++ .../v1/RPC.mli | 0 .../v1/array.mli | 0 .../v1/base58.mli | 0 .../v1/blake2B.mli | 0 .../v1/buffer.mli | 0 .../v1/bytes.mli | 0 .../v1/compare.mli | 0 .../v1/context.mli | 0 .../v1/data_encoding.mli | 0 .../v1/ed25519.mli | 0 .../v1/error_monad.mli | 0 .../v1/fitness.mli | 0 .../v1/format.mli | 0 .../v1/hash.mli | 0 .../v1/hex_encode.mli | 0 .../v1/int32.mli | 0 .../v1/int64.mli | 0 .../v1/json.mli | 0 .../v1/list.mli | 0 .../v1/logging.mli | 0 .../v1/lwt.mli | 0 .../v1/lwt_list.mli | 0 .../v1/lwt_sequence.mli | 0 .../v1/mBytes.mli | 0 .../v1/map.mli | 0 .../v1/micheline.mli | 0 .../v1/pervasives.mli | 0 .../v1/set.mli | 0 .../v1/string.mli | 0 .../v1/tezos_data.mli | 0 .../v1/time.mli | 0 .../v1/updater.mli | 0 .../v1/z.mli | 0 src/compiler/jbuild | 6 +++--- 38 files changed, 25 insertions(+), 8 deletions(-) rename {src/environment => lib_protocol_environment_sigs}/jbuild (89%) rename {src/environment => lib_protocol_environment_sigs}/sigs_packer/jbuild (62%) rename {src/environment => lib_protocol_environment_sigs}/sigs_packer/sigs_packer.ml (100%) create mode 100644 lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam rename {src/environment => lib_protocol_environment_sigs}/v1/RPC.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/array.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/base58.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/blake2B.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/buffer.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/bytes.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/compare.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/context.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/data_encoding.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/ed25519.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/error_monad.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/fitness.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/format.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/hash.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/hex_encode.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/int32.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/int64.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/json.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/list.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/logging.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/lwt.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/lwt_list.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/lwt_sequence.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/mBytes.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/map.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/micheline.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/pervasives.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/set.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/string.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/tezos_data.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/time.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/updater.mli (100%) rename {src/environment => lib_protocol_environment_sigs}/v1/z.mli (100%) diff --git a/src/environment/jbuild b/lib_protocol_environment_sigs/jbuild similarity index 89% rename from src/environment/jbuild rename to lib_protocol_environment_sigs/jbuild index b9d235e57..2b4c0c8fd 100644 --- a/src/environment/jbuild +++ b/lib_protocol_environment_sigs/jbuild @@ -50,6 +50,6 @@ (library ((name tezos_protocol_environment_sigs) - (public_name tezos.protocol_environment.sigs) - (flags (:standard -safe-string -w -9-32 -nopervasives)) + (public_name tezos-protocol-environment-sigs) + (flags (:standard -nopervasives)) (modules ("V1")))) diff --git a/src/environment/sigs_packer/jbuild b/lib_protocol_environment_sigs/sigs_packer/jbuild similarity index 62% rename from src/environment/sigs_packer/jbuild rename to lib_protocol_environment_sigs/sigs_packer/jbuild index 7e59f8ad0..4ae1e3367 100644 --- a/src/environment/sigs_packer/jbuild +++ b/lib_protocol_environment_sigs/sigs_packer/jbuild @@ -2,9 +2,7 @@ (executable ((name sigs_packer) - (public_name tezos-protocol-environment-sigs-packer) - (package tezos) - (flags (:standard -w -9-32 -safe-string)))) + (public_name tezos-protocol-environment-sigs.packer))) (alias ((name runtest_indent) diff --git a/src/environment/sigs_packer/sigs_packer.ml b/lib_protocol_environment_sigs/sigs_packer/sigs_packer.ml similarity index 100% rename from src/environment/sigs_packer/sigs_packer.ml rename to lib_protocol_environment_sigs/sigs_packer/sigs_packer.ml diff --git a/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam b/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam new file mode 100644 index 000000000..774a9b33a --- /dev/null +++ b/lib_protocol_environment_sigs/tezos-protocol-environment-sigs.opam @@ -0,0 +1,19 @@ +opam-version: "1.2" +version: "dev" +maintainer: "contact@tezos.com" +authors: [ "Tezos devteam" ] +homepage: "https://www.tezos.com/" +bug-reports: "https://gitlab.com/tezos/tezos/issues" +dev-repo: "https://gitlab.com/tezos/tezos.git" +license: "unreleased" +depends: [ + "ocamlfind" { build } + "jbuilder" { build & >= "1.0+beta15" } + "tezos-stdlib" { test } +] +build: [ + [ "jbuilder" "build" "-p" name "-j" jobs ] +] +build-test: [ + [ "jbuilder" "runtest" "-p" name "-j" jobs ] +] diff --git a/src/environment/v1/RPC.mli b/lib_protocol_environment_sigs/v1/RPC.mli similarity index 100% rename from src/environment/v1/RPC.mli rename to lib_protocol_environment_sigs/v1/RPC.mli diff --git a/src/environment/v1/array.mli b/lib_protocol_environment_sigs/v1/array.mli similarity index 100% rename from src/environment/v1/array.mli rename to lib_protocol_environment_sigs/v1/array.mli diff --git a/src/environment/v1/base58.mli b/lib_protocol_environment_sigs/v1/base58.mli similarity index 100% rename from src/environment/v1/base58.mli rename to lib_protocol_environment_sigs/v1/base58.mli diff --git a/src/environment/v1/blake2B.mli b/lib_protocol_environment_sigs/v1/blake2B.mli similarity index 100% rename from src/environment/v1/blake2B.mli rename to lib_protocol_environment_sigs/v1/blake2B.mli diff --git a/src/environment/v1/buffer.mli b/lib_protocol_environment_sigs/v1/buffer.mli similarity index 100% rename from src/environment/v1/buffer.mli rename to lib_protocol_environment_sigs/v1/buffer.mli diff --git a/src/environment/v1/bytes.mli b/lib_protocol_environment_sigs/v1/bytes.mli similarity index 100% rename from src/environment/v1/bytes.mli rename to lib_protocol_environment_sigs/v1/bytes.mli diff --git a/src/environment/v1/compare.mli b/lib_protocol_environment_sigs/v1/compare.mli similarity index 100% rename from src/environment/v1/compare.mli rename to lib_protocol_environment_sigs/v1/compare.mli diff --git a/src/environment/v1/context.mli b/lib_protocol_environment_sigs/v1/context.mli similarity index 100% rename from src/environment/v1/context.mli rename to lib_protocol_environment_sigs/v1/context.mli diff --git a/src/environment/v1/data_encoding.mli b/lib_protocol_environment_sigs/v1/data_encoding.mli similarity index 100% rename from src/environment/v1/data_encoding.mli rename to lib_protocol_environment_sigs/v1/data_encoding.mli diff --git a/src/environment/v1/ed25519.mli b/lib_protocol_environment_sigs/v1/ed25519.mli similarity index 100% rename from src/environment/v1/ed25519.mli rename to lib_protocol_environment_sigs/v1/ed25519.mli diff --git a/src/environment/v1/error_monad.mli b/lib_protocol_environment_sigs/v1/error_monad.mli similarity index 100% rename from src/environment/v1/error_monad.mli rename to lib_protocol_environment_sigs/v1/error_monad.mli diff --git a/src/environment/v1/fitness.mli b/lib_protocol_environment_sigs/v1/fitness.mli similarity index 100% rename from src/environment/v1/fitness.mli rename to lib_protocol_environment_sigs/v1/fitness.mli diff --git a/src/environment/v1/format.mli b/lib_protocol_environment_sigs/v1/format.mli similarity index 100% rename from src/environment/v1/format.mli rename to lib_protocol_environment_sigs/v1/format.mli diff --git a/src/environment/v1/hash.mli b/lib_protocol_environment_sigs/v1/hash.mli similarity index 100% rename from src/environment/v1/hash.mli rename to lib_protocol_environment_sigs/v1/hash.mli diff --git a/src/environment/v1/hex_encode.mli b/lib_protocol_environment_sigs/v1/hex_encode.mli similarity index 100% rename from src/environment/v1/hex_encode.mli rename to lib_protocol_environment_sigs/v1/hex_encode.mli diff --git a/src/environment/v1/int32.mli b/lib_protocol_environment_sigs/v1/int32.mli similarity index 100% rename from src/environment/v1/int32.mli rename to lib_protocol_environment_sigs/v1/int32.mli diff --git a/src/environment/v1/int64.mli b/lib_protocol_environment_sigs/v1/int64.mli similarity index 100% rename from src/environment/v1/int64.mli rename to lib_protocol_environment_sigs/v1/int64.mli diff --git a/src/environment/v1/json.mli b/lib_protocol_environment_sigs/v1/json.mli similarity index 100% rename from src/environment/v1/json.mli rename to lib_protocol_environment_sigs/v1/json.mli diff --git a/src/environment/v1/list.mli b/lib_protocol_environment_sigs/v1/list.mli similarity index 100% rename from src/environment/v1/list.mli rename to lib_protocol_environment_sigs/v1/list.mli diff --git a/src/environment/v1/logging.mli b/lib_protocol_environment_sigs/v1/logging.mli similarity index 100% rename from src/environment/v1/logging.mli rename to lib_protocol_environment_sigs/v1/logging.mli diff --git a/src/environment/v1/lwt.mli b/lib_protocol_environment_sigs/v1/lwt.mli similarity index 100% rename from src/environment/v1/lwt.mli rename to lib_protocol_environment_sigs/v1/lwt.mli diff --git a/src/environment/v1/lwt_list.mli b/lib_protocol_environment_sigs/v1/lwt_list.mli similarity index 100% rename from src/environment/v1/lwt_list.mli rename to lib_protocol_environment_sigs/v1/lwt_list.mli diff --git a/src/environment/v1/lwt_sequence.mli b/lib_protocol_environment_sigs/v1/lwt_sequence.mli similarity index 100% rename from src/environment/v1/lwt_sequence.mli rename to lib_protocol_environment_sigs/v1/lwt_sequence.mli diff --git a/src/environment/v1/mBytes.mli b/lib_protocol_environment_sigs/v1/mBytes.mli similarity index 100% rename from src/environment/v1/mBytes.mli rename to lib_protocol_environment_sigs/v1/mBytes.mli diff --git a/src/environment/v1/map.mli b/lib_protocol_environment_sigs/v1/map.mli similarity index 100% rename from src/environment/v1/map.mli rename to lib_protocol_environment_sigs/v1/map.mli diff --git a/src/environment/v1/micheline.mli b/lib_protocol_environment_sigs/v1/micheline.mli similarity index 100% rename from src/environment/v1/micheline.mli rename to lib_protocol_environment_sigs/v1/micheline.mli diff --git a/src/environment/v1/pervasives.mli b/lib_protocol_environment_sigs/v1/pervasives.mli similarity index 100% rename from src/environment/v1/pervasives.mli rename to lib_protocol_environment_sigs/v1/pervasives.mli diff --git a/src/environment/v1/set.mli b/lib_protocol_environment_sigs/v1/set.mli similarity index 100% rename from src/environment/v1/set.mli rename to lib_protocol_environment_sigs/v1/set.mli diff --git a/src/environment/v1/string.mli b/lib_protocol_environment_sigs/v1/string.mli similarity index 100% rename from src/environment/v1/string.mli rename to lib_protocol_environment_sigs/v1/string.mli diff --git a/src/environment/v1/tezos_data.mli b/lib_protocol_environment_sigs/v1/tezos_data.mli similarity index 100% rename from src/environment/v1/tezos_data.mli rename to lib_protocol_environment_sigs/v1/tezos_data.mli diff --git a/src/environment/v1/time.mli b/lib_protocol_environment_sigs/v1/time.mli similarity index 100% rename from src/environment/v1/time.mli rename to lib_protocol_environment_sigs/v1/time.mli diff --git a/src/environment/v1/updater.mli b/lib_protocol_environment_sigs/v1/updater.mli similarity index 100% rename from src/environment/v1/updater.mli rename to lib_protocol_environment_sigs/v1/updater.mli diff --git a/src/environment/v1/z.mli b/lib_protocol_environment_sigs/v1/z.mli similarity index 100% rename from src/environment/v1/z.mli rename to lib_protocol_environment_sigs/v1/z.mli diff --git a/src/compiler/jbuild b/src/compiler/jbuild index 5724a2931..e482f111c 100644 --- a/src/compiler/jbuild +++ b/src/compiler/jbuild @@ -6,14 +6,14 @@ (run ${bin:ocp-ocamlres} -format ocaml -o ${@} ${lib:stdlib:camlinternalFormatBasics.cmi} ${path:tezos_protocol_compiler__Registerer.cmi} - ${path:../environment/tezos_protocol_environment_sigs.cmi} - ${path:../environment/tezos_protocol_environment_sigs__V1.cmi})))) + ${lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs.cmi} + ${lib:tezos-protocol-environment-sigs:tezos_protocol_environment_sigs__V1.cmi})))) (library ((name tezos_protocol_compiler) (public_name tezos.protocol_compiler) (libraries (tezos-base - tezos_protocol_environment_sigs + tezos-protocol-environment-sigs compiler-libs compiler-libs.optcomp lwt.unix