balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build: Jbuilder -> Dune 1.0.1

Browse Source
This commit is contained in:
Pietro 2018-07-23 15:40:55 +02:00 committed by Grégoire Henry
parent 907423a85b
commit b89682e441
73 changed files with 227 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.gitlab-ci.yml
View File

@ -45,7 +45,7 @@ check_opam_deps:
check_indentation: check_indentation:
<<: *build_definition <<: *build_definition
script: script:
- jbuilder build @runtest_indent - dune build @runtest_indent
build: build:
<<: *build_definition <<: *build_definition
@ -72,97 +72,97 @@ build:
test:stdlib: test:stdlib:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_stdlib/runtest - dune build @src/lib_stdlib/runtest
test:stdlib_unix: test:stdlib_unix:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_stdlib_unix/runtest - dune build @src/lib_stdlib_unix/runtest
test:data_encoding: test:data_encoding:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_data_encoding/runtest - dune build @src/lib_data_encoding/runtest
test:storage: test:storage:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_storage/runtest - dune build @src/lib_storage/runtest
test:crypto: test:crypto:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_crypto/runtest - dune build @src/lib_crypto/runtest
test:shell: test:shell:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_shell/runtest - dune build @src/lib_shell/runtest
test:p2p:io-scheduler: test:p2p:io-scheduler:
<<: *test_definition <<: *test_definition
script: 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:p2p:socket:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_socket_ipv4 - dune build @src/lib_p2p/runtest_p2p_socket_ipv4
test:p2p:pool: test:p2p:pool:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_pool_ipv4 - dune build @src/lib_p2p/runtest_p2p_pool_ipv4
test:proto_alpha: test:proto_alpha:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/proto_alpha/lib_protocol/runtest - dune build @src/proto_alpha/lib_protocol/runtest
test:p2p:peerset: test:p2p:peerset:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_peerset - dune build @src/lib_p2p/runtest_p2p_peerset
test:p2p:ipv6set: test:p2p:ipv6set:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_ipv6set - dune build @src/lib_p2p/runtest_p2p_ipv6set
test:p2p:banned_peers: test:p2p:banned_peers:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/lib_p2p/runtest_p2p_banned_peers - dune build @src/lib_p2p/runtest_p2p_banned_peers
test:client_alpha:vote: test:client_alpha:vote:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/proto_alpha/lib_delegate/runtest_vote - dune build @src/proto_alpha/lib_delegate/runtest_vote
test:basic.sh: test:basic.sh:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/bin_client/runtest_basic.sh - dune build @src/bin_client/runtest_basic.sh
test:contracts.sh: test:contracts.sh:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/bin_client/runtest_contracts.sh - dune build @src/bin_client/runtest_contracts.sh
test:multinode.sh: test:multinode.sh:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/bin_client/runtest_multinode.sh - dune build @src/bin_client/runtest_multinode.sh
test:inject.sh: test:inject.sh:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @src/bin_client/runtest_injection.sh - dune build @src/bin_client/runtest_injection.sh
test:proto:sandbox: test:proto:sandbox:
<<: *test_definition <<: *test_definition
script: script:
- jbuilder build @runtest_sandbox - dune build @runtest_sandbox
test:documentation: test:documentation:
<<: *test_definition <<: *test_definition

27
Makefile
View File

@ -1,5 +1,4 @@
DEV ?= --dev
PACKAGES:=$(patsubst %.opam,%,$(notdir $(shell find src vendors -name \*.opam -print))) PACKAGES:=$(patsubst %.opam,%,$(notdir $(shell find src vendors -name \*.opam -print)))
active_protocol_versions := $(shell cat active_protocol_versions) active_protocol_versions := $(shell cat active_protocol_versions)
@ -18,7 +17,7 @@ all:
ifneq (${current_ocaml_version},${ocaml_version}) ifneq (${current_ocaml_version},${ocaml_version})
$(error Unexpected ocaml version (found: ${current_ocaml_version}, expected: ${ocaml_version})) $(error Unexpected ocaml version (found: ${current_ocaml_version}, expected: ${ocaml_version}))
endif endif
@jbuilder build ${DEV} \ @dune build \
src/bin_node/main.exe \ src/bin_node/main.exe \
src/bin_client/main_client.exe \ src/bin_client/main_client.exe \
src/bin_client/main_admin.exe \ src/bin_client/main_admin.exe \
@ -39,20 +38,20 @@ endif
done done
all.pkg: all.pkg:
@jbuilder build ${DEV} \ @dune build \
$(patsubst %.opam,%.install, $(shell find src vendors -name \*.opam -print)) $(patsubst %.opam,%.install, $(shell find src vendors -name \*.opam -print))
$(addsuffix .pkg,${PACKAGES}): %.pkg: $(addsuffix .pkg,${PACKAGES}): %.pkg:
@jbuilder build ${DEV} \ @dune build \
$(patsubst %.opam,%.install, $(shell find src vendors -name $*.opam -print)) $(patsubst %.opam,%.install, $(shell find src vendors -name $*.opam -print))
$(addsuffix .test,${PACKAGES}): %.test: $(addsuffix .test,${PACKAGES}): %.test:
@jbuilder build ${DEV} \ @dune build \
@$(patsubst %/$*.opam,%,$(shell find src vendors -name $*.opam))/runtest @$(patsubst %/$*.opam,%,$(shell find src vendors -name $*.opam))/runtest
doc-html: all doc-html: all
@jbuilder build @doc ${DEV} @dune build @doc
@./tezos-client -protocol ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK man -verbosity 3 -format html | sed "s/$HOME/\$HOME/g" > docs/api/tezos-client.html @./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 @./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 @mkdir -p $$(pwd)/docs/_build/api/odoc
@rm -rf $$(pwd)/docs/_build/api/odoc/* @rm -rf $$(pwd)/docs/_build/api/odoc/*
@ -60,14 +59,14 @@ doc-html: all
@${MAKE} -C docs @${MAKE} -C docs
build-test: build-test:
@jbuilder build @buildtest ${DEV} @dune build @buildtest
test: test:
@jbuilder runtest ${DEV} @dune runtest
@./scripts/check_opam_test.sh @./scripts/check_opam_test.sh
test-indent: test-indent:
@jbuilder build @runtest_indent ${DEV} @dune build @runtest_indent
fix-indent: fix-indent:
@src/lib_stdlib/test-ocp-indent.sh fix @src/lib_stdlib/test-ocp-indent.sh fix
@ -79,14 +78,14 @@ docker-image:
@./scripts/create_docker_image.sh @./scripts/create_docker_image.sh
install: install:
@jbuilder build @install @dune build @install
@jbuilder install @dune install
uninstall: uninstall:
@jbuilder uninstall @dune uninstall
clean: clean:
@-jbuilder clean @-dune clean
@-rm -f \ @-rm -f \
tezos-node \ tezos-node \
tezos-client \ tezos-client \

10
docs/Makefile
View File

@ -20,20 +20,20 @@ introduction/readme.rst: ../README.rst
sed 's/TEZOS/How to build and run/' $< > $@ sed 's/TEZOS/How to build and run/' $< > $@
api/errors.rst: $(DOCERRORDIR)/error_doc.ml 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 ../_build/default/docs/$(DOCERRORDIR)/error_doc.exe > api/errors.rst
$(DOCGENDIR)/rpc_doc.exe: $(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 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: $(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 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 .PHONY: help Makefile

0
jbuild-workspace
View File

6
src/bin_client/tezos-client.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-client-genesis" "tezos-client-genesis"
@ -22,8 +22,8 @@ depends: [
"tezos-protocol-compiler" { test } "tezos-protocol-compiler" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/bin_node/tezos-node.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-rpc-http" "tezos-rpc-http"
"tezos-p2p" "tezos-p2p"
@ -21,8 +21,8 @@ depends: [
"tls" "tls"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/bin_signer/tezos-signer.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-client-base-unix" "tezos-client-base-unix"
@ -19,8 +19,8 @@ depends: [
"tezos-signer-backends" "tezos-signer-backends"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_base/tezos-base.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-stdlib" "tezos-stdlib"
"tezos-crypto" "tezos-crypto"
"tezos-data-encoding" "tezos-data-encoding"
@ -22,8 +22,8 @@ depends: [
"re" { >= "1.7.2" } "re" { >= "1.7.2" }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_clic/tezos-clic.opam
View File

@ -8,13 +8,13 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-stdlib" "tezos-stdlib"
"tezos-error-monad" "tezos-error-monad"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_client_base/tezos-client-base.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-stdlib-unix" "tezos-stdlib-unix"
"tezos-shell-services" "tezos-shell-services"
@ -19,8 +19,8 @@ depends: [
"bip39" "bip39"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_client_base_unix/tezos-client-base-unix.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-stdlib-unix" "tezos-stdlib-unix"
@ -17,8 +17,8 @@ depends: [
"tezos-client-commands" "tezos-client-commands"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_client_commands/tezos-client-commands.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-rpc" "tezos-rpc"
@ -16,8 +16,8 @@ depends: [
"tezos-signer-backends" "tezos-signer-backends"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_crypto/tezos-crypto.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-stdlib" "tezos-stdlib"
"tezos-data-encoding" "tezos-data-encoding"
"tezos-error-monad" "tezos-error-monad"
@ -23,8 +23,8 @@ depends: [
"alcotest" { test & >= "0.8.3" } "alcotest" { test & >= "0.8.3" }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_data_encoding/tezos-data-encoding.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-stdlib" "tezos-stdlib"
"ezjsonm" "ezjsonm"
"ocplib-json-typed" "ocplib-json-typed"
@ -18,8 +18,8 @@ depends: [
"crowbar" { test } "crowbar" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_error_monad/tezos-error-monad.opam
View File

@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-stdlib" "tezos-stdlib"
"tezos-data-encoding" "tezos-data-encoding"
"lwt" "lwt"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_micheline/tezos-micheline.opam
View File

@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-data-encoding" "tezos-data-encoding"
"tezos-error-monad" "tezos-error-monad"
"uutf" "uutf"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_p2p/tezos-p2p.opam
View File

@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-stdlib-unix" "tezos-stdlib-unix"
"tezos-shell-services" "tezos-shell-services"
"alcotest-lwt" { test } "alcotest-lwt" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

2
src/lib_protocol_compiler/jbuild_protocol_template
View File

@ -3,7 +3,7 @@
(* Build a functorized version of the protocol with the (* Build a functorized version of the protocol with the
`tezos-protocol-compiler` This is bit hackish... `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. to compile with a custom `rule` the `(modules)` of a library.
A trick is to provide the `.cmx` through the `(library_flags)` and A trick is to provide the `.cmx` through the `(library_flags)` and

6
src/lib_protocol_compiler/tezos-protocol-compiler.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"base-unix" "base-unix"
"tezos-base" "tezos-base"
"tezos-protocol-environment-sigs" "tezos-protocol-environment-sigs"
@ -17,10 +17,10 @@ depends: [
"ocp-ocamlres" { >= "0.4" } "ocp-ocamlres" { >= "0.4" }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
## ocaml-version should be in sync with `script/version.sh` ## ocaml-version should be in sync with `script/version.sh`
available: [ ocaml-version = "4.06.1" ] available: [ ocaml-version = "4.06.1" ]

6
src/lib_protocol_environment/tezos-protocol-environment-shell.opam
View File

@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-storage" "tezos-storage"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_protocol_environment/tezos-protocol-environment-sigs.opam
View File

@ -8,12 +8,12 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-stdlib" { test } "tezos-stdlib" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_protocol_environment/tezos-protocol-environment.opam
View File

@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment-sigs" "tezos-protocol-environment-sigs"
"alcotest-lwt" { test } "alcotest-lwt" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_protocol_updater/tezos-protocol-updater.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-micheline" "tezos-micheline"
"tezos-shell-services" "tezos-shell-services"
@ -18,8 +18,8 @@ depends: [
"tezos-storage" "tezos-storage"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_rpc/tezos-rpc.opam
View File

@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-error-monad" "tezos-error-monad"
"tezos-data-encoding" "tezos-data-encoding"
"ocplib-resto" "ocplib-resto"
"ocplib-resto-directory" "ocplib-resto-directory"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_rpc_http/tezos-rpc-http.opam
View File

@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"ocplib-resto-directory" "ocplib-resto-directory"
"ocplib-resto-cohttp" "ocplib-resto-cohttp"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

2
src/lib_shell/test/test_locator.ml
View File

@ -274,7 +274,7 @@ let compute_size_chain size_locator =
(* test if the linear and exponential locator are the same and outputs (* test if the linear and exponential locator are the same and outputs
their timing. their timing.
Run the test with: Run the test with:
$ jbuilder build @runbench_locator $ dune build @runbench_locator
Copy the output to a file timing.dat and plot it with: Copy the output to a file timing.dat and plot it with:
$ test_locator_plot.sh timing.dat $ test_locator_plot.sh timing.dat
*) *)

2
src/lib_shell/test/test_locator_plot.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# plots the output of 'jbuilder build @runtest_locator' # plots the output of 'dune build @runtest_locator'
set -e set -e

6
src/lib_shell/tezos-shell.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-rpc-http" "tezos-rpc-http"
"tezos-p2p" "tezos-p2p"
@ -20,8 +20,8 @@ depends: [
"tezos-protocol-alpha" { test } "tezos-protocol-alpha" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_shell_services/tezos-shell-services.opam
View File

@ -8,12 +8,12 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_signer_backends/tezos-signer-backends.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-stdlib-unix" "tezos-stdlib-unix"
"tezos-client-base" "tezos-client-base"
@ -21,8 +21,8 @@ depends: [
"alcotest-lwt" {test & >= "0.8.0"} "alcotest-lwt" {test & >= "0.8.0"}
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_signer_services/tezos-signer-services.opam
View File

@ -8,14 +8,14 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-rpc" "tezos-rpc"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_stdlib/tezos-stdlib.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"bigstring" "bigstring"
"hex" "hex"
"ocplib-endian" "ocplib-endian"
@ -19,8 +19,8 @@ depends: [
"ocp-indent" { test } "ocp-indent" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_stdlib_unix/tezos-stdlib-unix.opam
View File

@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"lwt" { >= "3.0.0" } "lwt" { >= "3.0.0" }
"conf-libev" "conf-libev"
"ipaddr" "ipaddr"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/lib_storage/tezos-storage.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"lmdb" "lmdb"
"irmin-lmdb" "irmin-lmdb"
@ -16,8 +16,8 @@ depends: [
"alcotest-lwt" { test } "alcotest-lwt" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/bin_accuser/tezos-accuser-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-client-genesis" "tezos-client-genesis"
@ -19,5 +19,5 @@ depends: [
"tezos-baking-alpha-commands" "tezos-baking-alpha-commands"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/bin_baker/tezos-baker-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-client-genesis" "tezos-client-genesis"
@ -19,5 +19,5 @@ depends: [
"tezos-baking-alpha-commands" "tezos-baking-alpha-commands"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/bin_endorser/tezos-endorser-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-client-base" "tezos-client-base"
"tezos-client-genesis" "tezos-client-genesis"
@ -19,5 +19,5 @@ depends: [
"tezos-baking-alpha-commands" "tezos-baking-alpha-commands"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/lib_client/tezos-client-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -17,5 +17,5 @@ depends: [
"tezos-signer-backends" "tezos-signer-backends"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/lib_client_commands/tezos-client-alpha-commands.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -18,5 +18,5 @@ depends: [
"tezos-client-commands" "tezos-client-commands"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/lib_delegate/tezos-accuser-alpha-commands.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -20,5 +20,5 @@ depends: [
"tezos-signer-backends" { test } "tezos-signer-backends" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/lib_delegate/tezos-baker-alpha-commands.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -20,5 +20,5 @@ depends: [
"tezos-signer-backends" { test } "tezos-signer-backends" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/lib_delegate/tezos-baking-alpha-commands.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -20,5 +20,5 @@ depends: [
"tezos-signer-backends" { test } "tezos-signer-backends" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

6
src/proto_alpha/lib_delegate/tezos-baking-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -22,8 +22,8 @@ depends: [
"alcotest-lwt" { test } "alcotest-lwt" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

4
src/proto_alpha/lib_delegate/tezos-endorser-alpha-commands.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-environment" "tezos-protocol-environment"
"tezos-protocol-alpha" "tezos-protocol-alpha"
@ -20,5 +20,5 @@ depends: [
"tezos-signer-backends" { test } "tezos-signer-backends" { test }
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]

6
src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-compiler" "tezos-protocol-compiler"
"tezos-protocol-updater" "tezos-protocol-updater"
@ -17,8 +17,8 @@ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "jbuild" "src/jbuild" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "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" ] [ "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: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/proto_alpha/lib_protocol/tezos-protocol-alpha.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-protocol-compiler" "tezos-protocol-compiler"
"alcotest-lwt" { test } "alcotest-lwt" { test }
@ -21,8 +21,8 @@ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "jbuild" "src/jbuild" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"alpha\"/" "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: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/proto_demo/lib_protocol/tezos-embedded-protocol-demo.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & >= "1.0+beta20" } "dune" { build & >= "1.0.1" }
"tezos-protocol-compiler" "tezos-protocol-compiler"
"tezos-protocol-updater" "tezos-protocol-updater"
] ]
@ -16,8 +16,8 @@ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "jbuild" "src/jbuild" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "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" ] [ "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: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/proto_demo/lib_protocol/tezos-protocol-demo.opam
View File

@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & >= "1.0+beta20" } "dune" { build & >= "1.0.1" }
"tezos-protocol-compiler" "tezos-protocol-compiler"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "jbuild" "src/jbuild" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"demo\"/" "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: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/proto_genesis/lib_client/tezos-client-genesis.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-base" "tezos-base"
"tezos-shell-services" "tezos-shell-services"
"tezos-client-base" "tezos-client-base"
@ -18,8 +18,8 @@ depends: [
"tezos-protocol-alpha" "tezos-protocol-alpha"
] ]
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/proto_genesis/lib_protocol/tezos-embedded-protocol-genesis.opam
View File

@ -8,7 +8,7 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-protocol-compiler" "tezos-protocol-compiler"
"tezos-protocol-updater" "tezos-protocol-updater"
] ]
@ -16,8 +16,8 @@ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "jbuild" "src/jbuild" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_embedded_protocol_template" "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" ] [ "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: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

6
src/proto_genesis/lib_protocol/tezos-protocol-genesis.opam
View File

@ -8,15 +8,15 @@ dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "unreleased" license: "unreleased"
depends: [ depends: [
"ocamlfind" { build } "ocamlfind" { build }
"jbuilder" { build & = "1.0+beta20" } "dune" { build & = "1.0.1" }
"tezos-protocol-compiler" "tezos-protocol-compiler"
] ]
build: [ build: [
[ "rm" "jbuild" "src/jbuild" ] [ "rm" "jbuild" "src/jbuild" ]
[ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ] [ "cp" "%{tezos-protocol-compiler:share}%/jbuild_protocol_template" "jbuild" ]
[ "sed" "-i" "s/let predefined_version = None/let predefined_version = Some \"genesis\"/" "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: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]

8
vendors/irmin-lmdb/irmin-lmdb.opam vendored
View File

@ -8,13 +8,13 @@ dev-repo: "https://gitlab.com/tezos/irmin-lmdb.git"
doc: "https://tezos.gitlab.io/irmin-lmdb/" doc: "https://tezos.gitlab.io/irmin-lmdb/"
build: [ build: [
["jbuilder" "subst"] {pinned} ["dune" "subst"] {pinned}
["jbuilder" "build" "-p" name "-j" jobs] ["dune" "build" "-p" name "-j" jobs]
] ]
build-test: ["jbuilder" "runtest" "-p" name] build-test: ["dune" "runtest" "-p" name]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta10"} "dune" {build & >= "1.0.1"}
"irmin" {>= "1.4.0"} "irmin" {>= "1.4.0"}
"lmdb" {>= "0.1"} "lmdb" {>= "0.1"}
] ]

4
vendors/ocaml-bip39/bip39.opam vendored
View File

@ -10,9 +10,9 @@ dev-repo: "https://github.com/vbmithr/ocaml-bip39.git"
bug-reports: "https://github.com/vbmithr/ocaml-bip39/issues" bug-reports: "https://github.com/vbmithr/ocaml-bip39/issues"
tags: [] tags: []
available: [ ocaml-version >= "4.03.0" ] available: [ ocaml-version >= "4.03.0" ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
depends: [ depends: [
"jbuilder" {build & = "1.0+beta20"} "dune" {build & = "1.0.1"}
"base" {build & >= "v0.10.0"} "base" {build & >= "v0.10.0"}
"stdio" {build & >= "v0.10.0"} "stdio" {build & >= "v0.10.0"}
"nocrypto" {>= "0.5.4"} "nocrypto" {>= "0.5.4"}

6
vendors/ocaml-blake2/blake2.opam vendored
View File

@ -12,10 +12,10 @@ available: [
ocaml-version >= "4.02.0" ocaml-version >= "4.02.0"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta16"} "dune" {build & >= "1.0.1"}
"bigstring" {>= "0.1.1"} "bigstring" {>= "0.1.1"}
"alcotest" { test } "alcotest" { test }
"hex" {test & >= "1.2.0"} "hex" {test & >= "1.2.0"}

6
vendors/ocaml-hacl/hacl.opam vendored
View File

@ -8,7 +8,7 @@ bug-reports: "https://gitlab.com/tezos/tezos/issues"
dev-repo: "https://gitlab.com/tezos/tezos.git" dev-repo: "https://gitlab.com/tezos/tezos.git"
license: "MIT" license: "MIT"
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta16"} "dune" {build & >= "1.0.1"}
"bigstring" {>= "0.1.1"} "bigstring" {>= "0.1.1"}
"ocplib-endian" {>= "1.0"} "ocplib-endian" {>= "1.0"}
"zarith" {>= "1.7"} "zarith" {>= "1.7"}
@ -17,6 +17,6 @@ depends: [
"base" "base"
"stdio" "stdio"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
available: [ ocaml-version >= "4.02.0" ] available: [ ocaml-version >= "4.02.0" ]

6
vendors/ocaml-ledger-wallet/ledgerwallet-tezos.opam vendored
View File

@ -12,9 +12,9 @@ available: [
ocaml-version >= "4.02.0" ocaml-version >= "4.02.0"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta16"} "dune" {build & >= "1.0.1"}
"ledgerwallet" {= "dev"} "ledgerwallet" {= "dev"}
] ]

6
vendors/ocaml-ledger-wallet/ledgerwallet.opam vendored
View File

@ -12,10 +12,10 @@ available: [
ocaml-version >= "4.02.0" ocaml-version >= "4.02.0"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta16"} "dune" {build & >= "1.0.1"}
"rresult" {>= "0.5.0"} "rresult" {>= "0.5.0"}
"cstruct" {>= "3.2.1"} "cstruct" {>= "3.2.1"}
"hidapi" {>= "1.0"} "hidapi" {>= "1.0"}

4
vendors/ocaml-lmdb/lmdb.opam vendored
View File

@ -12,9 +12,9 @@ available: [
ocaml-version >= "4.02.0" ocaml-version >= "4.02.0"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta18"} "dune" {build & >= "1.0.1"}
"rresult" {>= "0.5.0"} "rresult" {>= "0.5.0"}
"cstruct" {test & >= "3.2.1"} "cstruct" {test & >= "3.2.1"}
"alcotest" {test & >= "0.8.1"} "alcotest" {test & >= "0.8.1"}

2
vendors/ocaml-pbkdf/CHANGES.md vendored
View File

@ -1,6 +1,6 @@
# 0.3.0 (2018-02-16) # 0.3.0 (2018-02-16)
* Build: switch to jbuilder * Build: switch to dune
# 0.2.0 (2016-10-31) # 0.2.0 (2016-10-31)

6
vendors/ocaml-pbkdf/pbkdf.opam vendored
View File

@ -8,10 +8,10 @@ authors: ["Alfredo Beaumont <alfredo.beaumont@gmail.com>" "Sonia Meruelo <s
maintainer: ["Alfredo Beaumont <alfredo.beaumont@gmail.com>"] maintainer: ["Alfredo Beaumont <alfredo.beaumont@gmail.com>"]
license: "BSD2" license: "BSD2"
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & = "1.0+beta20"} "dune" {build & = "1.0.1"}
"nocrypto" {>= "0.5.4"} "nocrypto" {>= "0.5.4"}
"alcotest" {test & >= "0.8.1"} "alcotest" {test & >= "0.8.1"}
] ]

4
vendors/ocaml-secp256k1/secp256k1.opam vendored
View File

@ -11,10 +11,10 @@ available: [
ocaml-version >= "4.03.0" ocaml-version >= "4.03.0"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
depends: [ depends: [
"conf-gmp" {build} "conf-gmp" {build}
"jbuilder" {build & >= "1.0+beta20"} "dune" {build & >= "1.0.1"}
"cstruct" {>= "3.2.1"} "cstruct" {>= "3.2.1"}
"bigstring" {>= "0.1.1"} "bigstring" {>= "0.1.1"}
] ]

6
vendors/ocaml-uecc/uecc.opam vendored
View File

@ -12,10 +12,10 @@ available: [
ocaml-version >= "4.02.0" ocaml-version >= "4.02.0"
] ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta19.1"} "dune" {build & >= "1.0.1"}
"bigstring" {>= "0.1.1"} "bigstring" {>= "0.1.1"}
"alcotest" {test & >= "0.8.1"} "alcotest" {test & >= "0.8.1"}
"cstruct" {test & >= "3.2.1"} "cstruct" {test & >= "3.2.1"}

6
vendors/ocplib-json-typed/Makefile vendored
View File

@ -1,11 +1,11 @@
all: all:
jbuilder build @install @runtest --dev dune build @install @runtest --dev
install: install:
jbuilder install dune install
uninstall: uninstall:
jbuilder uninstall dune uninstall
clean: clean:
rm -rf _build *~ */*~ rm -rf _build *~ */*~

6
vendors/ocplib-json-typed/lib_json_typed/ocplib-json-typed.opam vendored
View File

@ -9,9 +9,9 @@ license: "LGPLv3 w/ linking exception"
dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git"
available: [ ocaml-version >= "4.02.0" ] available: [ ocaml-version >= "4.02.0" ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta20"} "dune" {build & >= "1.0.1"}
"uri" {>= "1.9.0" } "uri" {>= "1.9.0" }
] ]

6
vendors/ocplib-json-typed/lib_json_typed_browser/ocplib-json-typed-browser.opam vendored
View File

@ -9,10 +9,10 @@ license: "LGPLv3 w/ linking exception"
dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git"
available: [ ocaml-version >= "4.02.0" ] available: [ ocaml-version >= "4.02.0" ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta20"} "dune" {build & >= "1.0.1"}
"ocplib-json-typed" {= "0.6" } "ocplib-json-typed" {= "0.6" }
"js_of_ocaml" {>= "3.1.0"} "js_of_ocaml" {>= "3.1.0"}
] ]

6
vendors/ocplib-json-typed/lib_json_typed_bson/ocplib-json-typed-bson.opam vendored
View File

@ -9,10 +9,10 @@ license: "LGPLv3 w/ linking exception"
dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git" dev-repo: "https://github.com/ocamlpro/ocplib-json-typed.git"
available: [ ocaml-version >= "4.02.0" ] available: [ ocaml-version >= "4.02.0" ]
build: [ "jbuilder" "build" "-j" jobs "-p" name "@install" ] build: [ "dune" "build" "-j" jobs "-p" name "@install" ]
build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs ] build-test: [ "dune" "runtest" "-p" name "-j" jobs ]
depends: [ depends: [
"jbuilder" {build & >= "1.0+beta20"} "dune" {build & >= "1.0.1"}
"ocplib-json-typed" {= "0.6" } "ocplib-json-typed" {= "0.6" }
"ocplib-endian" {>= "1.0"} "ocplib-endian" {>= "1.0"}
] ]

8
vendors/ocplib-resto/Makefile vendored
View File

@ -1,13 +1,13 @@
all: all:
jbuilder build --dev dune build --dev
.PHONY: test .PHONY: test
test: test:
jbuilder runtest --dev dune runtest --dev
doc-html: doc-html:
jbuilder build @doc --dev dune build @doc --dev
clean: clean:
jbuilder clean dune clean

6
vendors/ocplib-resto/lib_ezresto-directory/ocplib-ezresto-directory.opam vendored
View File

@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
depends: [ depends: [
"ocamlfind" {build} "ocamlfind" {build}
"jbuilder" {build} "dune" {build}
"ocplib-ezresto" {= "dev" } "ocplib-ezresto" {= "dev" }
"ocplib-resto-directory" {= "dev" } "ocplib-resto-directory" {= "dev" }
] ]

6
vendors/ocplib-resto/lib_ezresto/ocplib-ezresto.opam vendored
View File

@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
depends: [ depends: [
"ocamlfind" {build} "ocamlfind" {build}
"jbuilder" {build} "dune" {build}
"ocplib-resto" {= "dev" } "ocplib-resto" {= "dev" }
"ocplib-resto-json" {= "dev" } "ocplib-resto-json" {= "dev" }
] ]

6
vendors/ocplib-resto/lib_resto-cohttp/ocplib-resto-cohttp.opam vendored
View File

@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
depends: [ depends: [
"ocamlfind" {build} "ocamlfind" {build}
"jbuilder" {build} "dune" {build}
"ocplib-resto-directory" {= "dev" } "ocplib-resto-directory" {= "dev" }
"cohttp-lwt-unix" { >= "1.0.0" } "cohttp-lwt-unix" { >= "1.0.0" }
] ]

6
vendors/ocplib-resto/lib_resto-directory/ocplib-resto-directory.opam vendored
View File

@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
depends: [ depends: [
"ocamlfind" {build} "ocamlfind" {build}
"jbuilder" {build} "dune" {build}
"ocplib-resto" {= "dev" } "ocplib-resto" {= "dev" }
"ocplib-resto-json" {= "dev" & test } "ocplib-resto-json" {= "dev" & test }
"lwt" { >= "3.0.0" } "lwt" { >= "3.0.0" }

6
vendors/ocplib-resto/lib_resto-json/ocplib-resto-json.opam vendored
View File

@ -8,15 +8,15 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
depends: [ depends: [
"ocamlfind" {build} "ocamlfind" {build}
"jbuilder" {build} "dune" {build}
"ocplib-resto" {= "dev" } "ocplib-resto" {= "dev" }
"ocplib-json-typed-bson" { >= "0.6" } "ocplib-json-typed-bson" { >= "0.6" }
] ]

6
vendors/ocplib-resto/lib_resto/ocplib-resto.opam vendored
View File

@ -8,14 +8,14 @@ bug-reports: "https://github.com/OCamlPro/ocplib-resto/issues"
dev-repo: "git+https://github.com/OCamlPro/ocplib-resto" dev-repo: "git+https://github.com/OCamlPro/ocplib-resto"
build: [ build: [
[ "jbuilder" "build" "-p" name "-j" jobs ] [ "dune" "build" "-p" name "-j" jobs ]
] ]
build-test: [ build-test: [
[ "jbuilder" "runtest" "-p" name "-j" jobs ] [ "dune" "runtest" "-p" name "-j" jobs ]
] ]
depends: [ depends: [
"ocamlfind" {build} "ocamlfind" {build}
"jbuilder" {build} "dune" {build}
"uri" "uri"
] ]