Fri, 28 Sep 2012 14:57:31 -0700
Merge
1.1 --- a/.hgtags Fri Sep 28 11:39:29 2012 -0700 1.2 +++ b/.hgtags Fri Sep 28 14:57:31 2012 -0700 1.3 @@ -178,3 +178,4 @@ 1.4 9cf72631baf5cb1ebd8736c5efeab7746977ea68 jdk8-b54 1.5 e48e7e1f026b82d921433150180799898c088890 jdk8-b55 1.6 363e9198b9de68ebf37a3e2c2f3f23543d3915cd jdk8-b56 1.7 +86d5740b9fdc20ababb8aefde89ae1509ff216a9 jdk8-b57
2.1 --- a/makefiles/Makefile Fri Sep 28 11:39:29 2012 -0700 2.2 +++ b/makefiles/Makefile Fri Sep 28 14:57:31 2012 -0700 2.3 @@ -34,8 +34,9 @@ 2.4 # and the bootstrap javac, to be run by the bootdir jvm. 2.5 $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ 2.6 JAVAC:=$(JAVAC),\ 2.7 - FLAGS:=-Xprefer:source -XDignore.symbol.file=true -g,\ 2.8 - MODE:=SINGLE_THREADED_BATCH)) 2.9 + SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 2.10 + SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\ 2.11 + FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror)) 2.12 2.13 # Now setup the compilation of the properties compilation tool. You can depend 2.14 # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we 2.15 @@ -43,6 +44,8 @@ 2.16 # program needs to be linked and run towards the new javac sources. 2.17 $(eval $(call SetupJavaCompilation,BUILD_TOOLS,\ 2.18 SETUP:=BOOT_JAVAC,\ 2.19 + DISABLE_SJAVAC:=true,\ 2.20 + ADD_JAVAC_FLAGS:=-Xprefer:source,\ 2.21 SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\ 2.22 INCLUDES:=compileproperties genstubs,\ 2.23 BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses)) 2.24 @@ -93,6 +96,7 @@ 2.25 # to compile javac again and to build the complete new jdk. 2.26 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\ 2.27 SETUP:=BOOT_JAVAC,\ 2.28 + DISABLE_SJAVAC:=true,\ 2.29 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ 2.30 EXCLUDES:=com/sun/tools/javac/nio,\ 2.31 BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) 2.32 @@ -122,7 +126,7 @@ 2.33 # exercises the functionality to verify that it works. 2.34 TOOL_GENSTUBS_CMD=$(JAVA) \ 2.35 "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.36 - -cp "$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar$(PATH_SEP)$(LANGTOOLS_OUTPUTDIR)/btclasses" \ 2.37 + -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ 2.38 genstubs.GenStubs 2.39 # We fetch source from the JDK... 2.40 JDKS=$(JDK_TOPDIR)/src/share/classes 2.41 @@ -164,11 +168,9 @@ 2.42 JVM:=$(JAVA),\ 2.43 JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.44 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ 2.45 - FLAGS:=-Xprefer:source -XDignore.symbol.file=true,\ 2.46 - SERVER_DIR:=$(JAVAC_SERVERS),\ 2.47 - SERVER_JVM:=$(SERVER_JAVA),\ 2.48 - MODE:=$(JAVAC_USE_MODE),\ 2.49 - USE_DEPS:=$(JAVAC_USE_DEPS))) 2.50 + FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ 2.51 + SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 2.52 + SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 2.53 2.54 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied. 2.55 RESOURCE_SUFFIXES:=.gif .xml .css javax.tools.JavaCompilerTool