diff --git a/infer/annotations/Makefile b/infer/annotations/Makefile index dd506e6c4..e6deb6dda 100644 --- a/infer/annotations/Makefile +++ b/infer/annotations/Makefile @@ -14,7 +14,6 @@ ANNOT_SOURCES = $(shell find com/facebook/infer/annotation -name "*.java") PROCESSOR_SOURCES = $(shell find com/facebook/infer/annotprocess -name "*.java") ANNOT_CLASSES = 'annot_classes' PROCESSOR_CLASSES = 'processor_classes' -TARGET_JDK_VERSION = '1.8' ANNOTATIONS_JAR = $(CWD)/annotations.jar PROCESSOR_JAR = $(JAVA_LIB_DIR)/processor.jar @@ -23,12 +22,12 @@ all: $(ANNOTATIONS_JAR) $(PROCESSOR_JAR) $(ANNOTATIONS_JAR): $(ANNOT_SOURCES) mkdir -p $(ANNOT_CLASSES) - javac -source $(TARGET_JDK_VERSION) -target $(TARGET_JDK_VERSION) -cp $(JSR_JAR) $(ANNOT_SOURCES) -d $(ANNOT_CLASSES) + javac -cp $(JSR_JAR) $(ANNOT_SOURCES) -d $(ANNOT_CLASSES) cd $(ANNOT_CLASSES) && jar cvf $(ANNOTATIONS_JAR) com $(PROCESSOR_JAR): $(PROCESSOR_SOURCES) mkdir -p $(PROCESSOR_CLASSES) - javac -source $(TARGET_JDK_VERSION) -target $(TARGET_JDK_VERSION) $(PROCESSOR_SOURCES) -cp .:$(JAVA_HOME)/lib/tools.jar -d $(PROCESSOR_CLASSES) + javac $(PROCESSOR_SOURCES) -cp .:$(JAVA_HOME)/lib/tools.jar -d $(PROCESSOR_CLASSES) jar cvMf processor.jar -C resources META-INF -C $(PROCESSOR_CLASSES) com mv processor.jar $(PROCESSOR_JAR)