From 3bc350331deb1ec26e9db2e0b555bec32e7d0712 Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Thu, 7 May 2020 08:49:37 -0700 Subject: [PATCH] backend/dune Summary: Needed to move some "Differential" files out of the way. This makes sense I think: backend/ is only about orchestrating the various checkers. Reviewed By: ngorogiannis Differential Revision: D21431968 fbshipit-source-id: 14fad8b88 --- infer/src/backend/dune | 18 ++++++++++++++++++ infer/src/deadcode/Makefile | 4 ++-- infer/src/dune.in | 8 +++++--- .../{backend => integration}/Differential.ml | 0 .../{backend => integration}/Differential.mli | 0 .../DifferentialFilters.ml | 0 .../DifferentialFilters.mli | 0 7 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 infer/src/backend/dune rename infer/src/{backend => integration}/Differential.ml (100%) rename infer/src/{backend => integration}/Differential.mli (100%) rename infer/src/{backend => integration}/DifferentialFilters.ml (100%) rename infer/src/{backend => integration}/DifferentialFilters.mli (100%) diff --git a/infer/src/backend/dune b/infer/src/backend/dune new file mode 100644 index 000000000..b1bc07bfd --- /dev/null +++ b/infer/src/backend/dune @@ -0,0 +1,18 @@ +; Copyright (c) Facebook, Inc. and its affiliates. +; +; This source code is licensed under the MIT license found in the +; LICENSE file in the root directory of this source tree. + +(library + (name backend) + (public_name infer.backend) + (flags + (:standard + -open Core -open InferStdlib -open IStd -open OpenSource -open InferGenerated + -open InferBase -open InferIR -open Absint -open Biabduction -open Bo -open Nullsafe + -open Pulselib -open Checkers -open Costlib -open Quandary -open TOPL + -open Concurrency -open Labs)) + (libraries core InferStdlib InferGenerated InferBase InferIR absint biabduction nullsafe bo + checkers costlib quandary TOPL concurrency labs) + (preprocess (pps ppx_compare ppx_fields_conv)) +) diff --git a/infer/src/deadcode/Makefile b/infer/src/deadcode/Makefile index 2bafef399..dd3d79aa5 100644 --- a/infer/src/deadcode/Makefile +++ b/infer/src/deadcode/Makefile @@ -50,8 +50,8 @@ endif # Note that we run find under _build directory. Since we copy some # sources from subfolders to src/ folder to avoid duplicates we use # $(DEPTH_ONE) and iteration over main and library folders. -LIBRARY_FOLDERS = . ./IR ./absint ./atd ./base ./biabduction ./bufferoverrun ./c_stubs ./checkers ./concurrency ./cost ./istd ./labs ./nullsafe ./pulse ./quandary ./scripts ./topl -INCLUDE_FOLDERS = -I absint -I IR -I atd -I base -I biabduction -I bufferoverrun -I c_stubs -I checkers -I concurrency -I cost -I istd -I labs -I nullsafe -I pulse -I quandary -I scripts -I topl +LIBRARY_FOLDERS = . ./IR ./absint ./atd ./backend ./base ./biabduction ./bufferoverrun ./c_stubs ./checkers ./concurrency ./cost ./istd ./labs ./nullsafe ./pulse ./quandary ./scripts ./topl +INCLUDE_FOLDERS = -I absint -I IR -I atd -I backend -I base -I biabduction -I bufferoverrun -I c_stubs -I checkers -I concurrency -I cost -I istd -I labs -I nullsafe -I pulse -I quandary -I scripts -I topl ml_src_files:=$(shell \ cd $(INFER_BUILD_DIR); \ diff --git a/infer/src/dune.in b/infer/src/dune.in index 005cdccca..2f9abfcb9 100644 --- a/infer/src/dune.in +++ b/infer/src/dune.in @@ -12,7 +12,6 @@ let ( ^/ ) = Filename.concat let source_dirs = (if clang then ["al"; "clang"; "unit" ^/ "clang"] else ["clang_stubs"; "unit" ^/ "clang_stubs"]) @ [ (if java then "java" else "java_stubs") - ; "backend" ; "integration" ; "test_determinator" ; "unit" @@ -80,7 +79,9 @@ let infer_cflags = ; "-open" ; "InferBase" ; "-open" - ; "InferCStubs" ] + ; "InferCStubs" + ; "-open" + ; "Backend" ] |> String.concat " " @@ -111,7 +112,8 @@ let main_lib_stanza = ; "quandary" ; "TOPL" ; "concurrency" - ; "labs" ] )) + ; "labs" + ; "backend" ] )) (String.concat " " infer_binaries) diff --git a/infer/src/backend/Differential.ml b/infer/src/integration/Differential.ml similarity index 100% rename from infer/src/backend/Differential.ml rename to infer/src/integration/Differential.ml diff --git a/infer/src/backend/Differential.mli b/infer/src/integration/Differential.mli similarity index 100% rename from infer/src/backend/Differential.mli rename to infer/src/integration/Differential.mli diff --git a/infer/src/backend/DifferentialFilters.ml b/infer/src/integration/DifferentialFilters.ml similarity index 100% rename from infer/src/backend/DifferentialFilters.ml rename to infer/src/integration/DifferentialFilters.ml diff --git a/infer/src/backend/DifferentialFilters.mli b/infer/src/integration/DifferentialFilters.mli similarity index 100% rename from infer/src/backend/DifferentialFilters.mli rename to infer/src/integration/DifferentialFilters.mli