makefiles/BuildLangtools.gmk

Mon, 17 Dec 2012 16:13:01 +0000

author
mcimadamore
date
Mon, 17 Dec 2012 16:13:01 +0000
changeset 1456
f20568328a57
parent 1424
da48ab364ea4
child 1472
0c244701188e
permissions
-rw-r--r--

8004099: Bad compiler diagnostic generated when poly expression is passed to non-existent method
Summary: Some code paths in resolve do not use methodArguments to correctly format actuals
Reviewed-by: jjg

     1 #
     2 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4 #
     5 # This code is free software; you can redistribute it and/or modify it
     6 # under the terms of the GNU General Public License version 2 only, as
     7 # published by the Free Software Foundation.  Oracle designates this
     8 # particular file as subject to the "Classpath" exception as provided
     9 # by Oracle in the LICENSE file that accompanied this code.
    10 #
    11 # This code is distributed in the hope that it will be useful, but WITHOUT
    12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    13 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    14 # version 2 for more details (a copy is included in the LICENSE file that
    15 # accompanied this code).
    16 #
    17 # You should have received a copy of the GNU General Public License version
    18 # 2 along with this work; if not, write to the Free Software Foundation,
    19 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    20 #
    21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    22 # or visit www.oracle.com if you need additional information or have any
    23 # questions.
    24 #
    26 # This must be the first rule
    27 default: all
    29 include $(SPEC)
    30 include MakeBase.gmk
    31 include JavaCompilation.gmk
    33 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
    34 # and the bootstrap javac, to be run by the bootdir jvm.
    35 $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
    36 	JAVAC:=$(JAVAC),\
    37         SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    38         SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\
    39         FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
    41 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
    42 RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool
    44 # Now setup the compilation of the properties compilation tool. You can depend
    45 # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
    46 # add src/share/classes to the sourcepath. This is necessary since the GenStubs
    47 # program needs to be linked and run towards the new javac sources.
    48 $(eval $(call SetupJavaCompilation,BUILD_TOOLS,\
    49 		SETUP:=BOOT_JAVAC,\
    50 		DISABLE_SJAVAC:=true,\
    51                 ADD_JAVAC_FLAGS:=-Xprefer:source,\
    52 		SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\
    53 		INCLUDES:=compileproperties genstubs,\
    54 		BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses))
    56 # The compileprops tools compiles a properties file into a resource bundle.
    57 TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
    58 # Lookup the properties that need to be compiled into resource bundles.
    59 PROPSOURCES:=$(shell find $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
    60 # Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
    61 PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES))
    62 # Generate the list of java files to be created.
    63 PROPJAVAS:=$(patsubst %,$(LANGTOOLS_OUTPUTDIR)/gensrc/%.java,$(PROPPATHS))
    64 # Generate the package dirs for the tobe generated java files.
    65 PROPDIRS:=$(dir $(PROPJAVAS))
    66 # Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
    67 # suitable to be fed into the CompileProperties command.
    68 PROPCMDLINE:=$(subst _SPACE_,$(SPACE),$(join $(addprefix -compile_SPACE_,$(PROPSOURCES)), \
    69 		$(addsuffix _SPACE_java.util.ListResourceBundle,$(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/,$(addsuffix .java,$(PROPPATHS))))))
    71 # Now setup the rule for the generation of the resource bundles.
    72 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS)
    73 	rm -rf $(@D)/*
    74 	mkdir -p $(@D) $(PROPDIRS)
    75 	printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
    76 	printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
    77 	printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
    78 	echo Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
    79 	$(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
    80 		-compile 	$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
    81 				$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
    82 				java.util.ListResourceBundle \
    83 		-compile 	$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
    84 				$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
    85 				java.util.ListResourceBundle \
    86 		-compile	$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
    87 				$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
    88 				java.util.ListResourceBundle
    89 	echo PROPS_ARE_CREATED=yes > $@
    91 # Trigger the generation of the resource bundles. After the resource bundles have
    92 # been compiled, then the makefile will restart and the newly created java files
    93 # will become part of the build further along in the makefile.
    94 -include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
    96 ifeq ($(PROPS_ARE_CREATED),yes)
    97         # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
    98         # that can be compiled with an old javac. The intermediate javac is then used
    99         # to compile javac again and to build the complete new jdk.
   100         $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\
   101 		SETUP:=BOOT_JAVAC,\
   102 		DISABLE_SJAVAC:=true,\
   103 		SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
   104 		EXCLUDES:=com/sun/tools/javac/nio,\
   105 		COPY:=$(RESOURCE_SUFFIXES),\
   106 		BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
   108         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
   109 		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
   110 		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
   111 		JARMAIN:=com.sun.tools.javac.Main))
   113         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\
   114 		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
   115 		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\
   116 		JARMAIN:=com.sun.tools.javah.Main))
   118         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\
   119 		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
   120 		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\
   121 		JARMAIN:=com.sun.tools.javap.Main))
   123         $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
   124 		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
   125 		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
   126 		SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
   127 		JARMAIN:=com.sun.tools.javadoc.Main))
   129         # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 
   130         # yet built. It is currently not needed but might be again in the future. The following
   131         # exercises the functionality to verify that it works.
   132         TOOL_GENSTUBS_CMD=$(JAVA) \
   133              "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
   134              -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
   135              genstubs.GenStubs
   136         # We fetch source from the JDK...
   137         JDKS=$(JDK_TOPDIR)/src/share/classes
   138         # Build the list of classes to generate stubs from. java/util/Objects.java isn't
   139         # currently needed, but is used as a demo for now.
   140 	 STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
   141 		    -e "$(JDKS)/java/util/Objects.java")
   142         # Rewrite the file names into class names because the GenStubs tool require this.
   143         STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES)))
   145         # Now setup the build recipe for genstubs.
   146         $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \
   147 				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
   148 				$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
   149 	       	mkdir -p $(@D)
   150 		mkdir -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
   151 	       	echo $(LOG_INFO) Generating stubs from JDK sources.
   152 	       	($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && echo STUBS_ARE_CREATED=yes > $@)
   153 		if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
   154 			echo $(LOG_INFO) No changes in the stubs!; \
   155 			rm -rf $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
   156 		else \
   157 			echo $(LOG_INFO) Changes in stubs detected!; \
   158 			rm -rf $(@D); \
   159 			mv $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
   160 		fi
   161 		echo STUBS_ARE_CREATED=yes > $@
   163         # Trigger a generation of the genstubs java source code and a restart
   164         # of the makefile to make sure that the following build setup use the 
   165         # newly created java files.
   166         -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
   168 	ifeq ($(STUBS_ARE_CREATED),yes)
   169                 # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
   170                 # that generates code for the new jdk that is being built.
   171                 # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
   172                 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
   173                   JVM:=$(JAVA),\
   174                   JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
   175 			 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\
   176                   FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\
   177                   SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
   178                   SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
   180                 $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
   181 			SETUP:=GENERATE_NEWBYTECODE,\
   182 			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
   183 			     $(LANGTOOLS_OUTPUTDIR)/genstubs,\
   184 			EXCLUDES:=java/util java/io java/nio,\
   185 			COPY:=$(RESOURCE_SUFFIXES),\
   186 			BIN:=$(LANGTOOLS_OUTPUTDIR)/classes))
   188                 $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\
   189 			SETUP:=GENERATE_NEWBYTECODE,\
   190 			SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\
   191 			SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
   192 			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
   194                 $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\
   195 			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
   196 			ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
   198                 all: 		$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
   199 				$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
   200 	                 	$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
   201 				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \
   202 				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \
   203 				$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
   206         endif
   207 endif

mercurial