From 96d9f317c12ba5bc6b12eaaa047e6faad6e950bc Mon Sep 17 00:00:00 2001
From: Vincent Bernardoff <vb@luminar.eu.org>
Date: Mon, 23 Apr 2018 15:31:20 +0200
Subject: [PATCH] Ocplib_json_typed: adapt code for inclusion in `vendors`

---
 .gitlab-ci.yml                                | 55 ++++++++++++-------
 src/lib_data_encoding/jbuild                  |  2 +-
 vendors/ocplib-resto/lib_resto-json/jbuild    |  2 +-
 .../lib_resto-json/ocplib-resto-json.opam     |  3 +-
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f85936c09..17f13466f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,41 +249,41 @@ test:proto:sandbox:
     - gitlab-org
 
 ##BEGIN_OPAM##
-opam:00:tezos-stdlib:
+opam:00:ocplib-json-typed:
+  <<: *opam_definition
+  variables:
+    package: ocplib-json-typed
+
+opam:01:tezos-stdlib:
   <<: *opam_definition
   variables:
     package: tezos-stdlib
 
-opam:01:tezos-data-encoding:
+opam:02:tezos-data-encoding:
   <<: *opam_definition
   variables:
     package: tezos-data-encoding
 
-opam:02:ocplib-resto:
+opam:03:ocplib-resto:
   <<: *opam_definition
   variables:
     package: ocplib-resto
 
-opam:03:tezos-error-monad:
+opam:04:tezos-error-monad:
   <<: *opam_definition
   variables:
     package: tezos-error-monad
 
-opam:04:ocplib-resto-directory:
+opam:05:ocplib-resto-directory:
   <<: *opam_definition
   variables:
     package: ocplib-resto-directory
 
-opam:05:blake2:
+opam:06:blake2:
   <<: *opam_definition
   variables:
     package: blake2
 
-opam:06:secp256k1:
-  <<: *opam_definition
-  variables:
-    package: secp256k1
-
 opam:07:tezos-clic:
   <<: *opam_definition
   variables:
@@ -444,51 +444,66 @@ opam:38:ocplib-ezresto:
   variables:
     package: ocplib-ezresto
 
-opam:39:tezos-embedded-protocol-alpha:
+opam:39:secp256k1:
+  <<: *opam_definition
+  variables:
+    package: secp256k1
+
+opam:40:tezos-embedded-protocol-alpha:
   <<: *opam_definition
   variables:
     package: tezos-embedded-protocol-alpha
 
-opam:40:tezos-embedded-protocol-demo:
+opam:41:tezos-embedded-protocol-demo:
   <<: *opam_definition
   variables:
     package: tezos-embedded-protocol-demo
 
-opam:41:tezos-embedded-protocol-genesis:
+opam:42:tezos-embedded-protocol-genesis:
   <<: *opam_definition
   variables:
     package: tezos-embedded-protocol-genesis
 
-opam:42:tezos-shell:
+opam:43:tezos-shell:
   <<: *opam_definition
   variables:
     package: tezos-shell
 
-opam:43:tezos-client:
+opam:44:tezos-client:
   <<: *opam_definition
   variables:
     package: tezos-client
 
-opam:44:ocplib-ezresto-directory:
+opam:45:ocplib-json-typed-bson:
+  <<: *opam_definition
+  variables:
+    package: ocplib-json-typed-bson
+
+opam:46:ocplib-ezresto-directory:
   <<: *opam_definition
   variables:
     package: ocplib-ezresto-directory
 
-opam:45:tezos-baker-alpha:
+opam:47:tezos-baker-alpha:
   <<: *opam_definition
   variables:
     package: tezos-baker-alpha
 
-opam:46:tezos-protocol-demo:
+opam:48:tezos-protocol-demo:
   <<: *opam_definition
   variables:
     package: tezos-protocol-demo
 
-opam:47:tezos-node:
+opam:49:tezos-node:
   <<: *opam_definition
   variables:
     package: tezos-node
 
+opam:50:ocplib-json-typed-browser:
+  <<: *opam_definition
+  variables:
+    package: ocplib-json-typed-browser
+
 
 ##END_OPAM##
 
diff --git a/src/lib_data_encoding/jbuild b/src/lib_data_encoding/jbuild
index afbe4e9d4..ac97c8e99 100644
--- a/src/lib_data_encoding/jbuild
+++ b/src/lib_data_encoding/jbuild
@@ -5,7 +5,7 @@
   (public_name tezos-data-encoding)
   (libraries (tezos-stdlib
               ocplib-json-typed
-              ocplib-json-typed.bson
+              ocplib-json-typed-bson
               ezjsonm))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
diff --git a/vendors/ocplib-resto/lib_resto-json/jbuild b/vendors/ocplib-resto/lib_resto-json/jbuild
index 8af70510e..62e5316eb 100644
--- a/vendors/ocplib-resto/lib_resto-json/jbuild
+++ b/vendors/ocplib-resto/lib_resto-json/jbuild
@@ -3,6 +3,6 @@
 (library
  ((name resto_json)
   (public_name ocplib-resto-json)
-  (libraries (ocplib-json-typed ocplib-json-typed.bson ocplib-resto))
+  (libraries (ocplib-json-typed ocplib-json-typed-bson ocplib-resto))
   (flags (:standard -safe-string))
   (wrapped false)))
diff --git a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
index 98237d24b..6b9939ce4 100644
--- a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
+++ b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam
@@ -18,6 +18,5 @@ depends: [
   "ocamlfind" {build}
   "jbuilder" {build}
   "ocplib-resto" {= "dev" }
-  "ocplib-json-typed" { >= "0.4" }
-  "ocplib-endian" ## for `ocplib-json-typed.bson` to be built
+  "ocplib-json-typed-bson" { >= "0.6" }
 ]