67 # The generate new bytecode javac setup uses the new compiler to compile for the |
67 # The generate new bytecode javac setup uses the new compiler to compile for the |
68 # new jdk. This new bytecode might only be possible to run using the new jvm. |
68 # new jdk. This new bytecode might only be possible to run using the new jvm. |
69 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \ |
69 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \ |
70 JVM := $(JAVA_JAVAC), \ |
70 JVM := $(JAVA_JAVAC), \ |
71 JAVAC := $(NEW_JAVAC), \ |
71 JAVAC := $(NEW_JAVAC), \ |
72 FLAGS := -source 9 -target 9 --doclint-format html5 \ |
72 FLAGS := -source 10 -target 10 --doclint-format html5 \ |
73 -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \ |
73 -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \ |
74 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
74 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
75 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
75 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
76 |
76 |
77 # The generate new bytecode javac setup uses the new compiler to compile for the |
77 # The generate new bytecode javac setup uses the new compiler to compile for the |
78 # new jdk. This new bytecode might only be possible to run using the new jvm. |
78 # new jdk. This new bytecode might only be possible to run using the new jvm. |
79 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \ |
79 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \ |
80 JVM := $(JAVA_JAVAC), \ |
80 JVM := $(JAVA_JAVAC), \ |
81 JAVAC := $(NEW_JAVAC), \ |
81 JAVAC := $(NEW_JAVAC), \ |
82 FLAGS := -source 9 -target 9 \ |
82 FLAGS := -source 10 -target 10 \ |
83 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \ |
83 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \ |
84 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
84 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
85 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
85 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
86 |
86 |
87 # After the jdk is built, we want to build demos using only the recently |
87 # After the jdk is built, we want to build demos using only the recently |