From 7847c154d87003c606a1c1646c78ed3916debdfd Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Thu, 17 Aug 2017 09:18:18 -0700 Subject: [PATCH] [merlin] use `S **` instead of listing each directory Summary: This works just as well and is easier to maintain. Reviewed By: jberdine Differential Revision: D5649421 fbshipit-source-id: 8dd4da6 --- infer/src/.merlin | 20 +------------------- infer/src/README.md | 6 ------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/infer/src/.merlin b/infer/src/.merlin index d130101bc..312fb1c01 100644 --- a/infer/src/.merlin +++ b/infer/src/.merlin @@ -17,22 +17,4 @@ PKG zip FLG -principal -safe-string -short-paths -strict-formats -strict-sequence FLG -w +a-4-9-40-41-42-44-45-48-60 FLG -open InferBaseStdlib -open InferGenerated -open InferModules -S backend -S base -S bufferoverrun -S checkers -S clang -S clang_plugin -S clang_stubs -S eradicate -S facebook -S harness -S integration -S IR -S java -S java_stubs -S labs -S opensource -S quandary -S scripts -S unit +S ** diff --git a/infer/src/README.md b/infer/src/README.md index 4c15e27ff..cd8296959 100644 --- a/infer/src/README.md +++ b/infer/src/README.md @@ -1,8 +1,2 @@ The OCaml source files for infer live here. The Makefile is responsible for building them, together with jbuild.in. - -If you make changes to the build process, also update .merlin -accordingly. For instance, if you want to add a new source directory -you will need to: -- add it to jbuild.in -- add it to .merlin