From b89682e441ae743a22e8a7a2f5ae4d319a2271b5 Mon Sep 17 00:00:00 2001 From: Pietro Date: Mon, 23 Jul 2018 15:40:55 +0200 Subject: [PATCH] Build: Jbuilder -> Dune 1.0.1 --- .gitlab-ci.yml | 40 +++++++++---------- Makefile | 27 ++++++------- docs/Makefile | 10 ++--- jbuild-workspace | 0 src/bin_client/tezos-client.opam | 6 +-- src/bin_node/tezos-node.opam | 6 +-- src/bin_signer/tezos-signer.opam | 6 +-- src/lib_base/tezos-base.opam | 6 +-- src/lib_clic/tezos-clic.opam | 6 +-- src/lib_client_base/tezos-client-base.opam | 6 +-- .../tezos-client-base-unix.opam | 6 +-- .../tezos-client-commands.opam | 6 +-- src/lib_crypto/tezos-crypto.opam | 6 +-- .../tezos-data-encoding.opam | 6 +-- src/lib_error_monad/tezos-error-monad.opam | 6 +-- src/lib_micheline/tezos-micheline.opam | 6 +-- src/lib_p2p/tezos-p2p.opam | 6 +-- .../jbuild_protocol_template | 2 +- .../tezos-protocol-compiler.opam | 6 +-- .../tezos-protocol-environment-shell.opam | 6 +-- .../tezos-protocol-environment-sigs.opam | 6 +-- .../tezos-protocol-environment.opam | 6 +-- .../tezos-protocol-updater.opam | 6 +-- src/lib_rpc/tezos-rpc.opam | 6 +-- src/lib_rpc_http/tezos-rpc-http.opam | 6 +-- src/lib_shell/test/test_locator.ml | 2 +- src/lib_shell/test/test_locator_plot.sh | 2 +- src/lib_shell/tezos-shell.opam | 6 +-- .../tezos-shell-services.opam | 6 +-- .../tezos-signer-backends.opam | 6 +-- .../tezos-signer-services.opam | 6 +-- src/lib_stdlib/tezos-stdlib.opam | 6 +-- src/lib_stdlib_unix/tezos-stdlib-unix.opam | 6 +-- src/lib_storage/tezos-storage.opam | 6 +-- .../bin_accuser/tezos-accuser-alpha.opam | 4 +- .../bin_baker/tezos-baker-alpha.opam | 4 +- .../bin_endorser/tezos-endorser-alpha.opam | 4 +- .../lib_client/tezos-client-alpha.opam | 4 +- .../tezos-client-alpha-commands.opam | 4 +- .../tezos-accuser-alpha-commands.opam | 4 +- .../tezos-baker-alpha-commands.opam | 4 +- .../tezos-baking-alpha-commands.opam | 4 +- .../lib_delegate/tezos-baking-alpha.opam | 6 +-- .../tezos-endorser-alpha-commands.opam | 4 +- .../tezos-embedded-protocol-alpha.opam | 6 +-- .../lib_protocol/tezos-protocol-alpha.opam | 6 +-- .../tezos-embedded-protocol-demo.opam | 6 +-- .../lib_protocol/tezos-protocol-demo.opam | 6 +-- .../lib_client/tezos-client-genesis.opam | 6 +-- .../tezos-embedded-protocol-genesis.opam | 6 +-- .../lib_protocol/tezos-protocol-genesis.opam | 6 +-- vendors/irmin-lmdb/irmin-lmdb.opam | 8 ++-- vendors/ocaml-bip39/bip39.opam | 4 +- vendors/ocaml-blake2/blake2.opam | 6 +-- vendors/ocaml-hacl/hacl.opam | 6 +-- .../ledgerwallet-tezos.opam | 6 +-- vendors/ocaml-ledger-wallet/ledgerwallet.opam | 6 +-- vendors/ocaml-lmdb/lmdb.opam | 4 +- vendors/ocaml-pbkdf/CHANGES.md | 2 +- vendors/ocaml-pbkdf/pbkdf.opam | 6 +-- vendors/ocaml-secp256k1/secp256k1.opam | 4 +- vendors/ocaml-uecc/uecc.opam | 6 +-- vendors/ocplib-json-typed/Makefile | 6 +-- .../lib_json_typed/ocplib-json-typed.opam | 6 +-- .../ocplib-json-typed-browser.opam | 6 +-- .../ocplib-json-typed-bson.opam | 6 +-- vendors/ocplib-resto/Makefile | 8 ++-- .../ocplib-ezresto-directory.opam | 6 +-- .../lib_ezresto/ocplib-ezresto.opam | 6 +-- .../lib_resto-cohttp/ocplib-resto-cohttp.opam | 6 +-- .../ocplib-resto-directory.opam | 6 +-- .../lib_resto-json/ocplib-resto-json.opam | 6 +-- .../ocplib-resto/lib_resto/ocplib-resto.opam | 6 +-- 73 files changed, 227 insertions(+), 228 deletions(-) delete mode 100644 jbuild-workspace diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c98b4342..b203b4075 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ check_opam_deps: check_indentation: <<: *build_definition script: - - jbuilder build @runtest_indent + - dune build @runtest_indent build: <<: *build_definition @@ -72,97 +72,97 @@ build: test:stdlib: <<: *test_definition script: - - jbuilder build @src/lib_stdlib/runtest + - dune build @src/lib_stdlib/runtest test:stdlib_unix: <<: *test_definition script: - - jbuilder build @src/lib_stdlib_unix/runtest + - dune build @src/lib_stdlib_unix/runtest test:data_encoding: <<: *test_definition script: - - jbuilder build @src/lib_data_encoding/runtest + - dune build @src/lib_data_encoding/runtest test:storage: <<: *test_definition script: - - jbuilder build @src/lib_storage/runtest + - dune build @src/lib_storage/runtest test:crypto: <<: *test_definition script: - - jbuilder build @src/lib_crypto/runtest + - dune build @src/lib_crypto/runtest test:shell: <<: *test_definition script: - - jbuilder build @src/lib_shell/runtest + - dune build @src/lib_shell/runtest test:p2p:io-scheduler: <<: *test_definition script: - - jbuilder build @src/lib_p2p/runtest_p2p_io_scheduler_ipv4 + - dune build @src/lib_p2p/runtest_p2p_io_scheduler_ipv4 test:p2p:socket: <<: *test_definition script: - - jbuilder build @src/lib_p2p/runtest_p2p_socket_ipv4 + - dune build @src/lib_p2p/runtest_p2p_socket_ipv4 test:p2p:pool: <<: *test_definition script: - - jbuilder build @src/lib_p2p/runtest_p2p_pool_ipv4 + - dune build @src/lib_p2p/runtest_p2p_pool_ipv4 test:proto_alpha: <<: *test_definition script: - - jbuilder build @src/proto_alpha/lib_protocol/runtest + - dune build @src/proto_alpha/lib_protocol/runtest test:p2p:peerset: <<: *test_definition script: - - jbuilder build @src/lib_p2p/runtest_p2p_peerset + - dune build @src/lib_p2p/runtest_p2p_peerset test:p2p:ipv6set: <<: *test_definition script: - - jbuilder build @src/lib_p2p/runtest_p2p_ipv6set + - dune build @src/lib_p2p/runtest_p2p_ipv6set test:p2p:banned_peers: <<: *test_definition script: - - jbuilder build @src/lib_p2p/runtest_p2p_banned_peers + - dune build @src/lib_p2p/runtest_p2p_banned_peers test:client_alpha:vote: <<: *test_definition script: - - jbuilder build @src/proto_alpha/lib_delegate/runtest_vote + - dune build @src/proto_alpha/lib_delegate/runtest_vote test:basic.sh: <<: *test_definition script: - - jbuilder build @src/bin_client/runtest_basic.sh + - dune build @src/bin_client/runtest_basic.sh test:contracts.sh: <<: *test_definition script: - - jbuilder build @src/bin_client/runtest_contracts.sh + - dune build @src/bin_client/runtest_contracts.sh test:multinode.sh: <<: *test_definition script: - - jbuilder build @src/bin_client/runtest_multinode.sh + - dune build @src/bin_client/runtest_multinode.sh test:inject.sh: <<: *test_definition script: - - jbuilder build @src/bin_client/runtest_injection.sh + - dune build @src/bin_client/runtest_injection.sh test:proto:sandbox: <<: *test_definition script: - - jbuilder build @runtest_sandbox + - dune build @runtest_sandbox test:documentation: <<: *test_definition diff --git a/Makefile b/Makefile index faf9f094d..cf0ab5474 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ -DEV ?= --dev PACKAGES:=$(patsubst %.opam,%,$(notdir $(shell find src vendors -name \*.opam -print))) active_protocol_versions := $(shell cat active_protocol_versions) @@ -18,7 +17,7 @@ all: ifneq (${current_ocaml_version},${ocaml_version}) $(error Unexpected ocaml version (found: ${current_ocaml_version}, expected: ${ocaml_version})) endif - @jbuilder build ${DEV} \ + @dune build \ src/bin_node/main.exe \ src/bin_client/main_client.exe \ src/bin_client/main_admin.exe \ @@ -39,20 +38,20 @@ endif done all.pkg: - @jbuilder build ${DEV} \ + @dune build \ $(patsubst %.opam,%.install, $(shell find src vendors -name \*.opam -print)) $(addsuffix .pkg,${PACKAGES}): %.pkg: - @jbuilder build ${DEV} \ + @dune build \ $(patsubst %.opam,%.install, $(shell find src vendors -name $*.opam -print)) $(addsuffix .test,${PACKAGES}): %.test: - @jbuilder build ${DEV} \ + @dune build \ @$(patsubst %/$*.opam,%,$(shell find src vendors -name $*.opam))/runtest doc-html: all - @jbuilder build @doc ${DEV} - @./tezos-client -protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK man -verbosity 3 -format html | sed "s/$HOME/\$HOME/g" > docs/api/tezos-client.html + @dune build @doc + @./tezos-client -protocol PtCJ7pwoxe8JasnHY8YonnLYjcVHmhiARPJvqcC6VfHT5s8k8sY man -verbosity 3 -format html | sed "s/$HOME/\$HOME/g" > docs/api/tezos-client.html @./tezos-admin-client man -verbosity 3 -format html | sed "s/$HOME/\$HOME/g" > docs/api/tezos-admin-client.html @mkdir -p $$(pwd)/docs/_build/api/odoc @rm -rf $$(pwd)/docs/_build/api/odoc/* @@ -60,14 +59,14 @@ doc-html: all @${MAKE} -C docs build-test: - @jbuilder build @buildtest ${DEV} + @dune build @buildtest test: - @jbuilder runtest ${DEV} + @dune runtest @./scripts/check_opam_test.sh test-indent: - @jbuilder build @runtest_indent ${DEV} + @dune build @runtest_indent fix-indent: @src/lib_stdlib/test-ocp-indent.sh fix @@ -79,14 +78,14 @@ docker-image: @./scripts/create_docker_image.sh install: - @jbuilder build @install - @jbuilder install + @dune build @install + @dune install uninstall: - @jbuilder uninstall + @dune uninstall clean: - @-jbuilder clean + @-dune clean @-rm -f \ tezos-node \ tezos-client \ diff --git a/docs/Makefile b/docs/Makefile index e257ca05d..655622f26 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -20,20 +20,20 @@ introduction/readme.rst: ../README.rst sed 's/TEZOS/How to build and run/' $< > $@ api/errors.rst: $(DOCERRORDIR)/error_doc.ml - @cd .. && jbuilder build ${DEV} docs/$(DOCERRORDIR)/error_doc.exe + @cd .. && dune build ${DEV} docs/$(DOCERRORDIR)/error_doc.exe ../_build/default/docs/$(DOCERRORDIR)/error_doc.exe > api/errors.rst $(DOCGENDIR)/rpc_doc.exe: - @cd .. && jbuilder build ${DEV} docs/$(DOCGENDIR)/rpc_doc.exe + @cd .. && dune build ${DEV} docs/$(DOCGENDIR)/rpc_doc.exe api/rpc.rst: $(DOCGENDIR)/rpc_doc.exe api/rpc_usage.rst.inc - @jbuilder exec $(DOCGENDIR)/rpc_doc.exe < api/rpc_usage.rst.inc > api/rpc.rst + @dune exec $(DOCGENDIR)/rpc_doc.exe < api/rpc_usage.rst.inc > api/rpc.rst $(DOCGENDIR)/p2p_doc.exe: - @cd .. && jbuilder build ${DEV} docs/$(DOCGENDIR)/p2p_doc.exe + @cd .. && dune build ${DEV} docs/$(DOCGENDIR)/p2p_doc.exe api/p2p.rst: $(DOCGENDIR)/p2p_doc.exe api/p2p_usage.rst.inc - @jbuilder exec $(DOCGENDIR)/p2p_doc.exe < api/p2p_usage.rst.inc > api/p2p.rst + @dune exec $(DOCGENDIR)/p2p_doc.exe < api/p2p_usage.rst.inc > api/p2p.rst .PHONY: help Makefile diff --git a/jbuild-workspace b/jbuild-workspace deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam index 9bc411b99..da270e387 100644 --- a/src/bin_client/tezos-client.opam +++ b/src/bin_client/tezos-client.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-client-genesis" @@ -22,8 +22,8 @@ depends: [ "tezos-protocol-compiler" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam index 52e0ac69d..41d3e4543 100644 --- a/src/bin_node/tezos-node.opam +++ b/src/bin_node/tezos-node.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-rpc-http" "tezos-p2p" @@ -21,8 +21,8 @@ depends: [ "tls" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/bin_signer/tezos-signer.opam b/src/bin_signer/tezos-signer.opam index 10bab823d..23f18e48c 100644 --- a/src/bin_signer/tezos-signer.opam +++ b/src/bin_signer/tezos-signer.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-client-base-unix" @@ -19,8 +19,8 @@ depends: [ "tezos-signer-backends" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_base/tezos-base.opam b/src/lib_base/tezos-base.opam index 7709d88b6..e60a5393f 100644 --- a/src/lib_base/tezos-base.opam +++ b/src/lib_base/tezos-base.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-stdlib" "tezos-crypto" "tezos-data-encoding" @@ -22,8 +22,8 @@ depends: [ "re" { >= "1.7.2" } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_clic/tezos-clic.opam b/src/lib_clic/tezos-clic.opam index f8d5bc46e..af211ea6c 100644 --- a/src/lib_clic/tezos-clic.opam +++ b/src/lib_clic/tezos-clic.opam @@ -8,13 +8,13 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-stdlib" "tezos-error-monad" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_client_base/tezos-client-base.opam b/src/lib_client_base/tezos-client-base.opam index 1c260ce45..f3c5604a7 100644 --- a/src/lib_client_base/tezos-client-base.opam +++ b/src/lib_client_base/tezos-client-base.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" @@ -19,8 +19,8 @@ depends: [ "bip39" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_client_base_unix/tezos-client-base-unix.opam b/src/lib_client_base_unix/tezos-client-base-unix.opam index 323201b9b..46cccd42a 100644 --- a/src/lib_client_base_unix/tezos-client-base-unix.opam +++ b/src/lib_client_base_unix/tezos-client-base-unix.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-stdlib-unix" @@ -17,8 +17,8 @@ depends: [ "tezos-client-commands" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_client_commands/tezos-client-commands.opam b/src/lib_client_commands/tezos-client-commands.opam index a0f722396..3c4e4a4c0 100644 --- a/src/lib_client_commands/tezos-client-commands.opam +++ b/src/lib_client_commands/tezos-client-commands.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-rpc" @@ -16,8 +16,8 @@ depends: [ "tezos-signer-backends" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam index 33b6eb736..deadf49e2 100644 --- a/src/lib_crypto/tezos-crypto.opam +++ b/src/lib_crypto/tezos-crypto.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-stdlib" "tezos-data-encoding" "tezos-error-monad" @@ -23,8 +23,8 @@ depends: [ "alcotest" { test & >= "0.8.3" } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_data_encoding/tezos-data-encoding.opam b/src/lib_data_encoding/tezos-data-encoding.opam index 446cbc16f..aa41b4962 100644 --- a/src/lib_data_encoding/tezos-data-encoding.opam +++ b/src/lib_data_encoding/tezos-data-encoding.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-stdlib" "ezjsonm" "ocplib-json-typed" @@ -18,8 +18,8 @@ depends: [ "crowbar" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_error_monad/tezos-error-monad.opam b/src/lib_error_monad/tezos-error-monad.opam index 97d35250c..d23a0c891 100644 --- a/src/lib_error_monad/tezos-error-monad.opam +++ b/src/lib_error_monad/tezos-error-monad.opam @@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-stdlib" "tezos-data-encoding" "lwt" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_micheline/tezos-micheline.opam b/src/lib_micheline/tezos-micheline.opam index d0f392af0..8cdb35c31 100644 --- a/src/lib_micheline/tezos-micheline.opam +++ b/src/lib_micheline/tezos-micheline.opam @@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-data-encoding" "tezos-error-monad" "uutf" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_p2p/tezos-p2p.opam b/src/lib_p2p/tezos-p2p.opam index ecd8692cf..46351a38a 100644 --- a/src/lib_p2p/tezos-p2p.opam +++ b/src/lib_p2p/tezos-p2p.opam @@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-stdlib-unix" "tezos-shell-services" "alcotest-lwt" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_compiler/jbuild_protocol_template b/src/lib_protocol_compiler/jbuild_protocol_template index ecb9d1b10..e9141c6da 100644 --- a/src/lib_protocol_compiler/jbuild_protocol_template +++ b/src/lib_protocol_compiler/jbuild_protocol_template @@ -3,7 +3,7 @@ (* Build a functorized version of the protocol with the `tezos-protocol-compiler` This is bit hackish... - AFAIK the current version of jbuilder (1.0+beta16) does not allow + AFAIK the current version of dune (1.0.1) does not allow to compile with a custom `rule` the `(modules)` of a library. A trick is to provide the `.cmx` through the `(library_flags)` and diff --git a/src/lib_protocol_compiler/tezos-protocol-compiler.opam b/src/lib_protocol_compiler/tezos-protocol-compiler.opam index 0254186cc..22d949734 100644 --- a/src/lib_protocol_compiler/tezos-protocol-compiler.opam +++ b/src/lib_protocol_compiler/tezos-protocol-compiler.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "base-unix" "tezos-base" "tezos-protocol-environment-sigs" @@ -17,10 +17,10 @@ depends: [ "ocp-ocamlres" { >= "0.4" } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] ## ocaml-version should be in sync with `script/version.sh` available: [ ocaml-version = "4.06.1" ] \ No newline at end of file diff --git a/src/lib_protocol_environment/tezos-protocol-environment-shell.opam b/src/lib_protocol_environment/tezos-protocol-environment-shell.opam index a7681d94e..a84f38538 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-shell.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-shell.opam @@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-storage" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam b/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam index c36f0327a..e40818675 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment-sigs.opam @@ -8,12 +8,12 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-stdlib" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_environment/tezos-protocol-environment.opam b/src/lib_protocol_environment/tezos-protocol-environment.opam index dba3e0c12..70960004e 100644 --- a/src/lib_protocol_environment/tezos-protocol-environment.opam +++ b/src/lib_protocol_environment/tezos-protocol-environment.opam @@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment-sigs" "alcotest-lwt" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_protocol_updater/tezos-protocol-updater.opam b/src/lib_protocol_updater/tezos-protocol-updater.opam index 109218922..d82b7fdaf 100644 --- a/src/lib_protocol_updater/tezos-protocol-updater.opam +++ b/src/lib_protocol_updater/tezos-protocol-updater.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-micheline" "tezos-shell-services" @@ -18,8 +18,8 @@ depends: [ "tezos-storage" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_rpc/tezos-rpc.opam b/src/lib_rpc/tezos-rpc.opam index 698b96252..c669b6d77 100644 --- a/src/lib_rpc/tezos-rpc.opam +++ b/src/lib_rpc/tezos-rpc.opam @@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-error-monad" "tezos-data-encoding" "ocplib-resto" "ocplib-resto-directory" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_rpc_http/tezos-rpc-http.opam b/src/lib_rpc_http/tezos-rpc-http.opam index a8331fa4d..a138d9e22 100644 --- a/src/lib_rpc_http/tezos-rpc-http.opam +++ b/src/lib_rpc_http/tezos-rpc-http.opam @@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "ocplib-resto-directory" "ocplib-resto-cohttp" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_shell/test/test_locator.ml b/src/lib_shell/test/test_locator.ml index d40cea06e..b15b0cbbb 100644 --- a/src/lib_shell/test/test_locator.ml +++ b/src/lib_shell/test/test_locator.ml @@ -274,7 +274,7 @@ let compute_size_chain size_locator = (* test if the linear and exponential locator are the same and outputs their timing. Run the test with: - $ jbuilder build @runbench_locator + $ dune build @runbench_locator Copy the output to a file timing.dat and plot it with: $ test_locator_plot.sh timing.dat *) diff --git a/src/lib_shell/test/test_locator_plot.sh b/src/lib_shell/test/test_locator_plot.sh index 12b1ab6ab..0b6162ec6 100755 --- a/src/lib_shell/test/test_locator_plot.sh +++ b/src/lib_shell/test/test_locator_plot.sh @@ -1,6 +1,6 @@ #!/bin/bash -# plots the output of 'jbuilder build @runtest_locator' +# plots the output of 'dune build @runtest_locator' set -e diff --git a/src/lib_shell/tezos-shell.opam b/src/lib_shell/tezos-shell.opam index 93a376bc8..2192f7a78 100644 --- a/src/lib_shell/tezos-shell.opam +++ b/src/lib_shell/tezos-shell.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-rpc-http" "tezos-p2p" @@ -20,8 +20,8 @@ depends: [ "tezos-protocol-alpha" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_shell_services/tezos-shell-services.opam b/src/lib_shell_services/tezos-shell-services.opam index c039b4795..6ddda1702 100644 --- a/src/lib_shell_services/tezos-shell-services.opam +++ b/src/lib_shell_services/tezos-shell-services.opam @@ -8,12 +8,12 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_signer_backends/tezos-signer-backends.opam b/src/lib_signer_backends/tezos-signer-backends.opam index 856d567e4..97b21fcf0 100644 --- a/src/lib_signer_backends/tezos-signer-backends.opam +++ b/src/lib_signer_backends/tezos-signer-backends.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-stdlib-unix" "tezos-client-base" @@ -21,8 +21,8 @@ depends: [ "alcotest-lwt" {test & >= "0.8.0"} ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_signer_services/tezos-signer-services.opam b/src/lib_signer_services/tezos-signer-services.opam index c94fb6f83..cef4f3194 100644 --- a/src/lib_signer_services/tezos-signer-services.opam +++ b/src/lib_signer_services/tezos-signer-services.opam @@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-rpc" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam index af2711d8d..e0b09b3ba 100644 --- a/src/lib_stdlib/tezos-stdlib.opam +++ b/src/lib_stdlib/tezos-stdlib.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "bigstring" "hex" "ocplib-endian" @@ -19,8 +19,8 @@ depends: [ "ocp-indent" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_stdlib_unix/tezos-stdlib-unix.opam b/src/lib_stdlib_unix/tezos-stdlib-unix.opam index 000fbf124..be1927f9e 100644 --- a/src/lib_stdlib_unix/tezos-stdlib-unix.opam +++ b/src/lib_stdlib_unix/tezos-stdlib-unix.opam @@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "lwt" { >= "3.0.0" } "conf-libev" "ipaddr" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/lib_storage/tezos-storage.opam b/src/lib_storage/tezos-storage.opam index 7faa500f0..9edea8528 100644 --- a/src/lib_storage/tezos-storage.opam +++ b/src/lib_storage/tezos-storage.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "lmdb" "irmin-lmdb" @@ -16,8 +16,8 @@ depends: [ "alcotest-lwt" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam b/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam index ec53d8dbb..28d9c61ec 100644 --- a/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam +++ b/src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-client-genesis" @@ -19,5 +19,5 @@ depends: [ "tezos-baking-alpha-commands" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/bin_baker/tezos-baker-alpha.opam b/src/proto_alpha/bin_baker/tezos-baker-alpha.opam index ec53d8dbb..28d9c61ec 100644 --- a/src/proto_alpha/bin_baker/tezos-baker-alpha.opam +++ b/src/proto_alpha/bin_baker/tezos-baker-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-client-genesis" @@ -19,5 +19,5 @@ depends: [ "tezos-baking-alpha-commands" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam b/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam index ec53d8dbb..28d9c61ec 100644 --- a/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam +++ b/src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-client-base" "tezos-client-genesis" @@ -19,5 +19,5 @@ depends: [ "tezos-baking-alpha-commands" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_client/tezos-client-alpha.opam b/src/proto_alpha/lib_client/tezos-client-alpha.opam index 0360ce650..b73c7acbe 100644 --- a/src/proto_alpha/lib_client/tezos-client-alpha.opam +++ b/src/proto_alpha/lib_client/tezos-client-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -17,5 +17,5 @@ depends: [ "tezos-signer-backends" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam b/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam index fdc9eb607..566a921f1 100644 --- a/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam +++ b/src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -18,5 +18,5 @@ depends: [ "tezos-client-commands" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam index 5ec4b6963..9b9f17241 100644 --- a/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -20,5 +20,5 @@ depends: [ "tezos-signer-backends" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam index 5ec4b6963..9b9f17241 100644 --- a/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -20,5 +20,5 @@ depends: [ "tezos-signer-backends" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam index 5ec4b6963..9b9f17241 100644 --- a/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -20,5 +20,5 @@ depends: [ "tezos-signer-backends" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam index eba6af1db..bebf4be51 100644 --- a/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam +++ b/src/proto_alpha/lib_delegate/tezos-baking-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -22,8 +22,8 @@ depends: [ "alcotest-lwt" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam b/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam index 5ec4b6963..9b9f17241 100644 --- a/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam +++ b/src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-environment" "tezos-protocol-alpha" @@ -20,5 +20,5 @@ depends: [ "tezos-signer-backends" { test } ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam index 3fe4e6320..38f03145a 100644 --- a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-compiler" "tezos-protocol-updater" @@ -17,8 +17,8 @@ build: [ [ "rm" "jbuild" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "src/jbuild" ] - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam index 65896fd42..f09a42faf 100644 --- a/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-protocol-compiler" "alcotest-lwt" { test } @@ -21,8 +21,8 @@ build: [ [ "rm" "jbuild" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "jbuild" ] - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam index 1f338a2f2..b993dedb4 100644 --- a/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam +++ b/src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & >= "1.0+beta20" } + "dune" { build & >= "1.0.1" } "tezos-protocol-compiler" "tezos-protocol-updater" ] @@ -16,8 +16,8 @@ build: [ [ "rm" "jbuild" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "src/jbuild" ] - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam index 49700a3b1..0e3527617 100644 --- a/src/proto_demo/lib_protocol/tezos-protocol-demo.opam +++ b/src/proto_demo/lib_protocol/tezos-protocol-demo.opam @@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & >= "1.0+beta20" } + "dune" { build & >= "1.0.1" } "tezos-protocol-compiler" ] build: [ [ "rm" "jbuild" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "jbuild" ] - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_genesis/lib_client/tezos-client-genesis.opam b/src/proto_genesis/lib_client/tezos-client-genesis.opam index 7f72cd4c5..46302bedc 100644 --- a/src/proto_genesis/lib_client/tezos-client-genesis.opam +++ b/src/proto_genesis/lib_client/tezos-client-genesis.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-base" "tezos-shell-services" "tezos-client-base" @@ -18,8 +18,8 @@ depends: [ "tezos-protocol-alpha" ] build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam index e5df78eb3..797caee71 100644 --- a/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam @@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-protocol-compiler" "tezos-protocol-updater" ] @@ -16,8 +16,8 @@ build: [ [ "rm" "jbuild" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "src/jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "src/jbuild" ] - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam index 17b279351..513537337 100644 --- a/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam +++ b/src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam @@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git" license: "unreleased" depends: [ "ocamlfind" { build } - "jbuilder" { build & = "1.0+beta20" } + "dune" { build & = "1.0.1" } "tezos-protocol-compiler" ] build: [ [ "rm" "jbuild" "src/jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "jbuild" ] - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] diff --git a/vendors/irmin-lmdb/irmin-lmdb.opam b/vendors/irmin-lmdb/irmin-lmdb.opam index f3084ab5e..4e83e5751 100644 --- a/vendors/irmin-lmdb/irmin-lmdb.opam +++ b/vendors/irmin-lmdb/irmin-lmdb.opam @@ -8,13 +8,13 @@ dev-repo: "https://gitlab.com/tezos/irmin-lmdb.git" doc: "https://tezos.gitlab.io/irmin-lmdb/" build: [ - ["jbuilder" "subst"] {pinned} - ["jbuilder" "build" "-p" name "-j" jobs] + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] ] -build-test: ["jbuilder" "runtest" "-p" name] +build-test: ["dune" "runtest" "-p" name] depends: [ - "jbuilder" {build & >= "1.0+beta10"} + "dune" {build & >= "1.0.1"} "irmin" {>= "1.4.0"} "lmdb" {>= "0.1"} ] diff --git a/vendors/ocaml-bip39/bip39.opam b/vendors/ocaml-bip39/bip39.opam index f7391b6da..9c7501a4c 100644 --- a/vendors/ocaml-bip39/bip39.opam +++ b/vendors/ocaml-bip39/bip39.opam @@ -10,9 +10,9 @@ dev-repo: "https://github.com/vbmithr/ocaml-bip39.git" bug-reports: "https://github.com/vbmithr/ocaml-bip39/issues" tags: [] available: [ ocaml-version >= "4.03.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] depends: [ - "jbuilder" {build & = "1.0+beta20"} + "dune" {build & = "1.0.1"} "base" {build & >= "v0.10.0"} "stdio" {build & >= "v0.10.0"} "nocrypto" {>= "0.5.4"} diff --git a/vendors/ocaml-blake2/blake2.opam b/vendors/ocaml-blake2/blake2.opam index 01a0b5c1b..678540e89 100644 --- a/vendors/ocaml-blake2/blake2.opam +++ b/vendors/ocaml-blake2/blake2.opam @@ -12,10 +12,10 @@ available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta16"} + "dune" {build & >= "1.0.1"} "bigstring" {>= "0.1.1"} "alcotest" { test } "hex" {test & >= "1.2.0"} diff --git a/vendors/ocaml-hacl/hacl.opam b/vendors/ocaml-hacl/hacl.opam index 422a68364..2334934d0 100644 --- a/vendors/ocaml-hacl/hacl.opam +++ b/vendors/ocaml-hacl/hacl.opam @@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues" dev-repo: "https://gitlab.com/tezos/tezos.git" license: "MIT" depends: [ - "jbuilder" {build & >= "1.0+beta16"} + "dune" {build & >= "1.0.1"} "bigstring" {>= "0.1.1"} "ocplib-endian" {>= "1.0"} "zarith" {>= "1.7"} @@ -17,6 +17,6 @@ depends: [ "base" "stdio" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] available: [ ocaml-version >= "4.02.0" ] diff --git a/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam b/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam index efdb5e664..bf642ca39 100644 --- a/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam +++ b/vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam @@ -12,9 +12,9 @@ available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta16"} + "dune" {build & >= "1.0.1"} "ledgerwallet" {= "dev"} ] diff --git a/vendors/ocaml-ledger-wallet/ledgerwallet.opam b/vendors/ocaml-ledger-wallet/ledgerwallet.opam index e4308cdae..8c5d2d96a 100644 --- a/vendors/ocaml-ledger-wallet/ledgerwallet.opam +++ b/vendors/ocaml-ledger-wallet/ledgerwallet.opam @@ -12,10 +12,10 @@ available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta16"} + "dune" {build & >= "1.0.1"} "rresult" {>= "0.5.0"} "cstruct" {>= "3.2.1"} "hidapi" {>= "1.0"} diff --git a/vendors/ocaml-lmdb/lmdb.opam b/vendors/ocaml-lmdb/lmdb.opam index 0f94dda1b..6f4dcf64f 100644 --- a/vendors/ocaml-lmdb/lmdb.opam +++ b/vendors/ocaml-lmdb/lmdb.opam @@ -12,9 +12,9 @@ available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] depends: [ - "jbuilder" {build & >= "1.0+beta18"} + "dune" {build & >= "1.0.1"} "rresult" {>= "0.5.0"} "cstruct" {test & >= "3.2.1"} "alcotest" {test & >= "0.8.1"} diff --git a/vendors/ocaml-pbkdf/CHANGES.md b/vendors/ocaml-pbkdf/CHANGES.md index 679512c33..16b9c550f 100644 --- a/vendors/ocaml-pbkdf/CHANGES.md +++ b/vendors/ocaml-pbkdf/CHANGES.md @@ -1,6 +1,6 @@ # 0.3.0 (2018-02-16) -* Build: switch to jbuilder +* Build: switch to dune # 0.2.0 (2016-10-31) diff --git a/vendors/ocaml-pbkdf/pbkdf.opam b/vendors/ocaml-pbkdf/pbkdf.opam index cfcbdefce..00a393c96 100644 --- a/vendors/ocaml-pbkdf/pbkdf.opam +++ b/vendors/ocaml-pbkdf/pbkdf.opam @@ -8,10 +8,10 @@ authors: ["Alfredo Beaumont " "Sonia Meruelo "] license: "BSD2" -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & = "1.0+beta20"} + "dune" {build & = "1.0.1"} "nocrypto" {>= "0.5.4"} "alcotest" {test & >= "0.8.1"} ] diff --git a/vendors/ocaml-secp256k1/secp256k1.opam b/vendors/ocaml-secp256k1/secp256k1.opam index 63564bc9c..70a8a7038 100644 --- a/vendors/ocaml-secp256k1/secp256k1.opam +++ b/vendors/ocaml-secp256k1/secp256k1.opam @@ -11,10 +11,10 @@ available: [ ocaml-version >= "4.03.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] depends: [ "conf-gmp" {build} - "jbuilder" {build & >= "1.0+beta20"} + "dune" {build & >= "1.0.1"} "cstruct" {>= "3.2.1"} "bigstring" {>= "0.1.1"} ] diff --git a/vendors/ocaml-uecc/uecc.opam b/vendors/ocaml-uecc/uecc.opam index 19341e42f..a3f78c927 100644 --- a/vendors/ocaml-uecc/uecc.opam +++ b/vendors/ocaml-uecc/uecc.opam @@ -12,10 +12,10 @@ available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta19.1"} + "dune" {build & >= "1.0.1"} "bigstring" {>= "0.1.1"} "alcotest" {test & >= "0.8.1"} "cstruct" {test & >= "3.2.1"} diff --git a/vendors/ocplib-json-typed/Makefile b/vendors/ocplib-json-typed/Makefile index 681368287..4cfc21d4e 100644 --- a/vendors/ocplib-json-typed/Makefile +++ b/vendors/ocplib-json-typed/Makefile @@ -1,11 +1,11 @@ all: - jbuilder build @install @runtest --dev + dune build @install @runtest --dev install: - jbuilder install + dune install uninstall: - jbuilder uninstall + dune uninstall clean: rm -rf _build *~ */*~ diff --git a/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam b/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam index dc8a0dac4..1c2fb10f1 100644 --- a/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam +++ b/vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam @@ -9,9 +9,9 @@ license: "LGPLv3 w/ linking exception" dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta20"} + "dune" {build & >= "1.0.1"} "uri" {>= "1.9.0" } ] diff --git a/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam b/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam index df29eb3e6..6a0e28d1c 100644 --- a/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam +++ b/vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam @@ -9,10 +9,10 @@ license: "LGPLv3 w/ linking exception" dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta20"} + "dune" {build & >= "1.0.1"} "ocplib-json-typed" {= "0.6" } "js_of_ocaml" {>= "3.1.0"} ] diff --git a/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam b/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam index c81930099..bd42db75d 100644 --- a/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam +++ b/vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam @@ -9,10 +9,10 @@ license: "LGPLv3 w/ linking exception" dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" available: [ ocaml-version >= "4.02.0" ] -build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] -build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] +build: [ "dune" "build" "-j" jobs "-p" name "@install" ] +build-test: [ "dune" "runtest" "-p" name "-j" jobs ] depends: [ - "jbuilder" {build & >= "1.0+beta20"} + "dune" {build & >= "1.0.1"} "ocplib-json-typed" {= "0.6" } "ocplib-endian" {>= "1.0"} ] diff --git a/vendors/ocplib-resto/Makefile b/vendors/ocplib-resto/Makefile index 96df2daf9..359df937d 100644 --- a/vendors/ocplib-resto/Makefile +++ b/vendors/ocplib-resto/Makefile @@ -1,13 +1,13 @@ all: - jbuilder build --dev + dune build --dev .PHONY: test test: - jbuilder runtest --dev + dune runtest --dev doc-html: - jbuilder build @doc --dev + dune build @doc --dev clean: - jbuilder clean + dune clean diff --git a/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam index debb44a4b..161c9dbba 100644 --- a/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam +++ b/vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam @@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] depends: [ "ocamlfind" {build} - "jbuilder" {build} + "dune" {build} "ocplib-ezresto" {= "dev" } "ocplib-resto-directory" {= "dev" } ] diff --git a/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam index e53a25595..f49478bc4 100644 --- a/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam +++ b/vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam @@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] depends: [ "ocamlfind" {build} - "jbuilder" {build} + "dune" {build} "ocplib-resto" {= "dev" } "ocplib-resto-json" {= "dev" } ] diff --git a/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam index 4eceed421..ec4d7bade 100644 --- a/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam +++ b/vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam @@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] depends: [ "ocamlfind" {build} - "jbuilder" {build} + "dune" {build} "ocplib-resto-directory" {= "dev" } "cohttp-lwt-unix" { >= "1.0.0" } ] diff --git a/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam index 60ebdf99f..c27d6fb46 100644 --- a/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam +++ b/vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam @@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] depends: [ "ocamlfind" {build} - "jbuilder" {build} + "dune" {build} "ocplib-resto" {= "dev" } "ocplib-resto-json" {= "dev" & test } "lwt" { >= "3.0.0" } 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 6b9939ce4..9b05e0191 100644 --- a/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam +++ b/vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam @@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] depends: [ "ocamlfind" {build} - "jbuilder" {build} + "dune" {build} "ocplib-resto" {= "dev" } "ocplib-json-typed-bson" { >= "0.6" } ] diff --git a/vendors/ocplib-resto/lib_resto/ocplib-resto.opam b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam index ff3ad9916..c51827634 100644 --- a/vendors/ocplib-resto/lib_resto/ocplib-resto.opam +++ b/vendors/ocplib-resto/lib_resto/ocplib-resto.opam @@ -8,14 +8,14 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" build: [ - [ "jbuilder" "build" "-p" name "-j" jobs ] + [ "dune" "build" "-p" name "-j" jobs ] ] build-test: [ - [ "jbuilder" "runtest" "-p" name "-j" jobs ] + [ "dune" "runtest" "-p" name "-j" jobs ] ] depends: [ "ocamlfind" {build} - "jbuilder" {build} + "dune" {build} "uri" ]