34 # Thus we force the target bytecode to 7. |
34 # Thus we force the target bytecode to 7. |
35 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
35 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ |
36 JVM:=$(JAVA),\ |
36 JVM:=$(JAVA),\ |
37 JAVAC:=$(JAVAC_JARS),\ |
37 JAVAC:=$(JAVAC_JARS),\ |
38 FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\ |
38 FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\ |
39 SERVER_DIR:=$(JAVAC_SERVERS),\ |
39 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
40 SERVER_JVM:=$(SERVER_JAVA),\ |
40 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
41 MODE:=$(JAVAC_USE_MODE),\ |
|
42 USE_DEPS:=$(JAVAC_USE_DEPS))) |
|
43 |
41 |
44 # The generate new bytecode javac setup uses the new compiler to compile for the |
42 # The generate new bytecode javac setup uses the new compiler to compile for the |
45 # new jdk. This new bytecode might only be possible to run using the new jvm. |
43 # new jdk. This new bytecode might only be possible to run using the new jvm. |
46 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ |
44 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ |
47 JVM:=$(JAVA),\ |
45 JVM:=$(JAVA),\ |
48 JAVAC:=$(JAVAC_JARS),\ |
46 JAVAC:=$(JAVAC_JARS),\ |
49 JAVAH:=$(JAVAH_JARS),\ |
47 JAVAH:=$(JAVAH_JARS),\ |
50 FLAGS:=-bootclasspath "$(JDK_OUTPUTDIR)/classes" -Xprefer:source -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ |
48 FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 7 -target 7 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ |
51 SERVER_DIR:=$(JAVAC_SERVERS),\ |
49 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
52 SERVER_JVM:=$(SERVER_JAVA),\ |
50 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
53 MODE:=$(JAVAC_USE_MODE),\ |
|
54 USE_DEPS:=$(JAVAC_USE_DEPS))) |
|
55 |
51 |
56 # After the jdk is built, we want to build demos using only the recently |
52 # After the jdk is built, we want to build demos using only the recently |
57 # generated jdk classes and nothing else, no jdk source, etc etc. |
53 # generated jdk classes and nothing else, no jdk source, etc etc. |
58 # I.e. the rt.jar, but since rt.jar has not yet been generated |
54 # I.e. the rt.jar, but since rt.jar has not yet been generated |
59 # (it will be in "make images") therefore we use classes instead. |
55 # (it will be in "make images") therefore we use classes instead. |
60 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\ |
56 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\ |
61 JVM:=$(JAVA),\ |
57 JVM:=$(JAVA),\ |
62 JAVAC:=$(JAVAC_JARS),\ |
58 JAVAC:=$(JAVAC_JARS),\ |
63 FLAGS:= -Xbootclasspath:$(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\ |
59 FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\ |
64 SERVER_DIR:=$(JAVAC_SERVERS),\ |
60 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
65 SERVER_JVM:=$(SERVER_JAVA),\ |
61 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
66 MODE:=$(JAVAC_USE_MODE),\ |
|
67 USE_DEPS:=$(JAVAC_USE_DEPS))) |
|
68 |
|
69 # A temporary solution to work around the fact that Matrix3D.java |
|
70 # exists in several applets. The javacserver does not like to be |
|
71 # fed the same class twice. Thus we compile one applet outside of the |
|
72 # javacserver. |
|
73 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE_NOSERV,\ |
|
74 JVM:=$(JAVA),\ |
|
75 JAVAC:=$(JAVAC_JARS),\ |
|
76 FLAGS:= -Xbootclasspath:$(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\ |
|
77 MODE:=SINGLE_THREADED_BATCH,\ |
|
78 USE_DEPS:=FALSE)) |
|