Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Fri Nov 30 15:14:48 2012 +0000
     1.2 +++ b/.hgtags	Fri Nov 30 16:34:51 2012 -0800
     1.3 @@ -186,3 +186,5 @@
     1.4  b47bb81ba962ef80bb6f0b863c33a0afcfb0b49e jdk8-b62
     1.5  92e6f2190ca0567c857f85c3fb7a2be5adf079d0 jdk8-b63
     1.6  e6ee43b3e2473798b17a556e9f11eebe25ab81d4 jdk8-b64
     1.7 +5f2faba89cac665e365c05074064ffc934a495eb jdk8-b65
     1.8 +20230f8b0eef92a57043735fc2ca00fea7e510a0 jdk8-b66

     2.1 --- a/makefiles/BuildLangtools.gmk	Fri Nov 30 15:14:48 2012 +0000
     2.2 +++ b/makefiles/BuildLangtools.gmk	Fri Nov 30 16:34:51 2012 -0800
     2.3 @@ -38,6 +38,9 @@
     2.4          SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\
     2.5          FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
     2.6  
     2.7 +# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
     2.8 +RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool
     2.9 +
    2.10  # Now setup the compilation of the properties compilation tool. You can depend
    2.11  # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
    2.12  # add src/share/classes to the sourcepath. This is necessary since the GenStubs
    2.13 @@ -99,6 +102,7 @@
    2.14  		DISABLE_SJAVAC:=true,\
    2.15  		SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
    2.16  		EXCLUDES:=com/sun/tools/javac/nio,\
    2.17 +		COPY:=$(RESOURCE_SUFFIXES),\
    2.18  		BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
    2.19  
    2.20          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    2.21 @@ -119,6 +123,7 @@
    2.22          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    2.23  		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
    2.24  		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
    2.25 +		SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
    2.26  		JARMAIN:=com.sun.tools.javadoc.Main))
    2.27  
    2.28          # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 
    2.29 @@ -172,9 +177,6 @@
    2.30                    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    2.31                    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    2.32  
    2.33 -                # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
    2.34 -		RESOURCE_SUFFIXES:=.gif .xml .css javax.tools.JavaCompilerTool
    2.35 -
    2.36                  $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
    2.37  			SETUP:=GENERATE_NEWBYTECODE,\
    2.38  			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \