1 # |
1 # |
2 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
70 # The generate new bytecode javac setup uses the new compiler to compile for the |
70 # The generate new bytecode javac setup uses the new compiler to compile for the |
71 # new jdk. This new bytecode might only be possible to run using the new jvm. |
71 # new jdk. This new bytecode might only be possible to run using the new jvm. |
72 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \ |
72 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \ |
73 JVM := $(JAVA_JAVAC), \ |
73 JVM := $(JAVA_JAVAC), \ |
74 JAVAC := $(NEW_JAVAC), \ |
74 JAVAC := $(NEW_JAVAC), \ |
75 FLAGS := -source 11 -target 11 --doclint-format html5 \ |
75 FLAGS := -source 12 -target 12 --doclint-format html5 \ |
76 -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \ |
76 -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \ |
77 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
77 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
78 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
78 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
79 |
79 |
80 # The generate new bytecode javac setup uses the new compiler to compile for the |
80 # The generate new bytecode javac setup uses the new compiler to compile for the |
81 # new jdk. This new bytecode might only be possible to run using the new jvm. |
81 # new jdk. This new bytecode might only be possible to run using the new jvm. |
82 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \ |
82 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \ |
83 JVM := $(JAVA_JAVAC), \ |
83 JVM := $(JAVA_JAVAC), \ |
84 JAVAC := $(NEW_JAVAC), \ |
84 JAVAC := $(NEW_JAVAC), \ |
85 FLAGS := -source 11 -target 11 \ |
85 FLAGS := -source 12 -target 12 \ |
86 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \ |
86 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \ |
87 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
87 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
88 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
88 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
89 |
89 |
90 # After the jdk is built, we want to build demos using only the recently |
90 # After the jdk is built, we want to build demos using only the recently |