From 490ce840f9a0d0ee881d66f759c1201a914cadef Mon Sep 17 00:00:00 2001 From: Milo Davis Date: Fri, 27 Oct 2017 19:33:26 +0200 Subject: [PATCH] Remove all .merlin --- src/.merlin | 2 -- src/attacker/.merlin | 4 --- src/client/.merlin | 54 ----------------------------- src/client/embedded/alpha/.merlin | 13 ------- src/client/embedded/demo/.merlin | 9 ----- src/client/embedded/genesis/.merlin | 9 ----- src/compiler/.merlin | 30 ---------------- src/environment/.merlin | 1 - src/environment/v1/.merlin | 1 - src/minutils/.merlin | 7 ---- src/node/.merlin | 50 -------------------------- src/proto/alpha/.merlin | 10 ------ src/proto/demo/.merlin | 10 ------ src/proto/genesis/.merlin | 10 ------ src/utils/.merlin | 21 ----------- test/lib/.merlin | 23 ------------ test/p2p/.merlin | 17 --------- test/proto_alpha/.merlin | 35 ------------------- test/shell/.merlin | 23 ------------ test/utils/.merlin | 13 ------- 20 files changed, 342 deletions(-) delete mode 100644 src/.merlin delete mode 100644 src/attacker/.merlin delete mode 100644 src/client/.merlin delete mode 100644 src/client/embedded/alpha/.merlin delete mode 100644 src/client/embedded/demo/.merlin delete mode 100644 src/client/embedded/genesis/.merlin delete mode 100644 src/compiler/.merlin delete mode 100644 src/environment/.merlin delete mode 100644 src/environment/v1/.merlin delete mode 100644 src/minutils/.merlin delete mode 100644 src/node/.merlin delete mode 100644 src/proto/alpha/.merlin delete mode 100644 src/proto/demo/.merlin delete mode 100644 src/proto/genesis/.merlin delete mode 100644 src/utils/.merlin delete mode 100644 test/lib/.merlin delete mode 100644 test/p2p/.merlin delete mode 100644 test/proto_alpha/.merlin delete mode 100644 test/shell/.merlin delete mode 100644 test/utils/.merlin diff --git a/src/.merlin b/src/.merlin deleted file mode 100644 index 3b27b1715..000000000 --- a/src/.merlin +++ /dev/null @@ -1,2 +0,0 @@ -FLG -w -30 -FLG -w -40 diff --git a/src/attacker/.merlin b/src/attacker/.merlin deleted file mode 100644 index 90c38cf22..000000000 --- a/src/attacker/.merlin +++ /dev/null @@ -1,4 +0,0 @@ -REC -FLG -open Error_monad -open Hash -open Utils -S ../proto -B ../proto \ No newline at end of file diff --git a/src/client/.merlin b/src/client/.merlin deleted file mode 100644 index 1cae9770d..000000000 --- a/src/client/.merlin +++ /dev/null @@ -1,54 +0,0 @@ -REC -B ../minutils -S ../minutils -B ../utils -S ../utils -B ../compiler -S ../compiler -B ../node/db -S ../node/db -B ../node/net -S ../node/net -B ../node/updater -S ../node/updater -B ../node/shell -S ../node/shell -B ../node/main -S ../node/main -S embedded -B embedded -FLG -open Error_monad -open Hash -open Utils -open Tezos_data -# minutils -PKG cstruct -PKG lwt -PKG ocplib-json-typed.bson -PKG ocplib-resto.directory -# utils -PKG zarith -PKG base64 -PKG calendar -PKG ezjsonm -PKG ipaddr.unix -PKG lwt.unix -PKG mtime.clock.os -PKG nocrypto -PKG sodium -PKG zarith -# compiler -PKG compiler-libs -PKG compiler-libs.optcomp -PKG sodium -# node -PKG calendar -PKG cmdliner -PKG cohttp.lwt -PKG dynlink -PKG git -PKG irmin-unix -PKG mtime -PKG ocplib-resto.directory -PKG ssl -PKG threads.posix -PKG leveldb -# client -PKG magic-mime diff --git a/src/client/embedded/alpha/.merlin b/src/client/embedded/alpha/.merlin deleted file mode 100644 index 5d11075e5..000000000 --- a/src/client/embedded/alpha/.merlin +++ /dev/null @@ -1,13 +0,0 @@ -REC -S . -B . -S baker -B baker -S ../../../proto -B ../../../proto -S ../../../proto/alpha -B _tzbuild -FLG -open Client_embedded_proto_alpha -FLG -open Register_client_embedded_proto_alpha -FLG -open Environment -FLG -open Tezos_context diff --git a/src/client/embedded/demo/.merlin b/src/client/embedded/demo/.merlin deleted file mode 100644 index 3a1cffa6d..000000000 --- a/src/client/embedded/demo/.merlin +++ /dev/null @@ -1,9 +0,0 @@ -REC -S . -B . -S ../../../proto -B ../../../proto -S ../../../proto/demo -B _tzbuild -FLG -open Client_embedded_proto_demo -FLG -open Register_client_embedded_proto_demo diff --git a/src/client/embedded/genesis/.merlin b/src/client/embedded/genesis/.merlin deleted file mode 100644 index 461a85efa..000000000 --- a/src/client/embedded/genesis/.merlin +++ /dev/null @@ -1,9 +0,0 @@ -REC -S . -B . -S ../../../proto -B ../../../proto -S ../../../proto/genesis -B _tzbuild -FLG -open Client_embedded_proto_genesis -FLG -open Register_client_embedded_proto_genesis diff --git a/src/compiler/.merlin b/src/compiler/.merlin deleted file mode 100644 index c3c16a60d..000000000 --- a/src/compiler/.merlin +++ /dev/null @@ -1,30 +0,0 @@ -REC -S ../environment -B ../environment -S ../packer -B ../packer -B ../minutils -S ../minutils -B ../utils -S ../utils -FLG -open Tezos_data -open Hash -# minutils -PKG cstruct -PKG lwt -PKG ocplib-json-typed.bson -PKG ocplib-resto.directory -# utils -PKG zarith -PKG base64 -PKG calendar -PKG ezjsonm -PKG ipaddr.unix -PKG lwt.unix -PKG mtime.clock.os -PKG nocrypto -PKG sodium -PKG zarith -# compiler -PKG compiler-libs -PKG compiler-libs.optcomp -PKG sodium diff --git a/src/environment/.merlin b/src/environment/.merlin deleted file mode 100644 index 2ba616962..000000000 --- a/src/environment/.merlin +++ /dev/null @@ -1 +0,0 @@ -REC diff --git a/src/environment/v1/.merlin b/src/environment/v1/.merlin deleted file mode 100644 index acc302edb..000000000 --- a/src/environment/v1/.merlin +++ /dev/null @@ -1 +0,0 @@ -FLG -open Error_monad -open Hash -open Tezos_data diff --git a/src/minutils/.merlin b/src/minutils/.merlin deleted file mode 100644 index 8bb4b89cc..000000000 --- a/src/minutils/.merlin +++ /dev/null @@ -1,7 +0,0 @@ -REC -B . -S . -PKG cstruct -PKG lwt -PKG ocplib-json-typed.bson -PKG ocplib-resto.directory diff --git a/src/node/.merlin b/src/node/.merlin deleted file mode 100644 index a7b7d11ee..000000000 --- a/src/node/.merlin +++ /dev/null @@ -1,50 +0,0 @@ -REC -B ../minutils -S ../minutils -B ../utils -S ../utils -B ../compiler -S ../compiler -B db -S db -B net -S net -B updater -S updater -B shell -S shell -B main -S main -FLG -open Error_monad -open Hash -open Utils -open Tezos_data -# minutils -PKG cstruct -PKG lwt -PKG ocplib-json-typed.bson -PKG ocplib-resto.directory -# utils -PKG zarith -PKG base64 -PKG calendar -PKG ezjsonm -PKG ipaddr.unix -PKG lwt.unix -PKG mtime.clock.os -PKG nocrypto -PKG sodium -PKG zarith -# compiler -PKG compiler-libs -PKG compiler-libs.optcomp -PKG sodium -# node -PKG calendar -PKG cmdliner -PKG cohttp.lwt -PKG dynlink -PKG git -PKG irmin-unix -PKG mtime -PKG ocplib-resto.directory -PKG ssl -PKG threads.posix -PKG leveldb diff --git a/src/proto/alpha/.merlin b/src/proto/alpha/.merlin deleted file mode 100644 index ea75890d1..000000000 --- a/src/proto/alpha/.merlin +++ /dev/null @@ -1,10 +0,0 @@ -B ../../node/updater/ -B _tzbuild -FLG -nopervasives -FLG -open Local_environment -FLG -open Environment -FLG -open Hash -FLG -open Error_monad -FLG -open Logging -FLG -open Tezos_data -FLG -w -40 diff --git a/src/proto/demo/.merlin b/src/proto/demo/.merlin deleted file mode 100644 index ea75890d1..000000000 --- a/src/proto/demo/.merlin +++ /dev/null @@ -1,10 +0,0 @@ -B ../../node/updater/ -B _tzbuild -FLG -nopervasives -FLG -open Local_environment -FLG -open Environment -FLG -open Hash -FLG -open Error_monad -FLG -open Logging -FLG -open Tezos_data -FLG -w -40 diff --git a/src/proto/genesis/.merlin b/src/proto/genesis/.merlin deleted file mode 100644 index ea75890d1..000000000 --- a/src/proto/genesis/.merlin +++ /dev/null @@ -1,10 +0,0 @@ -B ../../node/updater/ -B _tzbuild -FLG -nopervasives -FLG -open Local_environment -FLG -open Environment -FLG -open Hash -FLG -open Error_monad -FLG -open Logging -FLG -open Tezos_data -FLG -w -40 diff --git a/src/utils/.merlin b/src/utils/.merlin deleted file mode 100644 index 5638c8551..000000000 --- a/src/utils/.merlin +++ /dev/null @@ -1,21 +0,0 @@ -REC -B ../minutils -S ../minutils -B . -S . -# minutils -PKG cstruct -PKG lwt -PKG ocplib-json-typed.bson -PKG ocplib-resto.directory -# utils -PKG zarith -PKG base64 -PKG calendar -PKG ezjsonm -PKG ipaddr.unix -PKG lwt.unix -PKG mtime.clock.os -PKG nocrypto -PKG sodium -PKG zarith diff --git a/test/lib/.merlin b/test/lib/.merlin deleted file mode 100644 index 3a9326627..000000000 --- a/test/lib/.merlin +++ /dev/null @@ -1,23 +0,0 @@ -REC -S . -B . -S ../../src/minutils -B ../../src/minutils -S ../../src/utils -B ../../src/utils -S ../../src/node/net -B ../../src/node/net -S ../../src/node/db -B ../../src/node/db -S ../../src/node/updater -B ../../src/node/updater -S ../../src/node/shell -B ../../src/node/shell -S ../lib -B ../lib -FLG -open Error_monad -open Hash -open Utils -FLG -w -40 -PKG lwt -PKG sodium -PKG kaputt -PKG ipaddr diff --git a/test/p2p/.merlin b/test/p2p/.merlin deleted file mode 100644 index 13537fd39..000000000 --- a/test/p2p/.merlin +++ /dev/null @@ -1,17 +0,0 @@ -REC -S . -B . -S ../../src/minutils -B ../../src/minutils -S ../../src/utils -B ../../src/utils -S ../../src/node/net -B ../../src/node/net -S ../lib -B ../lib -FLG -open Error_monad -open Hash -open Utils -FLG -w -40 -PKG lwt -PKG sodium -PKG kaputt -PKG ipaddr diff --git a/test/proto_alpha/.merlin b/test/proto_alpha/.merlin deleted file mode 100644 index 111d42db9..000000000 --- a/test/proto_alpha/.merlin +++ /dev/null @@ -1,35 +0,0 @@ -REC -S . -B . -S ../../src/packer -B ../../src/packer -S ../../src/minutils -B ../../src/minutils -S ../../src/utils -B ../../src/utils -S ../../src/node/net -B ../../src/node/net -S ../../src/node/db -B ../../src/node/db -S ../../src/node/updater -B ../../src/node/updater -S ../../src/node/shell -B ../../src/node/shell -S ../../src/proto -B ../../src/proto -S ../../src/client -B ../../src/client -S ../../src/client/embedded -B ../../src/client/embedded -S ../../src/client/embedded/alpha -B ../../src/client/embedded/alpha -S ../../src/client/embedded/alpha/baker -B ../../src/client/embedded/alpha/baker -S ../lib -B ../lib -FLG -open Error_monad -open Hash -open Utils -open Environment -open Tezos_data -FLG -w -40 -PKG lwt -PKG sodium -PKG kaputt -PKG ipaddr diff --git a/test/shell/.merlin b/test/shell/.merlin deleted file mode 100644 index 4afb79370..000000000 --- a/test/shell/.merlin +++ /dev/null @@ -1,23 +0,0 @@ -REC -S . -B . -S ../../src/minutils -B ../../src/minutils -S ../../src/utils -B ../../src/utils -S ../../src/node/net -B ../../src/node/net -S ../../src/node/db -B ../../src/node/db -S ../../src/node/updater -B ../../src/node/updater -S ../../src/node/shell -B ../../src/node/shell -S ../lib -B ../lib -FLG -open Error_monad -open Hash -open Utils -open Tezos_data -FLG -w -40 -PKG lwt -PKG sodium -PKG kaputt -PKG ipaddr diff --git a/test/utils/.merlin b/test/utils/.merlin deleted file mode 100644 index 2236dda06..000000000 --- a/test/utils/.merlin +++ /dev/null @@ -1,13 +0,0 @@ -REC -S . -B . -S ../../src/minutils -B ../../src/minutils -S ../../src/utils -B ../../src/utils -S ../lib -B ../lib -FLG -open Error_monad -open Hash -open Utils -FLG -w -40 -PKG lwt -PKG kaputt