Remove redundant DEPLOYED_MODELS_JAR in favor of JAVA_MODELS_JAR

Summary:
models/java/Makefile defines DEPLOYED_MODELS_JAR but Makefile.config
already defines JAVA_MODELS_JAR

Reviewed By: jeremydubreil

Differential Revision: D4375783

fbshipit-source-id: 178d863
master
Josh Berdine 8 years ago committed by Facebook Github Bot
parent 20aebccb1f
commit 0095e9c635

@ -15,7 +15,6 @@ INFER_ANNOTATIONS_JAR = $(ANNOTATIONS_DIR)/annotations.jar
MODELS_OUT = models
INFER_REPORT = $(MODELS_OUT)/infer/report.json
MODELS_JAR = models.jar
DEPLOYED_MODELS_JAR = $(LIB_DIR)/java/models.jar
JAVA_BUILTINS_SOURCES = $(shell find builtins -name "*.java")
JAVA_MODELS_SOURCES = $(shell find src -name "*.java")
@ -27,21 +26,21 @@ all: $(MODELS_JAR)
clean:
@rm -fr $(MODELS_OUT)
@rm -f $(MODELS_JAR)
@rm -f $(DEPLOYED_MODELS_JAR)
@rm -f $(JAVA_MODELS_JAR)
$(INFER_REPORT): $(ANDROID_JAR) $(JACKSON_JAR) $(JAVA_DEPS) $(INFER_ANNOTATIONS_JAR) $(JAVA_SOURCES)
@rm -fr $(MODELS_OUT)
mkdir -p $(MODELS_OUT)
@rm -f $(DEPLOYED_MODELS_JAR)
@rm -f $(JAVA_MODELS_JAR)
$(call silent_on_success,\
$(INFER_BIN) --jobs 1 --buck --models-mode -- javac -bootclasspath $(ANDROID_JAR) -d $(MODELS_OUT) -classpath $(JACKSON_JAR):$(INFER_ANNOTATIONS_JAR) $(JAVA_SOURCES))
$(MODELS_JAR): $(INFER_REPORT)
cd $(MODELS_OUT); jar cf ../$(MODELS_JAR) *
$(DEPLOYED_MODELS_JAR): $(MODELS_JAR)
$(INSTALL_DATA) -C $(MODELS_JAR) $(DEPLOYED_MODELS_JAR)
$(JAVA_MODELS_JAR): $(MODELS_JAR)
$(INSTALL_DATA) -C $(MODELS_JAR) $(JAVA_MODELS_JAR)
install: $(DEPLOYED_MODELS_JAR)
install: $(JAVA_MODELS_JAR)
.PHONY: all clean install

Loading…
Cancel
Save