do not pass --buck to build the Java models

Summary:
Turns this was needed only because we want infer-out to be models/infer.
Passing `--buck` together with passing `-d models` to `javac` was achieving the
same thing in a more roundabout way.

Reviewed By: jeremydubreil

Differential Revision: D4423185

fbshipit-source-id: 7cafe3b
master
Jules Villard 8 years ago committed by Facebook Github Bot
parent 61744daee9
commit 6050ff2b99

@ -15,7 +15,8 @@ JACKSON_JAR = $(DEPENDENCIES_DIR)/java/jackson/jackson-2.2.3.jar
JSR_305_JAR = $(DEPENDENCIES_DIR)/java/jsr-305/jsr305.jar JSR_305_JAR = $(DEPENDENCIES_DIR)/java/jsr-305/jsr305.jar
MODELS_OUT = models MODELS_OUT = models
INFER_REPORT = $(MODELS_OUT)/infer/report.json INFER_RESULTS_DIR = $(MODELS_OUT)/infer
INFER_REPORT = $(INFER_RESULTS_DIR)/report.json
MODELS_JAR = models.jar MODELS_JAR = models.jar
JAVA_BUILTINS_SOURCES = $(shell find builtins -name "*.java") JAVA_BUILTINS_SOURCES = $(shell find builtins -name "*.java")
@ -37,7 +38,9 @@ $(INFER_REPORT): $(ANDROID_JAR) $(GUAVA_JAR) $(JACKSON_JAR) $(JSR_305_JAR) $(INF
mkdir -p $(MODELS_OUT) mkdir -p $(MODELS_OUT)
@rm -f $(JAVA_MODELS_JAR) @rm -f $(JAVA_MODELS_JAR)
$(call silent_on_success,\ $(call silent_on_success,\
$(INFER_BIN) --jobs 1 --buck --models-mode -- javac -bootclasspath $(ANDROID_JAR) -d $(MODELS_OUT) -classpath $(MODELS_CLASSPATH) $(JAVA_SOURCES)) $(INFER_BIN) --jobs 1 --results-dir $(INFER_RESULTS_DIR) --models-mode -- \
javac -bootclasspath $(ANDROID_JAR) -d $(MODELS_OUT) -classpath $(MODELS_CLASSPATH) \
$(JAVA_SOURCES))
$(MODELS_JAR): $(INFER_REPORT) $(MODELS_JAR): $(INFER_REPORT)
cd $(MODELS_OUT); jar cf ../$(MODELS_JAR) * cd $(MODELS_OUT); jar cf ../$(MODELS_JAR) *

Loading…
Cancel
Save