From 2fe85f615a296e57af033ff7f6b4b26b0933cf55 Mon Sep 17 00:00:00 2001 From: Scott Fennell Date: Thu, 1 Mar 2018 14:59:47 -0600 Subject: [PATCH] #490 #494 edited java/makefile to include java.se.ee when compiling with java 9 --- trick_source/java/makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/trick_source/java/makefile b/trick_source/java/makefile index a396c153..11c82afc 100644 --- a/trick_source/java/makefile +++ b/trick_source/java/makefile @@ -4,7 +4,14 @@ TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..) include ${TRICK_HOME}/share/trick/makefiles/Makefile.common JAVAC ?= javac -JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation --add-modules java.se.ee +JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation +# delineate 'javac -version' for version number +JAVAC_VERSION := $(shell (${JAVAC} -version |& awk '{print $$2}') | awk -F ""."" '{print $$1}') + +# include java.se.ee for JAXB xml annotations (for trick-tv) in java version 9 +ifeq ($(JAVAC_VERSION),9) + JAVAC_FLAGS += --add-modules java.se.ee +endif SRC_DIR = src SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java) @@ -23,6 +30,7 @@ CLASS_PATH = $(subst $(space),:,$(wildcard ${LIB_DIR}/*.jar)) RESOURCES = $(subst src/,,$(shell find src/trick -name resources)) RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index)) + all: ${DIST_DIR}/trick.jar resources @echo "Java build successful" @@ -65,3 +73,4 @@ clean_obj: clean_docs: rm -rf ${DOCS_API_DIR} +