author | wetmore |
Wed, 16 Oct 2013 23:31:16 -0700 | |
changeset 20920 | ad3634a725bc |
parent 17650 | 67dcfe192818 |
child 20623 | cb61ea12e375 |
permissions | -rw-r--r-- |
14270 | 1 |
# |
17555
c4f13cad6479
8014365: Restore Objects.requireNonNull(T, Supplier<String>)
darcy
parents:
15420
diff
changeset
|
2 |
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
14270 | 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 |
# |
|
25 |
||
26 |
# This must be the first rule |
|
27 |
default: all |
|
28 |
||
29 |
include $(SPEC) |
|
30 |
include MakeBase.gmk |
|
31 |
include JavaCompilation.gmk |
|
32 |
||
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)) |
|
40 |
||
14556
e303c2c4c881
8003844: build-infra: docs target isn't working properly
erikj
parents:
14270
diff
changeset
|
41 |
# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied. |
e303c2c4c881
8003844: build-infra: docs target isn't working properly
erikj
parents:
14270
diff
changeset
|
42 |
RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool |
e303c2c4c881
8003844: build-infra: docs target isn't working properly
erikj
parents:
14270
diff
changeset
|
43 |
|
14270 | 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)) |
|
55 |
||
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. |
|
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
59 |
PROPSOURCES:=$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") |
14270 | 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)))))) |
|
70 |
||
71 |
# Now setup the rule for the generation of the resource bundles. |
|
72 |
$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS) |
|
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
73 |
$(RM) -r $(@D)/* |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
74 |
$(MKDIR) -p $(@D) $(PROPDIRS) |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
75 |
$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
76 |
$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
77 |
$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
78 |
$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
79 |
$(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles |
14270 | 80 |
$(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \ |
81 |
-compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ |
|
82 |
$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ |
|
83 |
java.util.ListResourceBundle \ |
|
84 |
-compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ |
|
85 |
$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ |
|
86 |
java.util.ListResourceBundle \ |
|
87 |
-compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ |
|
88 |
$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ |
|
15030
2d8dec41f029
8003562: Provide a CLI tool to analyze class dependencies
mchung
parents:
14556
diff
changeset
|
89 |
java.util.ListResourceBundle \ |
2d8dec41f029
8003562: Provide a CLI tool to analyze class dependencies
mchung
parents:
14556
diff
changeset
|
90 |
-compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ |
2d8dec41f029
8003562: Provide a CLI tool to analyze class dependencies
mchung
parents:
14556
diff
changeset
|
91 |
$(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ |
14270 | 92 |
java.util.ListResourceBundle |
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
93 |
$(ECHO) PROPS_ARE_CREATED=yes > $@ |
14270 | 94 |
|
95 |
# Trigger the generation of the resource bundles. After the resource bundles have |
|
96 |
# been compiled, then the makefile will restart and the newly created java files |
|
97 |
# will become part of the build further along in the makefile. |
|
98 |
-include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d |
|
99 |
||
100 |
ifeq ($(PROPS_ARE_CREATED),yes) |
|
101 |
# Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac |
|
102 |
# that can be compiled with an old javac. The intermediate javac is then used |
|
103 |
# to compile javac again and to build the complete new jdk. |
|
104 |
$(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\ |
|
105 |
SETUP:=BOOT_JAVAC,\ |
|
106 |
DISABLE_SJAVAC:=true,\ |
|
107 |
SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ |
|
108 |
EXCLUDES:=com/sun/tools/javac/nio,\ |
|
14556
e303c2c4c881
8003844: build-infra: docs target isn't working properly
erikj
parents:
14270
diff
changeset
|
109 |
COPY:=$(RESOURCE_SUFFIXES),\ |
14270 | 110 |
BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) |
111 |
||
112 |
$(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
|
113 |
SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
|
114 |
JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ |
|
15420
0ed0165428e5
8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents:
15030
diff
changeset
|
115 |
SUFFIXES:=.class $(RESOURCE_SUFFIXES))) |
14270 | 116 |
|
117 |
# GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not |
|
118 |
# yet built. It is currently not needed but might be again in the future. The following |
|
119 |
# exercises the functionality to verify that it works. |
|
120 |
TOOL_GENSTUBS_CMD=$(JAVA) \ |
|
121 |
"-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
|
122 |
-classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ |
|
123 |
genstubs.GenStubs |
|
124 |
# We fetch source from the JDK... |
|
125 |
JDKS=$(JDK_TOPDIR)/src/share/classes |
|
17555
c4f13cad6479
8014365: Restore Objects.requireNonNull(T, Supplier<String>)
darcy
parents:
15420
diff
changeset
|
126 |
# Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't |
14270 | 127 |
# currently needed, but is used as a demo for now. |
128 |
STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ |
|
17555
c4f13cad6479
8014365: Restore Objects.requireNonNull(T, Supplier<String>)
darcy
parents:
15420
diff
changeset
|
129 |
-e "$(JDKS)/java/util/function/Predicate.java") |
14270 | 130 |
# Rewrite the file names into class names because the GenStubs tool require this. |
131 |
STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES))) |
|
132 |
||
133 |
# Now setup the build recipe for genstubs. |
|
134 |
$(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \ |
|
135 |
$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
|
136 |
$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d |
|
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
137 |
$(MKDIR) -p $(@D) |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
138 |
$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
139 |
$(ECHO) $(LOG_INFO) Generating stubs from JDK sources. |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
140 |
($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED=yes > $@) |
14270 | 141 |
if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ |
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
142 |
$(ECHO) $(LOG_INFO) No changes in the stubs!; \ |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
143 |
$(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ |
14270 | 144 |
else \ |
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
145 |
$(ECHO) $(LOG_INFO) Changes in stubs detected!; \ |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
146 |
$(RM) -r $(@D); \ |
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
147 |
$(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ |
14270 | 148 |
fi |
17650
67dcfe192818
8012566: Replace find, rm, printf and similar with their proper variables
erikj
parents:
17555
diff
changeset
|
149 |
$(ECHO) STUBS_ARE_CREATED=yes > $@ |
14270 | 150 |
|
151 |
# Trigger a generation of the genstubs java source code and a restart |
|
152 |
# of the makefile to make sure that the following build setup use the |
|
153 |
# newly created java files. |
|
154 |
-include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d |
|
155 |
||
156 |
ifeq ($(STUBS_ARE_CREATED),yes) |
|
157 |
# Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar |
|
158 |
# that generates code for the new jdk that is being built. |
|
159 |
# The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. |
|
160 |
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ |
|
161 |
JVM:=$(JAVA),\ |
|
162 |
JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
|
15420
0ed0165428e5
8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents:
15030
diff
changeset
|
163 |
-cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
0ed0165428e5
8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents:
15030
diff
changeset
|
164 |
com.sun.tools.javac.Main,\ |
14270 | 165 |
FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ |
166 |
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
|
167 |
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
|
168 |
||
169 |
$(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\ |
|
170 |
SETUP:=GENERATE_NEWBYTECODE,\ |
|
171 |
SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ |
|
172 |
$(LANGTOOLS_OUTPUTDIR)/genstubs,\ |
|
173 |
EXCLUDES:=java/util java/io java/nio,\ |
|
174 |
COPY:=$(RESOURCE_SUFFIXES),\ |
|
175 |
BIN:=$(LANGTOOLS_OUTPUTDIR)/classes)) |
|
176 |
||
177 |
$(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\ |
|
178 |
SETUP:=GENERATE_NEWBYTECODE,\ |
|
179 |
SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ |
|
180 |
SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ |
|
181 |
JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) |
|
182 |
||
183 |
$(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ |
|
184 |
SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ |
|
185 |
ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) |
|
186 |
||
187 |
all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ |
|
188 |
$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ |
|
15420
0ed0165428e5
8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents:
15030
diff
changeset
|
189 |
$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
14270 | 190 |
|
191 |
endif |
|
192 |
endif |