Dune: upgrade all projects to lang version 2.0

- replace all `alias` stanzas with corresponding `rule` stanzas; - add no-op action fields (i.e. `(action (progn))`) to rules that previously had none; - comply with stricter requirements for `(select ...)` libraries used for conditional protocol linking by generating an empty file for each protocol. See ocaml/dune#2867 for details of the new requirements on filenames; - disabling formatting of Dune files in `dune-project` files (enabled by default in lang 2.0+); - bump all `opam` dependencies on Dune to `{ >= "2.0" }`. Signed-off-by: Craig Ferguson <craig@tarides.com>
taurusgroup · Oct 14, 2020 · 07baef5 · 07baef5
1 parent e52f504
commit 07baef5
Show file tree

Hide file tree

Showing 349 changed files with 1,130 additions and 920 deletions.
diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune
@@ -13,12 +13,13 @@
                    -open Tezos_protocol_updater
                    -linkall)))
 
-(alias
- (name buildtest)
+(rule
+ (alias buildtest)
  (deps rpc_doc.exe
-       p2p_doc.exe))
+       p2p_doc.exe)
+ (action (progn)))
 
-(alias
- (name runtest_lint)
+(rule
+ (alias runtest_lint)
  (deps (glob_files *.ml{,i}))
  (action (run %{lib:tezos-tooling:lint.sh} %{deps})))
diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune
@@ -10,7 +10,7 @@
                    -safe-string
                    -linkall)))
 
-(alias
- (name runtest_lint)
+(rule
+ (alias runtest_lint)
  (deps (glob_files *.ml{,i}))
  (action (run %{lib:tezos-tooling:lint.sh} %{deps})))
diff --git a/dune-project b/dune-project
@@ -1,4 +1,5 @@
-(lang dune 1.11)
+(lang dune 2.0)
+(formatting (enabled_for ocaml))
 
 ; dune-project files are automatically generated by dune but they are kept
 ; checked in the repository to allow building with Dune 2 seamlessly.

diff --git a/src/bin_client/dune b/src/bin_client/dune
@@ -15,53 +15,53 @@
             tezos-mockup-commands
 
             (select void_for_linking-genesis from
-              (tezos-client-genesis -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-genesis -> void_for_linking-genesis.empty)
+              (-> void_for_linking-genesis.empty))
             (select void_for_linking-genesis-carthagenet from
-              (tezos-client-genesis-carthagenet -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-genesis-carthagenet -> void_for_linking-genesis-carthagenet.empty)
+              (-> void_for_linking-genesis-carthagenet.empty))
 
             (select void_for_linking-000-Ps9mPmXa from
-              (tezos-client-000-Ps9mPmXa -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty)
+              (-> void_for_linking-000-Ps9mPmXa.empty))
             (select void_for_linking-001-PtCJ7pwo from
-              (tezos-client-001-PtCJ7pwo-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-001-PtCJ7pwo-commands.registration -> void_for_linking-001-PtCJ7pwo.empty)
+              (-> void_for_linking-001-PtCJ7pwo.empty))
             (select void_for_linking-002-PsYLVpVv from
-              (tezos-client-002-PsYLVpVv-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-002-PsYLVpVv-commands.registration -> void_for_linking-002-PsYLVpVv.empty)
+              (-> void_for_linking-002-PsYLVpVv.empty))
             (select void_for_linking-003-PsddFKi3 from
-              (tezos-client-003-PsddFKi3-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-003-PsddFKi3-commands.registration -> void_for_linking-003-PsddFKi3.empty)
+              (-> void_for_linking-003-PsddFKi3.empty))
             (select void_for_linking-004-Pt24m4xi from
-              (tezos-client-004-Pt24m4xi-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-004-Pt24m4xi-commands.registration -> void_for_linking-004-Pt24m4xi.empty)
+              (-> void_for_linking-004-Pt24m4xi.empty))
             (select void_for_linking-005-PsBabyM1 from
-              (tezos-client-005-PsBabyM1-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-005-PsBabyM1-commands.registration -> void_for_linking-005-PsBabyM1.empty)
+              (-> void_for_linking-005-PsBabyM1.empty))
             (select void_for_linking-006-PsCARTHA from
-              (tezos-client-006-PsCARTHA-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-006-PsCARTHA-commands.registration -> void_for_linking-006-PsCARTHA.empty)
+              (-> void_for_linking-006-PsCARTHA.empty))
             (select void_for_linking-007-PsDELPH1 from
-              (tezos-client-007-PsDELPH1-commands-registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-007-PsDELPH1-commands-registration -> void_for_linking-007-PsDELPH1.empty)
+              (-> void_for_linking-007-PsDELPH1.empty))
 
             (select void_for_linking-alpha from
-              (tezos-client-alpha-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-alpha-commands.registration -> void_for_linking-alpha.empty)
+              (-> void_for_linking-alpha.empty))
             (select void_for_linking-demo-counter from
-              (tezos-client-demo-counter -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-demo-counter -> void_for_linking-demo-counter.empty)
+              (-> void_for_linking-demo-counter.empty))
 
             (select void_for_linking-baking-alpha from
-              (tezos-baking-alpha-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-baking-alpha-commands.registration -> void_for_linking-baking-alpha.empty)
+              (-> void_for_linking-baking-alpha.empty))
             (select void_for_linking-baking-006-PsCARTHA from
-              (tezos-baking-006-PsCARTHA-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-baking-006-PsCARTHA-commands.registration -> void_for_linking-baking-006-PsCARTHA.empty)
+              (-> void_for_linking-baking-006-PsCARTHA.empty))
             (select void_for_linking-baking-007-PsDELPH1 from
-              (tezos-baking-007-PsDELPH1-commands.registration -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-baking-007-PsDELPH1-commands.registration -> void_for_linking-baking-007-PsDELPH1.empty)
+              (-> void_for_linking-baking-007-PsDELPH1.empty))
 
             tezos-stdlib-unix
             tezos-client-base-unix
@@ -77,15 +77,31 @@
                     -linkall)))
 
 (rule
-  (target void_for_linking)
-  (action (write-file ${target} "")))
+ (action
+  (progn
+   (write-file void_for_linking-genesis.empty "")
+   (write-file void_for_linking-genesis.empty "")
+   (write-file void_for_linking-genesis-carthagenet.empty "")
+   (write-file void_for_linking-000-Ps9mPmXa.empty "")
+   (write-file void_for_linking-001-PtCJ7pwo.empty "")
+   (write-file void_for_linking-002-PsYLVpVv.empty "")
+   (write-file void_for_linking-003-PsddFKi3.empty "")
+   (write-file void_for_linking-004-Pt24m4xi.empty "")
+   (write-file void_for_linking-005-PsBabyM1.empty "")
+   (write-file void_for_linking-006-PsCARTHA.empty "")
+   (write-file void_for_linking-007-PsDELPH1.empty "")
+   (write-file void_for_linking-alpha.empty "")
+   (write-file void_for_linking-demo-counter.empty "")
+   (write-file void_for_linking-baking-alpha.empty "")
+   (write-file void_for_linking-baking-006-PsCARTHA.empty "")
+   (write-file void_for_linking-baking-007-PsDELPH1.empty ""))))
 
 (install
  (package tezos-client)
  (section bin)
  (files (tezos-init-sandboxed-client.sh as tezos-init-sandboxed-client.sh)))
 
-(alias
- (name runtest_lint)
+(rule
+ (alias runtest_lint)
  (deps (glob_files *.ml{,i}))
  (action (run %{lib:tezos-tooling:lint.sh} %{deps})))
diff --git a/src/bin_client/dune-project b/src/bin_client/dune-project
@@ -1,2 +1,3 @@
-(lang dune 1.11)
+(lang dune 2.0)
+(formatting (enabled_for ocaml))
 (name tezos-client)
diff --git a/src/bin_client/tezos-client.opam b/src/bin_client/tezos-client.opam
@@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "tezos-tooling" { with-test }
-  "dune" { >= "1.11" }
+  "dune" { >= "2.0" }
   "tezos-base"
   "tezos-client-base"
 

diff --git a/src/bin_codec/dune b/src/bin_codec/dune
@@ -11,17 +11,17 @@
             tezos-clic
             tezos-signer-services
             (select void_for_linking-alpha from
-              (tezos-client-alpha -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-alpha -> void_for_linking-alpha.empty)
+              (-> void_for_linking-alpha.empty))
             (select void_for_linking-005-PsBabyM1 from
-              (tezos-client-005-PsBabyM1 -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty)
+              (-> void_for_linking-005-PsBabyM1.empty))
             (select void_for_linking-006-PsCARTHA from
-              (tezos-client-006-PsCARTHA -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty)
+              (-> void_for_linking-006-PsCARTHA.empty))
             (select void_for_linking-007-PsDELPH1 from
-              (tezos-client-007-PsDELPH1 -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-client-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty)
+              (-> void_for_linking-007-PsDELPH1.empty))
  )
  (flags (:standard -open Data_encoding
                    -open Tezos_base__TzPervasives
@@ -33,10 +33,14 @@
                    -linkall)))
 
 (rule
-  (target void_for_linking)
-  (action (write-file ${target} "")))
+ (action
+  (progn
+   (write-file void_for_linking-alpha.empty "")
+   (write-file void_for_linking-005-PsBabyM1.empty "")
+   (write-file void_for_linking-006-PsCARTHA.empty "")
+   (write-file void_for_linking-007-PsDELPH1.empty ""))))
 
-(alias
- (name runtest_lint)
+(rule
+ (alias runtest_lint)
  (deps (glob_files *.ml{,i}))
  (action (run %{lib:tezos-tooling:lint.sh} %{deps})))
diff --git a/src/bin_codec/dune-project b/src/bin_codec/dune-project
@@ -1,2 +1,3 @@
-(lang dune 1.11)
+(lang dune 2.0)
+(formatting (enabled_for ocaml))
 (name tezos-codec)
diff --git a/src/bin_codec/tezos-codec.opam b/src/bin_codec/tezos-codec.opam
@@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "tezos-tooling" { with-test }
-  "dune" { >= "1.11" }
+  "dune" { >= "2.0" }
   "data-encoding" { = "0.2" }
   "tezos-base"
   "tezos-stdlib-unix"

diff --git a/src/bin_node/dune b/src/bin_node/dune
@@ -23,54 +23,54 @@
             tezos-validator
             tezos-shell-context
             tezos-protocol-updater
-            (select void_for_linking-genesis from
-              (tezos-embedded-protocol-genesis -> void_for_linking)
-              (-> void_for_linking))
-            (select void_for_linking-genesis-carthagenet from
-              (tezos-embedded-protocol-genesis-carthagenet -> void_for_linking)
-              (-> void_for_linking))
+            (select void_for_linking-embedded-protocol-genesis from
+              (tezos-embedded-protocol-genesis -> void_for_linking-embedded-protocol-genesis.empty)
+              (-> void_for_linking-embedded-protocol-genesis.empty))
+            (select void_for_linking-embedded-protocol-genesis-carthagenet from
+              (tezos-embedded-protocol-genesis-carthagenet -> void_for_linking-embedded-protocol-genesis-carthagenet.empty)
+              (-> void_for_linking-embedded-protocol-genesis-carthagenet.empty))
             (select void_for_linking-demo-noops from
-              (tezos-embedded-protocol-demo-noops -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-demo-noops -> void_for_linking-demo-noops.empty)
+              (-> void_for_linking-demo-noops.empty))
             (select void_for_linking-demo-counter from
-              (tezos-embedded-protocol-demo-counter -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-demo-counter -> void_for_linking-demo-counter.empty)
+              (-> void_for_linking-demo-counter.empty))
             (select void_for_linking-alpha from
-              (tezos-embedded-protocol-alpha -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-alpha -> void_for_linking-alpha.empty)
+              (-> void_for_linking-alpha.empty))
             (select void_for_linking-000-Ps9mPmXa from
-              (tezos-embedded-protocol-000-Ps9mPmXa -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-000-Ps9mPmXa -> void_for_linking-000-Ps9mPmXa.empty)
+              (-> void_for_linking-000-Ps9mPmXa.empty))
             (select void_for_linking-001-PtCJ7pwo from
-              (tezos-embedded-protocol-001-PtCJ7pwo -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-001-PtCJ7pwo-commands.registration -> void_for_linking-001-PtCJ7pwo.empty)
+              (-> void_for_linking-001-PtCJ7pwo.empty))
             (select void_for_linking-002-PsYLVpVv from
-              (tezos-embedded-protocol-002-PsYLVpVv -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-002-PsYLVpVv-commands.registration -> void_for_linking-002-PsYLVpVv.empty)
+              (-> void_for_linking-002-PsYLVpVv.empty))
             (select void_for_linking-003-PsddFKi3 from
-              (tezos-embedded-protocol-003-PsddFKi3 -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-003-PsddFKi3-commands.registration -> void_for_linking-003-PsddFKi3.empty)
+              (-> void_for_linking-003-PsddFKi3.empty))
             (select void_for_linking-004-Pt24m4xi from
-              (tezos-embedded-protocol-004-Pt24m4xi -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-004-Pt24m4xi-commands.registration -> void_for_linking-004-Pt24m4xi.empty)
+              (-> void_for_linking-004-Pt24m4xi.empty))
             (select void_for_linking-005-PsBABY5H from
-              (tezos-embedded-protocol-005-PsBABY5H -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-005-PsBABY5H -> void_for_linking-005-PsBABY5H.empty)
+              (-> void_for_linking-005-PsBABY5H.empty))
             (select void_for_linking-005-PsBabyM1 from
-              (tezos-embedded-protocol-005-PsBabyM1 -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-005-PsBabyM1 -> void_for_linking-005-PsBabyM1.empty)
+              (-> void_for_linking-005-PsBabyM1.empty))
             (select void_for_linking-006-PsCARTHA from
-              (tezos-embedded-protocol-006-PsCARTHA -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-006-PsCARTHA -> void_for_linking-006-PsCARTHA.empty)
+              (-> void_for_linking-006-PsCARTHA.empty))
             (select void_for_linking-007-PsDELPH1 from
-              (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-embedded-protocol-007-PsDELPH1 -> void_for_linking-007-PsDELPH1.empty)
+              (-> void_for_linking-007-PsDELPH1.empty))
             (select void_for_linking-006-PsCARTHA-mempool from
-              (tezos-mempool-006-PsCARTHA -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-mempool-006-PsCARTHA -> void_for_linking-006-PsCARTHA-mempool.empty)
+              (-> void_for_linking-006-PsCARTHA-mempool.empty))
             (select void_for_linking-007-PsDELPH1-mempool from
-              (tezos-mempool-007-PsDELPH1 -> void_for_linking)
-              (-> void_for_linking))
+              (tezos-mempool-007-PsDELPH1 -> void_for_linking-007-PsDELPH1-mempool.empty)
+              (-> void_for_linking-007-PsDELPH1-mempool.empty))
             cmdliner
             tls)
  (flags (:standard -open Tezos_base__TzPervasives
@@ -89,15 +89,31 @@
                    -linkall)))
 
 (rule
-  (target void_for_linking)
-  (action (write-file ${target} "")))
+ (action
+  (progn
+   (write-file void_for_linking-embedded-protocol-genesis.empty "")
+   (write-file void_for_linking-embedded-protocol-genesis-carthagenet.empty "")
+   (write-file void_for_linking-demo-noops.empty "")
+   (write-file void_for_linking-demo-counter.empty "")
+   (write-file void_for_linking-alpha.empty "")
+   (write-file void_for_linking-000-Ps9mPmXa.empty "")
+   (write-file void_for_linking-001-PtCJ7pwo.empty "")
+   (write-file void_for_linking-002-PsYLVpVv.empty "")
+   (write-file void_for_linking-003-PsddFKi3.empty "")
+   (write-file void_for_linking-004-Pt24m4xi.empty "")
+   (write-file void_for_linking-005-PsBABY5H.empty "")
+   (write-file void_for_linking-005-PsBabyM1.empty "")
+   (write-file void_for_linking-006-PsCARTHA.empty "")
+   (write-file void_for_linking-007-PsDELPH1.empty "")
+   (write-file void_for_linking-006-PsCARTHA-mempool.empty "")
+   (write-file void_for_linking-007-PsDELPH1-mempool.empty ""))))
 
 (install
  (package tezos-node)
  (section bin)
  (files (tezos-sandboxed-node.sh as tezos-sandboxed-node.sh)))
 
-(alias
- (name runtest_lint)
+(rule
+ (alias runtest_lint)
  (deps (glob_files *.ml{,i}))
  (action (run %{lib:tezos-tooling:lint.sh} %{deps})))
diff --git a/src/bin_node/dune-project b/src/bin_node/dune-project
@@ -1,2 +1,3 @@
-(lang dune 1.11)
+(lang dune 2.0)
+(formatting (enabled_for ocaml))
 (name tezos-node)
diff --git a/src/bin_node/tezos-node.opam b/src/bin_node/tezos-node.opam
@@ -7,7 +7,7 @@ dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 license: "MIT"
 depends: [
   "tezos-tooling" { with-test }
-  "dune" { >= "1.11" }
+  "dune" { >= "2.0" }
   "tezos-base"
   "tezos-version"
   "tezos-rpc-http-server"