Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Wed, 16 Oct 2013 12:05:07 -0700
- author
- katleman
- date
- Wed, 16 Oct 2013 12:05:07 -0700
- changeset 2095
- 954dd199d6ff
- parent 2093
- 2f43529df42f
- parent 2094
- 343aeb2033f0
- child 2096
- 8f54b4231c28
Merge
1.1 --- a/makefiles/BuildLangtools.gmk Fri Oct 11 03:09:42 2013 -0700 1.2 +++ b/makefiles/BuildLangtools.gmk Wed Oct 16 12:05:07 2013 -0700 1.3 @@ -32,44 +32,49 @@ 1.4 1.5 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools 1.6 # and the bootstrap javac, to be run by the bootdir jvm. 1.7 -$(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ 1.8 - JAVAC:=$(JAVAC),\ 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 +$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ 1.13 + JAVAC := $(JAVAC), \ 1.14 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 1.15 + SERVER_JVM := $(SJAVAC_SERVER_JAVA), \ 1.16 + FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror)) 1.17 1.18 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied. 1.19 -RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool 1.20 +RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool 1.21 1.22 # Now setup the compilation of the properties compilation tool. You can depend 1.23 # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we 1.24 # add src/share/classes to the sourcepath. This is necessary since the GenStubs 1.25 # program needs to be linked and run towards the new javac sources. 1.26 -$(eval $(call SetupJavaCompilation,BUILD_TOOLS,\ 1.27 - SETUP:=BOOT_JAVAC,\ 1.28 - DISABLE_SJAVAC:=true,\ 1.29 - ADD_JAVAC_FLAGS:=-Xprefer:source,\ 1.30 - SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\ 1.31 - INCLUDES:=compileproperties genstubs,\ 1.32 - BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses)) 1.33 +$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \ 1.34 + SETUP := BOOT_JAVAC, \ 1.35 + DISABLE_SJAVAC := true, \ 1.36 + ADD_JAVAC_FLAGS := -Xprefer:source, \ 1.37 + SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \ 1.38 + INCLUDES := compileproperties genstubs, \ 1.39 + BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses)) 1.40 1.41 # The compileprops tools compiles a properties file into a resource bundle. 1.42 -TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet 1.43 +TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet 1.44 + 1.45 # Lookup the properties that need to be compiled into resource bundles. 1.46 -PROPSOURCES:=$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") 1.47 +PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") 1.48 + 1.49 # Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN" 1.50 -PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES)) 1.51 +PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES)) 1.52 + 1.53 # Generate the list of java files to be created. 1.54 -PROPJAVAS:=$(patsubst %,$(LANGTOOLS_OUTPUTDIR)/gensrc/%.java,$(PROPPATHS)) 1.55 +PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS)) 1.56 + 1.57 # Generate the package dirs for the tobe generated java files. 1.58 -PROPDIRS:=$(dir $(PROPJAVAS)) 1.59 +PROPDIRS := $(dir $(PROPJAVAS)) 1.60 + 1.61 # Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle" 1.62 # suitable to be fed into the CompileProperties command. 1.63 -PROPCMDLINE:=$(subst _SPACE_,$(SPACE),$(join $(addprefix -compile_SPACE_,$(PROPSOURCES)), \ 1.64 - $(addsuffix _SPACE_java.util.ListResourceBundle,$(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/,$(addsuffix .java,$(PROPPATHS)))))) 1.65 +PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \ 1.66 + $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS)))))) 1.67 1.68 # Now setup the rule for the generation of the resource bundles. 1.69 -$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS) 1.70 +$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS) 1.71 $(RM) -r $(@D)/* 1.72 $(MKDIR) -p $(@D) $(PROPDIRS) 1.73 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties 1.74 @@ -78,115 +83,119 @@ 1.75 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties 1.76 $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles 1.77 $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \ 1.78 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ 1.79 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ 1.80 - java.util.ListResourceBundle \ 1.81 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ 1.82 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ 1.83 - java.util.ListResourceBundle \ 1.84 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ 1.85 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ 1.86 - java.util.ListResourceBundle \ 1.87 - -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ 1.88 - $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ 1.89 - java.util.ListResourceBundle 1.90 - $(ECHO) PROPS_ARE_CREATED=yes > $@ 1.91 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ 1.92 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ 1.93 + java.util.ListResourceBundle \ 1.94 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ 1.95 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ 1.96 + java.util.ListResourceBundle \ 1.97 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ 1.98 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ 1.99 + java.util.ListResourceBundle \ 1.100 + -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ 1.101 + $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ 1.102 + java.util.ListResourceBundle 1.103 + $(ECHO) PROPS_ARE_CREATED = yes > $@ 1.104 1.105 # Trigger the generation of the resource bundles. After the resource bundles have 1.106 # been compiled, then the makefile will restart and the newly created java files 1.107 # will become part of the build further along in the makefile. 1.108 -include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 1.109 1.110 -ifeq ($(PROPS_ARE_CREATED),yes) 1.111 - # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac 1.112 - # that can be compiled with an old javac. The intermediate javac is then used 1.113 - # to compile javac again and to build the complete new jdk. 1.114 - $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\ 1.115 - SETUP:=BOOT_JAVAC,\ 1.116 - DISABLE_SJAVAC:=true,\ 1.117 - SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ 1.118 - EXCLUDES:=com/sun/tools/javac/nio,\ 1.119 - COPY:=$(RESOURCE_SUFFIXES),\ 1.120 - BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) 1.121 +ifeq ($(PROPS_ARE_CREATED), yes) 1.122 + # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac 1.123 + # that can be compiled with an old javac. The intermediate javac is then used 1.124 + # to compile javac again and to build the complete new jdk. 1.125 + $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \ 1.126 + SETUP := BOOT_JAVAC, \ 1.127 + DISABLE_SJAVAC := true, \ 1.128 + SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \ 1.129 + EXCLUDES := com/sun/tools/javac/nio, \ 1.130 + COPY := $(RESOURCE_SUFFIXES), \ 1.131 + BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) 1.132 1.133 - $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ 1.134 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ 1.135 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ 1.136 - SUFFIXES:=.class $(RESOURCE_SUFFIXES))) 1.137 + $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \ 1.138 + SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \ 1.139 + JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \ 1.140 + SUFFIXES := .class $(RESOURCE_SUFFIXES))) 1.141 1.142 - # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 1.143 - # yet built. It is currently not needed but might be again in the future. The following 1.144 - # exercises the functionality to verify that it works. 1.145 - TOOL_GENSTUBS_CMD=$(JAVA) \ 1.146 - "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 1.147 - -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ 1.148 - genstubs.GenStubs 1.149 - # We fetch source from the JDK... 1.150 - JDKS=$(JDK_TOPDIR)/src/share/classes 1.151 - # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't 1.152 - # currently needed, but is used as a demo for now. 1.153 - STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ 1.154 - -e "$(JDKS)/java/util/function/Predicate.java") 1.155 - # Rewrite the file names into class names because the GenStubs tool require this. 1.156 - STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES))) 1.157 + # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 1.158 + # yet built. It is currently not needed but might be again in the future. The following 1.159 + # exercises the functionality to verify that it works. 1.160 + TOOL_GENSTUBS_CMD = $(JAVA) \ 1.161 + "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 1.162 + -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ 1.163 + genstubs.GenStubs 1.164 1.165 - # Now setup the build recipe for genstubs. 1.166 - $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \ 1.167 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.168 - $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 1.169 - $(MKDIR) -p $(@D) 1.170 - $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs 1.171 - $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. 1.172 - ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED=yes > $@) 1.173 - if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ 1.174 - $(ECHO) $(LOG_INFO) No changes in the stubs!; \ 1.175 - $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ 1.176 - else \ 1.177 - $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ 1.178 - $(RM) -r $(@D); \ 1.179 - $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ 1.180 - fi 1.181 - $(ECHO) STUBS_ARE_CREATED=yes > $@ 1.182 + # We fetch source from the JDK... 1.183 + JDKS = $(JDK_TOPDIR)/src/share/classes 1.184 1.185 - # Trigger a generation of the genstubs java source code and a restart 1.186 - # of the makefile to make sure that the following build setup use the 1.187 - # newly created java files. 1.188 - -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d 1.189 + # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't 1.190 + # currently needed, but is used as a demo for now. 1.191 1.192 - ifeq ($(STUBS_ARE_CREATED),yes) 1.193 - # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar 1.194 - # that generates code for the new jdk that is being built. 1.195 - # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. 1.196 - $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 1.197 - JVM:=$(JAVA),\ 1.198 - JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 1.199 - -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.200 - com.sun.tools.javac.Main,\ 1.201 - FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ 1.202 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 1.203 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 1.204 + STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ 1.205 + -e "$(JDKS)/java/util/function/Predicate.java") 1.206 1.207 - $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\ 1.208 - SETUP:=GENERATE_NEWBYTECODE,\ 1.209 - SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ 1.210 - $(LANGTOOLS_OUTPUTDIR)/genstubs,\ 1.211 - EXCLUDES:=java/util java/io java/nio,\ 1.212 - COPY:=$(RESOURCE_SUFFIXES),\ 1.213 - BIN:=$(LANGTOOLS_OUTPUTDIR)/classes)) 1.214 + # Rewrite the file names into class names because the GenStubs tool require this. 1.215 + STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES))) 1.216 1.217 - $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\ 1.218 - SETUP:=GENERATE_NEWBYTECODE,\ 1.219 - SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ 1.220 - SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ 1.221 - JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) 1.222 + # Now setup the build recipe for genstubs. 1.223 + $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \ 1.224 + $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.225 + $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 1.226 + $(MKDIR) -p $(@D) 1.227 + $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs 1.228 + $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. 1.229 + ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@) 1.230 + if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ 1.231 + $(ECHO) $(LOG_INFO) No changes in the stubs!; \ 1.232 + $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ 1.233 + else \ 1.234 + $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ 1.235 + $(RM) -r $(@D); \ 1.236 + $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ 1.237 + fi 1.238 + $(ECHO) STUBS_ARE_CREATED = yes > $@ 1.239 1.240 - $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ 1.241 - SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ 1.242 - ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) 1.243 + # Trigger a generation of the genstubs java source code and a restart 1.244 + # of the makefile to make sure that the following build setup use the 1.245 + # newly created java files. 1.246 + -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d 1.247 1.248 - all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ 1.249 - $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ 1.250 - $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 1.251 + ifeq ($(STUBS_ARE_CREATED), yes) 1.252 + # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar 1.253 + # that generates code for the new jdk that is being built. 1.254 + # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. 1.255 + $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ 1.256 + JVM := $(JAVA), \ 1.257 + JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 1.258 + -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.259 + com.sun.tools.javac.Main, \ 1.260 + FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \ 1.261 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 1.262 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 1.263 1.264 - endif 1.265 + $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \ 1.266 + SETUP := GENERATE_NEWBYTECODE, \ 1.267 + SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ 1.268 + $(LANGTOOLS_OUTPUTDIR)/genstubs, \ 1.269 + EXCLUDES := java/util java/io java/nio, \ 1.270 + COPY := $(RESOURCE_SUFFIXES), \ 1.271 + BIN := $(LANGTOOLS_OUTPUTDIR)/classes)) 1.272 + 1.273 + $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \ 1.274 + SETUP := GENERATE_NEWBYTECODE, \ 1.275 + SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \ 1.276 + SUFFIXES := .class $(RESOURCE_SUFFIXES), \ 1.277 + JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) 1.278 + 1.279 + $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \ 1.280 + SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \ 1.281 + ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) 1.282 + 1.283 + all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ 1.284 + $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ 1.285 + $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 1.286 + 1.287 + endif 1.288 endif
2.1 --- a/makefiles/Makefile Fri Oct 11 03:09:42 2013 -0700 2.2 +++ b/makefiles/Makefile Wed Oct 16 12:05:07 2013 -0700 2.3 @@ -24,19 +24,19 @@ 2.4 # 2.5 2.6 # Locate this Makefile 2.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 2.8 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 2.10 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.11 else 2.12 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 2.13 + makefile_path := $(lastword $(MAKEFILE_LIST)) 2.14 endif 2.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) 2.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 2.17 2.18 # What is the name of this subsystem (langtools, corba, etc)? 2.19 -subsystem_name:=$(notdir $(repo_dir)) 2.20 +subsystem_name := $(notdir $(repo_dir)) 2.21 2.22 # Try to locate top-level makefile 2.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile 2.24 -ifneq ($(wildcard $(top_level_makefile)),) 2.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 2.26 +ifneq ($(wildcard $(top_level_makefile)), ) 2.27 $(info Will run $(subsystem_name) target on top-level Makefile) 2.28 $(info WARNING: This is a non-recommended way of building!) 2.29 $(info ===================================================)
