Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/makefiles/Makefile	Mon Sep 10 17:55:00 2012 -0700
     1.2 +++ b/makefiles/Makefile	Tue Sep 18 11:29:31 2012 -0700
     1.3 @@ -34,8 +34,9 @@
     1.4  # and the bootstrap javac, to be run by the bootdir jvm.
     1.5  $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
     1.6  	JAVAC:=$(JAVAC),\
     1.7 -        FLAGS:=-Xprefer:source -XDignore.symbol.file=true -g,\
     1.8 -        MODE:=SINGLE_THREADED_BATCH))
     1.9 +        SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.10 +        SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\
    1.11 +        FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
    1.12  
    1.13  # Now setup the compilation of the properties compilation tool. You can depend
    1.14  # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
    1.15 @@ -43,6 +44,8 @@
    1.16  # program needs to be linked and run towards the new javac sources.
    1.17  $(eval $(call SetupJavaCompilation,BUILD_TOOLS,\
    1.18  		SETUP:=BOOT_JAVAC,\
    1.19 +		DISABLE_SJAVAC:=true,\
    1.20 +                ADD_JAVAC_FLAGS:=-Xprefer:source,\
    1.21  		SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\
    1.22  		INCLUDES:=compileproperties genstubs,\
    1.23  		BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses))
    1.24 @@ -93,6 +96,7 @@
    1.25          # to compile javac again and to build the complete new jdk.
    1.26          $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\
    1.27  		SETUP:=BOOT_JAVAC,\
    1.28 +		DISABLE_SJAVAC:=true,\
    1.29  		SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
    1.30  		EXCLUDES:=com/sun/tools/javac/nio,\
    1.31  		BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
    1.32 @@ -122,7 +126,7 @@
    1.33          # exercises the functionality to verify that it works.
    1.34          TOOL_GENSTUBS_CMD=$(JAVA) \
    1.35               "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
    1.36 -             -cp "$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar$(PATH_SEP)$(LANGTOOLS_OUTPUTDIR)/btclasses" \
    1.37 +             -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
    1.38               genstubs.GenStubs
    1.39          # We fetch source from the JDK...
    1.40          JDKS=$(JDK_TOPDIR)/src/share/classes
    1.41 @@ -164,11 +168,9 @@
    1.42                    JVM:=$(JAVA),\
    1.43                    JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
    1.44  			 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
    1.45 -                  FLAGS:=-Xprefer:source -XDignore.symbol.file=true,\
    1.46 -                  SERVER_DIR:=$(JAVAC_SERVERS),\
    1.47 -                  SERVER_JVM:=$(SERVER_JAVA),\
    1.48 -                  MODE:=$(JAVAC_USE_MODE),\
    1.49 -		  USE_DEPS:=$(JAVAC_USE_DEPS)))
    1.50 +                  FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
    1.51 +                  SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.52 +                  SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    1.53  
    1.54                  # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
    1.55  		RESOURCE_SUFFIXES:=.gif .xml .css javax.tools.JavaCompilerTool