From bee1bbc26b09b92e76f295a8f4c74279d32530c9 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Wed, 24 May 2017 06:35:40 -0700
Subject: [PATCH] [build] clean out stale binaries

Summary:
Recently we changed the binaries we build and use but it wasn't obvious that
some of the old binaries disappeared. For instance, nothing short of `git clean
-xfd` would get rid of "infer/bin/InferPrint", which can lead to frustrating
attempts to make InferPrint not segfault.

Mitigate this in two ways:
- be more strict in the binaries we ignore in .gitignore, so InferPrint would should up in "git status"
- be less strict in the binaries we clean out with `make clean` so that
  InferPrint et al. gets deleted by `make clean`

Reviewed By: jberdine

Differential Revision: D5120573

fbshipit-source-id: 44e7954
---
 .gitignore         | 10 +++++++++-
 infer/src/Makefile |  6 ++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 24e1eb1f5..62a33e91e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,7 +89,15 @@ buck-out/
 .buckd/
 
 #other
-/infer/bin
+/infer/bin/infer
+/infer/bin/infer.byte
+/infer/bin/infer.native
+/infer/bin/infer-analyze
+/infer/bin/infer-capture
+/infer/bin/infer-compile
+/infer/bin/infer-report
+/infer/bin/infer-reportdiff
+/infer/bin/infer-run
 /infer/man
 
 /infer/src/base/Version.ml
diff --git a/infer/src/Makefile b/infer/src/Makefile
index 8bede3015..0cb648a17 100644
--- a/infer/src/Makefile
+++ b/infer/src/Makefile
@@ -411,8 +411,10 @@ clean:
 	$(REMOVE) base/Version.ml.tmp.*
 	$(REMOVE) backend/jsonbug_{j,t}.ml{,i}
 	$(REMOVE) checkers/stacktree_{j,t}.ml{,i}
-	$(REMOVE) $(INFER_BIN){,.byte,.native} $(INFER_BIN_ALIASES)
-	$(REMOVE) $(INFERUNIT_BIN) $(CHECKCOPYRIGHT_BIN)
+#	be a bit more aggressive than needed with what we remove here so that stale binaries that
+#	only existed in previous versions get removed as well
+	$(REMOVE) $(BIN_DIR)/Infer* $(BIN_DIR)/infer-* $(INFER_BIN){,.byte,.native} $(INFER_BIN_ALIASES) \
+	  $(INFERUNIT_BIN) $(CHECKCOPYRIGHT_BIN)
 	$(REMOVE) $(CLANG_ATDGEN_STUBS)
 	$(REMOVE) $(INFER_CLANG_FCP_MIRRORED_FILES)
 	$(REMOVE) $(INFER_CREATE_TRACEVIEW_LINKS_BIN)