[ocaml] Create base/ directory for code shared across analyzer and frontends

Summary:
Move most of common dependencies out of backend/ into base/
Diff doesn't change any code and hence files in base/ may still depend on
code outside of base/. There will be followup diff cleaning those up.
There are also files that maybe should be in common/ but haven't been moved there yet.

Reviewed By: jberdine

Differential Revision: D3950695

fbshipit-source-id: 00612b1
master
Andrzej Kotulski 8 years ago committed by Facebook Github Bot
parent ea72dadab3
commit b93d6b5012

2
.gitignore vendored

@ -74,7 +74,7 @@ buck-out/
/infer/bin/infer /infer/bin/infer
/infer/lib/infer /infer/lib/infer
/infer/bin/inferTraceBugs /infer/bin/inferTraceBugs
/infer/src/backend/version.ml /infer/src/base/Version.ml
/infer/models/java/models/ /infer/models/java/models/
/infer/models/java/models.jar /infer/models/java/models.jar
/infer/lib/java/models.jar /infer/lib/java/models.jar

@ -133,7 +133,7 @@ else
EXTRA_DEPS = opensource EXTRA_DEPS = opensource
endif endif
DEPENDENCIES = IR backend checkers eradicate harness quandary $(EXTRA_DEPS) DEPENDENCIES = IR backend base checkers eradicate harness quandary $(EXTRA_DEPS)
# ocamlbuild command with options common to all build targets # ocamlbuild command with options common to all build targets
OCAMLBUILD_BASE = rebuild $(OCAMLBUILD_OPTIONS) -j $(NCPU) $(addprefix -I , $(DEPENDENCIES)) OCAMLBUILD_BASE = rebuild $(OCAMLBUILD_OPTIONS) -j $(NCPU) $(addprefix -I , $(DEPENDENCIES))
@ -333,8 +333,8 @@ ifneq ($(wildcard $(BUILD_DIR)/sanitize.sh),)
$(BUILD_DIR)/sanitize.sh $(BUILD_DIR)/sanitize.sh
endif endif
version: backend/version.ml.in Makefile version: base/Version.ml.in Makefile
TMPFILE=$$(mktemp backend/version.ml.tmp.XXXX); \ TMPFILE=$$(mktemp base/Version.ml.tmp.XXXX); \
INFER_GIT_COMMIT=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --short HEAD || printf "unknown"); \ INFER_GIT_COMMIT=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --short HEAD || printf "unknown"); \
INFER_GIT_BRANCH=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --abbrev-ref HEAD || printf "unknown"); \ INFER_GIT_BRANCH=$$(git --work-tree=$(ROOT_DIR) --git-dir=$(ROOT_DIR)/.git rev-parse --abbrev-ref HEAD || printf "unknown"); \
sed \ sed \
@ -345,7 +345,7 @@ version: backend/version.ml.in Makefile
-e "s|@INFER_GIT_COMMIT[@]|$$INFER_GIT_COMMIT|g" \ -e "s|@INFER_GIT_COMMIT[@]|$$INFER_GIT_COMMIT|g" \
-e "s|@INFER_GIT_BRANCH[@]|$$INFER_GIT_BRANCH|g" \ -e "s|@INFER_GIT_BRANCH[@]|$$INFER_GIT_BRANCH|g" \
$< > "$$TMPFILE"; \ $< > "$$TMPFILE"; \
$(INSTALL) -m 644 -C "$$TMPFILE" backend/version.ml; \ $(INSTALL) -m 644 -C "$$TMPFILE" base/Version.ml; \
rm -f "$$TMPFILE" rm -f "$$TMPFILE"
$(BUILD_DIR): $(BUILD_DIR):
@ -363,8 +363,8 @@ endif
ifeq ($(BUILD_LLVM_ANALYZERS),yes) ifeq ($(BUILD_LLVM_ANALYZERS),yes)
$(REMOVE) $(LLVM_SOURCES)/lLexer.ml $(LLVM_SOURCES)/lParser.ml $(REMOVE) $(LLVM_SOURCES)/lLexer.ml $(LLVM_SOURCES)/lParser.ml
endif endif
$(REMOVE) backend/version.ml $(REMOVE) base/Version.ml
$(REMOVE) backend/version.ml.tmp.* $(REMOVE) base/Version.ml.tmp.*
$(REMOVE) backend/jsonbug_{j,t}.ml{,i} $(REMOVE) backend/jsonbug_{j,t}.ml{,i}
$(REMOVE) checkers/stacktree_{j,t}.ml{,i} $(REMOVE) checkers/stacktree_{j,t}.ml{,i}
$(REMOVE) $(INFER_BIN) $(INFERANALYZE_BIN) $(INFERPRINT_BIN) $(STATSAGGREGATOR_BIN) $(REMOVE) $(INFER_BIN) $(INFERANALYZE_BIN) $(INFERPRINT_BIN) $(STATSAGGREGATOR_BIN)

Loading…
Cancel
Save