Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Thu, 17 Oct 2013 16:13:39 -0700
- author
- lana
- date
- Thu, 17 Oct 2013 16:13:39 -0700
- changeset 2140
- bca97b47f0a2
- parent 2139
- defadd528513
- parent 2096
- 8f54b4231c28
- child 2142
- 54150586ba78
- child 2145
- 7af634b1fc5b
Merge
1.1 --- a/.hgtags Thu Oct 17 13:19:48 2013 -0700 1.2 +++ b/.hgtags Thu Oct 17 16:13:39 2013 -0700 1.3 @@ -233,3 +233,4 @@ 1.4 985abf1cd327169a317d4ff4f318a8162a5cd47d jdk8-b109 1.5 41541097533aa3933a018c8c1c426c1871dfd76e jdk8-b110 1.6 af6244ba81b6b8d1bf4ab06587a2067e021e4570 jdk8-b111 1.7 +954dd199d6ff3e4cfc42b894c1f611150526eecd jdk8-b112
2.1 --- a/makefiles/BuildLangtools.gmk Thu Oct 17 13:19:48 2013 -0700 2.2 +++ b/makefiles/BuildLangtools.gmk Thu Oct 17 16:13:39 2013 -0700 2.3 @@ -32,44 +32,49 @@ 2.4 2.5 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools 2.6 # and the bootstrap javac, to be run by the bootdir jvm. 2.7 -$(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ 2.8 - JAVAC:=$(JAVAC),\ 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 +$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ 2.13 + JAVAC := $(JAVAC), \ 2.14 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 2.15 + SERVER_JVM := $(SJAVAC_SERVER_JAVA), \ 2.16 + FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror)) 2.17 2.18 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied. 2.19 -RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool 2.20 +RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool 2.21 2.22 # Now setup the compilation of the properties compilation tool. You can depend 2.23 # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we 2.24 # add src/share/classes to the sourcepath. This is necessary since the GenStubs 2.25 # program needs to be linked and run towards the new javac sources. 2.26 -$(eval $(call SetupJavaCompilation,BUILD_TOOLS,\ 2.27 - SETUP:=BOOT_JAVAC,\ 2.28 - DISABLE_SJAVAC:=true,\ 2.29 - ADD_JAVAC_FLAGS:=-Xprefer:source,\ 2.30 - SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\ 2.31 - INCLUDES:=compileproperties genstubs,\ 2.32 - BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses)) 2.33 +$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \ 2.34 + SETUP := BOOT_JAVAC, \ 2.35 + DISABLE_SJAVAC := true, \ 2.36 + ADD_JAVAC_FLAGS := -Xprefer:source, \ 2.37 + SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \ 2.38 + INCLUDES := compileproperties genstubs, \ 2.39 + BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses)) 2.40 2.41 # The compileprops tools compiles a properties file into a resource bundle. 2.42 -TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet 2.43 +TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet 2.44 + 2.45 # Lookup the properties that need to be compiled into resource bundles. 2.46 -PROPSOURCES:=$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") 2.47 +PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") 2.48 + 2.49 # Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN" 2.50 -PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES)) 2.51 +PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES)) 2.52 + 2.53 # Generate the list of java files to be created. 2.54 -PROPJAVAS:=$(patsubst %,$(LANGTOOLS_OUTPUTDIR)/gensrc/%.java,$(PROPPATHS)) 2.55 +PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS)) 2.56 + 2.57 # Generate the package dirs for the tobe generated java files. 2.58 -PROPDIRS:=$(dir $(PROPJAVAS)) 2.59 +PROPDIRS := $(dir $(PROPJAVAS)) 2.60 + 2.61 # Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle" 2.62 # suitable to be fed into the CompileProperties command. 2.63 -PROPCMDLINE:=$(subst _SPACE_,$(SPACE),$(join $(addprefix -compile_SPACE_,$(PROPSOURCES)), \ 2.64 - $(addsuffix _SPACE_java.util.ListResourceBundle,$(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/,$(addsuffix .java,$(PROPPATHS)))))) 2.65 +PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \ 2.66 + $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS)))))) 2.67 2.68 # Now setup the rule for the generation of the resource bundles. 2.69 -$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS) 2.70 +$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS) 2.71 $(RM) -r $(@D)/* 2.72 $(MKDIR) -p $(@D) $(PROPDIRS) 2.73 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties 2.74 @@ -78,115 +83,119 @@ 2.75 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties 2.76 $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles 2.77 $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \ 2.78 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ 2.79 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ 2.80 - java.util.ListResourceBundle \ 2.81 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ 2.82 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ 2.83 - java.util.ListResourceBundle \ 2.84 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ 2.85 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ 2.86 - java.util.ListResourceBundle \ 2.87 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ 2.88 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ 2.89 - java.util.ListResourceBundle 2.90 - $(ECHO) PROPS_ARE_CREATED=yes > $@ 2.91 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ 2.92 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ 2.93 + java.util.ListResourceBundle \ 2.94 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ 2.95 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ 2.96 + java.util.ListResourceBundle \ 2.97 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ 2.98 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ 2.99 + java.util.ListResourceBundle \ 2.100 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ 2.101 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ 2.102 + java.util.ListResourceBundle 2.103 + $(ECHO) PROPS_ARE_CREATED = yes > $@ 2.104 2.105 # Trigger the generation of the resource bundles. After the resource bundles have 2.106 # been compiled, then the makefile will restart and the newly created java files 2.107 # will become part of the build further along in the makefile. 2.108 -include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 2.109 2.110 -ifeq ($(PROPS_ARE_CREATED),yes) 2.111 - # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac 2.112 - # that can be compiled with an old javac. The intermediate javac is then used 2.113 - # to compile javac again and to build the complete new jdk. 2.114 - $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\ 2.115 - SETUP:=BOOT_JAVAC,\ 2.116 - DISABLE_SJAVAC:=true,\ 2.117 - SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ 2.118 - EXCLUDES:=com/sun/tools/javac/nio,\ 2.119 - COPY:=$(RESOURCE_SUFFIXES),\ 2.120 - BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) 2.121 +ifeq ($(PROPS_ARE_CREATED), yes) 2.122 + # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac 2.123 + # that can be compiled with an old javac. The intermediate javac is then used 2.124 + # to compile javac again and to build the complete new jdk. 2.125 + $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \ 2.126 + SETUP := BOOT_JAVAC, \ 2.127 + DISABLE_SJAVAC := true, \ 2.128 + SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \ 2.129 + EXCLUDES := com/sun/tools/javac/nio, \ 2.130 + COPY := $(RESOURCE_SUFFIXES), \ 2.131 + BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) 2.132 2.133 - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ 2.134 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ 2.135 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ 2.136 - SUFFIXES:=.class $(RESOURCE_SUFFIXES))) 2.137 + $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \ 2.138 + SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \ 2.139 + JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \ 2.140 + SUFFIXES := .class $(RESOURCE_SUFFIXES))) 2.141 2.142 - # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 2.143 - # yet built. It is currently not needed but might be again in the future. The following 2.144 - # exercises the functionality to verify that it works. 2.145 - TOOL_GENSTUBS_CMD=$(JAVA) \ 2.146 - "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.147 - -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ 2.148 - genstubs.GenStubs 2.149 - # We fetch source from the JDK... 2.150 - JDKS=$(JDK_TOPDIR)/src/share/classes 2.151 - # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't 2.152 - # currently needed, but is used as a demo for now. 2.153 - STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ 2.154 - -e "$(JDKS)/java/util/function/Predicate.java") 2.155 - # Rewrite the file names into class names because the GenStubs tool require this. 2.156 - STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES))) 2.157 + # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 2.158 + # yet built. It is currently not needed but might be again in the future. The following 2.159 + # exercises the functionality to verify that it works. 2.160 + TOOL_GENSTUBS_CMD = $(JAVA) \ 2.161 + "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.162 + -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ 2.163 + genstubs.GenStubs 2.164 2.165 - # Now setup the build recipe for genstubs. 2.166 - $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \ 2.167 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 2.168 - $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 2.169 - $(MKDIR) -p $(@D) 2.170 - $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs 2.171 - $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. 2.172 - ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED=yes > $@) 2.173 - if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ 2.174 - $(ECHO) $(LOG_INFO) No changes in the stubs!; \ 2.175 - $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ 2.176 - else \ 2.177 - $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ 2.178 - $(RM) -r $(@D); \ 2.179 - $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ 2.180 - fi 2.181 - $(ECHO) STUBS_ARE_CREATED=yes > $@ 2.182 + # We fetch source from the JDK... 2.183 + JDKS = $(JDK_TOPDIR)/src/share/classes 2.184 2.185 - # Trigger a generation of the genstubs java source code and a restart 2.186 - # of the makefile to make sure that the following build setup use the 2.187 - # newly created java files. 2.188 - -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d 2.189 + # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't 2.190 + # currently needed, but is used as a demo for now. 2.191 2.192 - ifeq ($(STUBS_ARE_CREATED),yes) 2.193 - # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar 2.194 - # that generates code for the new jdk that is being built. 2.195 - # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. 2.196 - $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 2.197 - JVM:=$(JAVA),\ 2.198 - JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.199 - -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 2.200 - com.sun.tools.javac.Main,\ 2.201 - FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ 2.202 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 2.203 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 2.204 + STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ 2.205 + -e "$(JDKS)/java/util/function/Predicate.java") 2.206 2.207 - $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\ 2.208 - SETUP:=GENERATE_NEWBYTECODE,\ 2.209 - SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ 2.210 - $(LANGTOOLS_OUTPUTDIR)/genstubs,\ 2.211 - EXCLUDES:=java/util java/io java/nio,\ 2.212 - COPY:=$(RESOURCE_SUFFIXES),\ 2.213 - BIN:=$(LANGTOOLS_OUTPUTDIR)/classes)) 2.214 + # Rewrite the file names into class names because the GenStubs tool require this. 2.215 + STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES))) 2.216 2.217 - $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\ 2.218 - SETUP:=GENERATE_NEWBYTECODE,\ 2.219 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ 2.220 - SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ 2.221 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) 2.222 + # Now setup the build recipe for genstubs. 2.223 + $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \ 2.224 + $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 2.225 + $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 2.226 + $(MKDIR) -p $(@D) 2.227 + $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs 2.228 + $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. 2.229 + ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@) 2.230 + if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ 2.231 + $(ECHO) $(LOG_INFO) No changes in the stubs!; \ 2.232 + $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ 2.233 + else \ 2.234 + $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ 2.235 + $(RM) -r $(@D); \ 2.236 + $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ 2.237 + fi 2.238 + $(ECHO) STUBS_ARE_CREATED = yes > $@ 2.239 2.240 - $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ 2.241 - SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ 2.242 - ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) 2.243 + # Trigger a generation of the genstubs java source code and a restart 2.244 + # of the makefile to make sure that the following build setup use the 2.245 + # newly created java files. 2.246 + -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d 2.247 2.248 - all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ 2.249 - $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ 2.250 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 2.251 + ifeq ($(STUBS_ARE_CREATED), yes) 2.252 + # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar 2.253 + # that generates code for the new jdk that is being built. 2.254 + # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. 2.255 + $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ 2.256 + JVM := $(JAVA), \ 2.257 + JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.258 + -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 2.259 + com.sun.tools.javac.Main, \ 2.260 + FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \ 2.261 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 2.262 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 2.263 2.264 - endif 2.265 + $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \ 2.266 + SETUP := GENERATE_NEWBYTECODE, \ 2.267 + SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ 2.268 + $(LANGTOOLS_OUTPUTDIR)/genstubs, \ 2.269 + EXCLUDES := java/util java/io java/nio, \ 2.270 + COPY := $(RESOURCE_SUFFIXES), \ 2.271 + BIN := $(LANGTOOLS_OUTPUTDIR)/classes)) 2.272 + 2.273 + $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \ 2.274 + SETUP := GENERATE_NEWBYTECODE, \ 2.275 + SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \ 2.276 + SUFFIXES := .class $(RESOURCE_SUFFIXES), \ 2.277 + JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) 2.278 + 2.279 + $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \ 2.280 + SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \ 2.281 + ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) 2.282 + 2.283 + all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ 2.284 + $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ 2.285 + $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 2.286 + 2.287 + endif 2.288 endif
3.1 --- a/makefiles/Makefile Thu Oct 17 13:19:48 2013 -0700 3.2 +++ b/makefiles/Makefile Thu Oct 17 16:13:39 2013 -0700 3.3 @@ -24,19 +24,19 @@ 3.4 # 3.5 3.6 # Locate this Makefile 3.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 3.8 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 3.10 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.11 else 3.12 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 3.13 + makefile_path := $(lastword $(MAKEFILE_LIST)) 3.14 endif 3.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) 3.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 3.17 3.18 # What is the name of this subsystem (langtools, corba, etc)? 3.19 -subsystem_name:=$(notdir $(repo_dir)) 3.20 +subsystem_name := $(notdir $(repo_dir)) 3.21 3.22 # Try to locate top-level makefile 3.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile 3.24 -ifneq ($(wildcard $(top_level_makefile)),) 3.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 3.26 +ifneq ($(wildcard $(top_level_makefile)), ) 3.27 $(info Will run $(subsystem_name) target on top-level Makefile) 3.28 $(info WARNING: This is a non-recommended way of building!) 3.29 $(info ===================================================)
