21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 # or visit www.oracle.com if you need additional information or have any |
22 # or visit www.oracle.com if you need additional information or have any |
23 # questions. |
23 # questions. |
24 # |
24 # |
25 |
25 |
26 JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
|
27 JAVAH_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar |
|
28 JAVADOC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar |
|
29 |
|
30 DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally |
26 DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally |
31 |
27 |
32 # The generate old bytecode javac setup uses the new compiler to compile for the |
28 # The generate old bytecode javac setup uses the new compiler to compile for the |
33 # boot jdk to generate tools that need to be run with the boot jdk. |
29 # boot jdk to generate tools that need to be run with the boot jdk. |
34 # Thus we force the target bytecode to 7. |
30 # Thus we force the target bytecode to 7. |
35 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
31 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
36 JVM:=$(JAVA),\ |
32 JVM:=$(JAVA),\ |
37 JAVAC:=$(JAVAC_JARS),\ |
33 JAVAC:=$(NEW_JAVAC),\ |
38 FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\ |
34 FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\ |
39 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
35 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
40 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
36 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
41 |
37 |
42 # The generate new bytecode javac setup uses the new compiler to compile for the |
38 # The generate new bytecode javac setup uses the new compiler to compile for the |
43 # new jdk. This new bytecode might only be possible to run using the new jvm. |
39 # new jdk. This new bytecode might only be possible to run using the new jvm. |
44 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ |
40 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ |
45 JVM:=$(JAVA),\ |
41 JVM:=$(JAVA),\ |
46 JAVAC:=$(JAVAC_JARS),\ |
42 JAVAC:=$(NEW_JAVAC),\ |
47 JAVAH:=$(JAVAH_JARS),\ |
|
48 FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ |
43 FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ |
49 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
44 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
50 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
45 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
51 |
46 |
52 # After the jdk is built, we want to build demos using only the recently |
47 # After the jdk is built, we want to build demos using only the recently |
53 # generated jdk classes and nothing else, no jdk source, etc etc. |
48 # generated jdk classes and nothing else, no jdk source, etc etc. |
54 # I.e. the rt.jar, but since rt.jar has not yet been generated |
49 # I.e. the rt.jar, but since rt.jar has not yet been generated |
55 # (it will be in "make images") therefore we use classes instead. |
50 # (it will be in "make images") therefore we use classes instead. |
56 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\ |
51 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\ |
57 JVM:=$(JAVA),\ |
52 JVM:=$(JAVA),\ |
58 JAVAC:=$(JAVAC_JARS),\ |
53 JAVAC:=$(NEW_JAVAC),\ |
59 FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\ |
54 FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\ |
60 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
55 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
61 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
56 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |