Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Wed Feb 13 17:04:21 2013 +0000
     1.2 +++ b/.hgtags	Wed Feb 13 11:25:58 2013 -0800
     1.3 @@ -197,3 +197,4 @@
     1.4  8d0baee36c7184d55c80354b45704c37d6b7ac79 jdk8-b73
     1.5  56c97aff46bb577b8668874154c24115a7e8a3e8 jdk8-b74
     1.6  c2e11e2ec4a3682513e566849e5562f31ded8c65 jdk8-b75
     1.7 +e81839b3233792415daaab051698edc6067f1a16 jdk8-b76

     2.1 --- a/makefiles/BuildLangtools.gmk	Wed Feb 13 17:04:21 2013 +0000
     2.2 +++ b/makefiles/BuildLangtools.gmk	Wed Feb 13 11:25:58 2013 -0800
     2.3 @@ -112,23 +112,7 @@
     2.4          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
     2.5  		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
     2.6  		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
     2.7 -		JARMAIN:=com.sun.tools.javac.Main))
     2.8 -
     2.9 -        $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    2.10 -		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
    2.11 -		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\
    2.12 -		JARMAIN:=com.sun.tools.javah.Main))
    2.13 -
    2.14 -        $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    2.15 -		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
    2.16 -		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\
    2.17 -		JARMAIN:=com.sun.tools.javap.Main))
    2.18 -
    2.19 -        $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    2.20 -		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
    2.21 -		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
    2.22 -		SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
    2.23 -		JARMAIN:=com.sun.tools.javadoc.Main))
    2.24 +		SUFFIXES:=.class $(RESOURCE_SUFFIXES)))
    2.25  
    2.26          # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 
    2.27          # yet built. It is currently not needed but might be again in the future. The following
    2.28 @@ -176,7 +160,8 @@
    2.29                  $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
    2.30                    JVM:=$(JAVA),\
    2.31                    JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
    2.32 -			 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
    2.33 +			 -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
    2.34 +			 com.sun.tools.javac.Main,\
    2.35                    FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
    2.36                    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    2.37                    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    2.38 @@ -201,11 +186,7 @@
    2.39  
    2.40                  all: 		$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
    2.41  				$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
    2.42 -	                 	$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
    2.43 -				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \
    2.44 -				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \
    2.45 -				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
    2.46 -
    2.47 +	                 	$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
    2.48  
    2.49          endif
    2.50  endif