author | herrick |
Mon, 04 Nov 2019 15:06:01 -0500 | |
branch | JDK-8200758-branch |
changeset 58922 | fbaf2e6402ad |
parent 58301 | e0efb29609bd |
child 58994 | b09ba68c6a19 |
permissions | -rw-r--r-- |
25854 | 1 |
# |
54135 | 2 |
# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. |
25854 | 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 |
|
26116
f051bd253364
8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents:
26115
diff
changeset
|
31 |
include Modules.gmk |
25854 | 32 |
include JavaCompilation.gmk |
26115
7a9dc384f3c8
8055188: General cleanup of minor issues from source restructure
erikj
parents:
25854
diff
changeset
|
33 |
include SetupJavaCompilers.gmk |
25854 | 34 |
|
35 |
# Hook to include the corresponding custom file, if present. |
|
47314 | 36 |
$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk)) |
25854 | 37 |
|
38 |
################################################################################ |
|
39 |
# Module specific build settings |
|
40 |
||
54135 | 41 |
java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline |
55013 | 42 |
java.base_COPY += .icu .dat .spp .nrm content-types.properties hijrah-config-islamic-umalqura.properties |
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
43 |
java.base_CLEAN += intrinsic.properties |
25854 | 44 |
|
36506 | 45 |
java.base_EXCLUDE_FILES += \ |
47217 | 46 |
$(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java |
36506 | 47 |
|
25854 | 48 |
java.base_EXCLUDES += java/lang/doc-files |
49 |
||
50 |
# Exclude BreakIterator classes that are just used in compile process to generate |
|
51 |
# data files and shouldn't go in the product |
|
52 |
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java |
|
53 |
||
53683 | 54 |
ifeq ($(call isTargetOs, solaris), false) |
25854 | 55 |
java.base_EXCLUDE_FILES += \ |
56 |
SolarisLoginModule.java \ |
|
57 |
SolarisSystem.java \ |
|
58 |
# |
|
59 |
endif |
|
60 |
||
53683 | 61 |
ifeq ($(call isTargetOs, solaris macosx aix), false) |
25854 | 62 |
java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java |
63 |
endif |
|
64 |
||
53683 | 65 |
ifeq ($(call isTargetOs, windows), true) |
25854 | 66 |
java.base_EXCLUDE_FILES += \ |
67 |
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ |
|
68 |
# |
|
69 |
endif |
|
70 |
||
71 |
################################################################################ |
|
72 |
||
54139 | 73 |
java.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
29437
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
74 |
|
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
75 |
################################################################################ |
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
76 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
77 |
java.datatransfer_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
78 |
java.datatransfer_COPY += flavormap.properties |
28903
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
79 |
|
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
80 |
################################################################################ |
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
81 |
|
54408
8fe16bf92ebd
8221731: Fix doclint handling of accessibility heading in java.desktop
psadhukhan
parents:
54139
diff
changeset
|
82 |
java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference \ |
45228 | 83 |
'-Xdoclint/package:java.*,javax.*' -Xlint:exports \ |
84 |
--doclint-format html4 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
85 |
java.desktop_COPY += .gif .png .wav .txt .xml .css .pf |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
86 |
java.desktop_CLEAN += iio-plugin.properties cursors.properties |
25854 | 87 |
|
88 |
java.desktop_EXCLUDES += \ |
|
89 |
java/awt/doc-files \ |
|
90 |
javax/swing/doc-files \ |
|
91 |
javax/swing/text/doc-files \ |
|
92 |
javax/swing/plaf/synth/doc-files \ |
|
93 |
javax/swing/undo/doc-files \ |
|
94 |
sun/awt/X11/doc-files \ |
|
95 |
# |
|
96 |
||
97 |
java.desktop_EXCLUDE_FILES += \ |
|
98 |
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
|
99 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
100 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
101 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
102 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
103 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
104 |
javax/swing/plaf/nimbus/TabbedPanePainter.java \ |
|
105 |
sun/awt/resources/security-icon-bw16.png \ |
|
106 |
sun/awt/resources/security-icon-bw24.png \ |
|
107 |
sun/awt/resources/security-icon-bw32.png \ |
|
108 |
sun/awt/resources/security-icon-bw48.png \ |
|
109 |
sun/awt/resources/security-icon-interim16.png \ |
|
110 |
sun/awt/resources/security-icon-interim24.png \ |
|
111 |
sun/awt/resources/security-icon-interim32.png \ |
|
112 |
sun/awt/resources/security-icon-interim48.png \ |
|
113 |
sun/awt/resources/security-icon-yellow16.png \ |
|
114 |
sun/awt/resources/security-icon-yellow24.png \ |
|
115 |
sun/awt/resources/security-icon-yellow32.png \ |
|
116 |
sun/awt/resources/security-icon-yellow48.png \ |
|
117 |
sun/awt/X11/java-icon16.png \ |
|
118 |
sun/awt/X11/java-icon24.png \ |
|
119 |
sun/awt/X11/java-icon32.png \ |
|
120 |
sun/awt/X11/java-icon48.png \ |
|
121 |
.template \ |
|
122 |
# |
|
123 |
||
53683 | 124 |
ifeq ($(call isTargetOs, macosx), true) |
25854 | 125 |
# exclude all X11 on Mac. |
29671
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
126 |
java.desktop_EXCLUDES += \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
127 |
sun/awt/X11 \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
128 |
sun/java2d/x11 \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
129 |
sun/java2d/jules \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
130 |
sun/java2d/xr \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
131 |
com/sun/java/swing/plaf/gtk \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
132 |
# |
25854 | 133 |
java.desktop_EXCLUDE_FILES += \ |
47217 | 134 |
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \ |
135 |
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \ |
|
136 |
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \ |
|
137 |
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \ |
|
25854 | 138 |
# |
139 |
else |
|
140 |
# TBD: figure out how to eliminate this long list |
|
141 |
java.desktop_EXCLUDE_FILES += \ |
|
142 |
sun/awt/X11/ScreenFormat.java \ |
|
143 |
sun/awt/X11/XArc.java \ |
|
144 |
sun/awt/X11/XChar2b.java \ |
|
145 |
sun/awt/X11/XCharStruct.java \ |
|
146 |
sun/awt/X11/XClassHint.java \ |
|
147 |
sun/awt/X11/XComposeStatus.java \ |
|
148 |
sun/awt/X11/XExtCodes.java \ |
|
149 |
sun/awt/X11/XFontProp.java \ |
|
150 |
sun/awt/X11/XFontSetExtents.java \ |
|
151 |
sun/awt/X11/XFontStruct.java \ |
|
152 |
sun/awt/X11/XGCValues.java \ |
|
153 |
sun/awt/X11/XHostAddress.java \ |
|
154 |
sun/awt/X11/XIMCallback.java \ |
|
155 |
sun/awt/X11/XIMHotKeyTrigger.java \ |
|
156 |
sun/awt/X11/XIMHotKeyTriggers.java \ |
|
157 |
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ |
|
158 |
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ |
|
159 |
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ |
|
160 |
sun/awt/X11/XIMStatusDrawCallbackStruct.java \ |
|
161 |
sun/awt/X11/XIMStringConversionCallbackStruct.java \ |
|
162 |
sun/awt/X11/XIMStringConversionText.java \ |
|
163 |
sun/awt/X11/XIMStyles.java \ |
|
164 |
sun/awt/X11/XIMText.java \ |
|
165 |
sun/awt/X11/XIMValuesList.java \ |
|
166 |
sun/awt/X11/XImage.java \ |
|
167 |
sun/awt/X11/XKeyboardControl.java \ |
|
168 |
sun/awt/X11/XKeyboardState.java \ |
|
169 |
sun/awt/X11/XOMCharSetList.java \ |
|
170 |
sun/awt/X11/XOMFontInfo.java \ |
|
171 |
sun/awt/X11/XOMOrientation.java \ |
|
172 |
sun/awt/X11/XPoint.java \ |
|
173 |
sun/awt/X11/XRectangle.java \ |
|
174 |
sun/awt/X11/XSegment.java \ |
|
175 |
sun/awt/X11/XStandardColormap.java \ |
|
176 |
sun/awt/X11/XTextItem.java \ |
|
177 |
sun/awt/X11/XTextItem16.java \ |
|
178 |
sun/awt/X11/XTextProperty.java \ |
|
179 |
sun/awt/X11/XTimeCoord.java \ |
|
180 |
sun/awt/X11/XWindowChanges.java \ |
|
181 |
sun/awt/X11/XdbeSwapInfo.java \ |
|
182 |
sun/awt/X11/XmbTextItem.java \ |
|
183 |
sun/awt/X11/XwcTextItem.java |
|
184 |
endif |
|
185 |
||
53683 | 186 |
ifeq ($(call isTargetOs, windows), true) |
25854 | 187 |
java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk |
188 |
endif |
|
189 |
||
190 |
ifdef BUILD_HEADLESS_ONLY |
|
191 |
java.desktop_EXCLUDES += sun/applet |
|
192 |
endif |
|
193 |
||
53683 | 194 |
ifeq ($(call isTargetOs, windows macosx), false) |
25854 | 195 |
java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java |
196 |
endif |
|
197 |
||
198 |
# These files do not appear in the build result of the old build. This |
|
199 |
# is because they are generated sources, but the AUTO_JAVA_FILES won't |
|
200 |
# pick them up since they aren't generated when the source dirs are |
|
201 |
# searched and they aren't referenced by any other classes so they won't |
|
202 |
# be picked up by implicit compilation. On a rebuild, they are picked up |
|
203 |
# and compiled. Exclude them here to produce the same rt.jar as the old |
|
204 |
# build does when building just once. |
|
205 |
java.desktop_EXCLUDE_FILES += \ |
|
206 |
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
|
207 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
208 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
209 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
210 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
211 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
212 |
javax/swing/plaf/nimbus/TabbedPanePainter.java \ |
|
213 |
# |
|
214 |
||
215 |
################################################################################ |
|
216 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
217 |
java.scripting_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
218 |
java.scripting_COPY += .js |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
219 |
java.scripting_CLEAN += .properties |
27560 | 220 |
|
221 |
################################################################################ |
|
222 |
||
54135 | 223 |
java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' |
29863 | 224 |
|
225 |
################################################################################ |
|
226 |
||
54135 | 227 |
java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' |
29863 | 228 |
|
229 |
################################################################################ |
|
230 |
||
54135 | 231 |
java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' |
29863 | 232 |
|
233 |
################################################################################ |
|
234 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
235 |
java.management.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*' |
43384
0a0861e1db57
8173607: JMX RMI connector should be in its own module
dfuchs
parents:
43054
diff
changeset
|
236 |
|
0a0861e1db57
8173607: JMX RMI connector should be in its own module
dfuchs
parents:
43054
diff
changeset
|
237 |
################################################################################ |
0a0861e1db57
8173607: JMX RMI connector should be in its own module
dfuchs
parents:
43054
diff
changeset
|
238 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
239 |
java.prefs_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
29863 | 240 |
|
241 |
################################################################################ |
|
242 |
||
49126
f29637bb390e
8197533: Move javax.transaction.xa to its own module
lancea
parents:
48888
diff
changeset
|
243 |
java.transaction.xa_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*' |
f29637bb390e
8197533: Move javax.transaction.xa to its own module
lancea
parents:
48888
diff
changeset
|
244 |
|
f29637bb390e
8197533: Move javax.transaction.xa to its own module
lancea
parents:
48888
diff
changeset
|
245 |
################################################################################ |
f29637bb390e
8197533: Move javax.transaction.xa to its own module
lancea
parents:
48888
diff
changeset
|
246 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
247 |
java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
25854 | 248 |
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
249 |
||
250 |
################################################################################ |
|
251 |
||
54135 | 252 |
java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' |
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
253 |
java.sql.rowset_CLEAN_FILES += $(wildcard \ |
47217 | 254 |
$(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \ |
255 |
$(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties) |
|
25854 | 256 |
|
257 |
################################################################################ |
|
258 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
259 |
java.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
260 |
java.rmi_CLEAN_FILES += $(wildcard \ |
47217 | 261 |
$(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ |
262 |
$(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) |
|
25854 | 263 |
|
264 |
################################################################################ |
|
265 |
||
54135 | 266 |
java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility \ |
48041
2743e489189e
8191938: Fix lint warnings in JAXP repo: a few Deprecation warrnings and enable -Xlint:all
joehw
parents:
47704
diff
changeset
|
267 |
'-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \ |
2743e489189e
8191938: Fix lint warnings in JAXP repo: a few Deprecation warrnings and enable -Xlint:all
joehw
parents:
47704
diff
changeset
|
268 |
javax.xml.transform javax.xml.validation javax.xml.xpath)' |
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
269 |
java.xml_CLEAN += .properties |
25854 | 270 |
|
271 |
################################################################################ |
|
272 |
||
54135 | 273 |
java.naming_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' -Xlint:-exports |
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
274 |
java.naming_CLEAN += jndiprovider.properties |
25854 | 275 |
|
276 |
################################################################################ |
|
277 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
278 |
java.security.jgss_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
29863 | 279 |
|
280 |
################################################################################ |
|
281 |
||
54135 | 282 |
java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*' |
29863 | 283 |
|
284 |
################################################################################ |
|
285 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
286 |
java.xml.crypto_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
287 |
java.xml.crypto_COPY += .dtd .xml |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
288 |
java.xml.crypto_CLEAN += .properties |
25854 | 289 |
|
290 |
################################################################################ |
|
291 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
292 |
jdk.charsets_COPY += .dat |
25854 | 293 |
|
294 |
################################################################################ |
|
295 |
||
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
296 |
################################################################################ |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
297 |
|
47217 | 298 |
jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \ |
299 |
'-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' \ |
|
36506 | 300 |
-XDstringConcat=inline |
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
301 |
jdk.compiler_CLEAN_FILES += $(wildcard \ |
47217 | 302 |
$(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ |
27560 | 303 |
sun/tools/serialver/resources)) |
25854 | 304 |
|
305 |
################################################################################ |
|
306 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
307 |
jdk.hotspot.agent_ADD_JAVAC_FLAGS += $(DISABLE_WARNINGS),-overrides |
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
308 |
jdk.hotspot.agent_COPY += .gif .png sa.js .properties |
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33723
diff
changeset
|
309 |
|
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33723
diff
changeset
|
310 |
################################################################################ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33723
diff
changeset
|
311 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
312 |
jdk.editpad_COPY += .properties |
41870
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
313 |
|
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
314 |
################################################################################ |
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
315 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
316 |
jdk.jshell_COPY += .jsh .properties |
42859
44601aa03c2d
8172155: jshell tool (make): include built-in startup scripts in image
rfield
parents:
42534
diff
changeset
|
317 |
|
44601aa03c2d
8172155: jshell tool (make): include built-in startup scripts in image
rfield
parents:
42534
diff
changeset
|
318 |
################################################################################ |
44601aa03c2d
8172155: jshell tool (make): include built-in startup scripts in image
rfield
parents:
42534
diff
changeset
|
319 |
|
52938 | 320 |
jdk.internal.le_COPY += .properties .caps .txt |
31512
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
321 |
|
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
322 |
################################################################################ |
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
323 |
|
50428 | 324 |
jdk.internal.opt_COPY += .properties |
325 |
||
326 |
################################################################################ |
|
327 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
328 |
jdk.jcmd_COPY += _options |
25854 | 329 |
|
330 |
################################################################################ |
|
331 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
332 |
jdk.dynalink_CLEAN += .properties |
34099
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
333 |
|
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
334 |
################################################################################ |
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
335 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
336 |
jdk.javadoc_COPY += .xml .css .js .png |
25854 | 337 |
|
338 |
################################################################################ |
|
339 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
340 |
jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline |
43054
14ae60f2a31c
8172432: jar cleanup/update for module and mrm jar
sherman
parents:
42859
diff
changeset
|
341 |
|
14ae60f2a31c
8172432: jar cleanup/update for module and mrm jar
sherman
parents:
42859
diff
changeset
|
342 |
################################################################################ |
14ae60f2a31c
8172432: jar cleanup/update for module and mrm jar
sherman
parents:
42859
diff
changeset
|
343 |
|
50878
fb7800b66c92
8204492: Add deprecation annotation to Nashorn APIs and warning to nashorn, jjs
sundar
parents:
50590
diff
changeset
|
344 |
jdk.scripting.nashorn_ADD_JAVAC_FLAGS += $(DISABLE_WARNINGS),-overrides |
50313 | 345 |
jdk.scripting.nashorn_COPY := .properties .js |
346 |
||
347 |
################################################################################ |
|
348 |
||
50878
fb7800b66c92
8204492: Add deprecation annotation to Nashorn APIs and warning to nashorn, jjs
sundar
parents:
50590
diff
changeset
|
349 |
jdk.scripting.nashorn.shell_ADD_JAVAC_FLAGS += $(DISABLE_WARNINGS),-overrides |
47704
38aa08d2ec6c
8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents:
47398
diff
changeset
|
350 |
jdk.scripting.nashorn.shell_COPY += .js .properties |
38aa08d2ec6c
8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents:
47398
diff
changeset
|
351 |
|
38aa08d2ec6c
8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents:
47398
diff
changeset
|
352 |
################################################################################ |
38aa08d2ec6c
8190795: jjs should show javadoc for java methods on shift-tab
sundar
parents:
47398
diff
changeset
|
353 |
|
25854 | 354 |
jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
355 |
jdk.rmic_CLEAN += .properties |
25854 | 356 |
|
357 |
################################################################################ |
|
358 |
||
359 |
# No SCTP implementation on Mac OS X or AIX. These classes should be excluded. |
|
360 |
SCTP_IMPL_CLASSES = \ |
|
47217 | 361 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \ |
362 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \ |
|
363 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \ |
|
364 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \ |
|
365 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ |
|
366 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ |
|
367 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \ |
|
368 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \ |
|
369 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \ |
|
370 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \ |
|
371 |
$(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java |
|
25854 | 372 |
|
53683 | 373 |
ifeq ($(call isTargetOs, macosx), true) |
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
374 |
jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) |
25854 | 375 |
endif |
376 |
||
53683 | 377 |
ifeq ($(call isTargetOs, aix), true) |
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
378 |
jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) |
25854 | 379 |
endif |
380 |
||
381 |
################################################################################ |
|
382 |
||
58301
e0efb29609bd
8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents:
57404
diff
changeset
|
383 |
jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst .postrm .postinst .list .sh \ |
58922
fbaf2e6402ad
8232919 : If user installs msi and exe, two installations are found in Add/Remove
herrick
parents:
58301
diff
changeset
|
384 |
.desktop .copyright .control .plist .template .icns .scpt .entitlements .wxs .wxl .wxi .ico .bmp |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
50878
diff
changeset
|
385 |
|
57039 | 386 |
jdk.jpackage_CLEAN += .properties |
56821
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
50878
diff
changeset
|
387 |
|
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
50878
diff
changeset
|
388 |
################################################################################ |
565d54ca1f41
8206005: Move prototype jpackager from closed sandbox to open sandbox
herrick
parents:
50878
diff
changeset
|
389 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
390 |
jdk.jconsole_COPY += .gif .png |
25854 | 391 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
392 |
jdk.jconsole_CLEAN_FILES += $(wildcard \ |
47217 | 393 |
$(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties) |
25854 | 394 |
|
395 |
################################################################################ |
|
396 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
397 |
jdk.jdeps_COPY += .txt |
39610
183537aae357
8160398: (jdeps) Replace a list of JDK 8 internal API for detecting if it's removed in JDK 9 or later
mchung
parents:
39384
diff
changeset
|
398 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
399 |
jdk.jdeps_CLEAN_FILES += $(wildcard \ |
47217 | 400 |
$(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \ |
401 |
$(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties) |
|
30742 | 402 |
|
403 |
################################################################################ |
|
404 |
||
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
405 |
jdk.jdi_EXCLUDES += \ |
25854 | 406 |
com/sun/tools/example/debug/bdi \ |
407 |
com/sun/tools/example/debug/event \ |
|
408 |
com/sun/tools/example/debug/gui \ |
|
409 |
com/sun/jdi/doc-files \ |
|
410 |
# |
|
411 |
||
412 |
jdk.jdi_EXCLUDE_FILES += jdi-overview.html |
|
413 |
||
414 |
################################################################################ |
|
415 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
416 |
jdk.dev_CLEAN_FILES += $(wildcard \ |
47217 | 417 |
$(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \ |
25854 | 418 |
com/sun/tools/script/shell)) |
419 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
420 |
jdk.dev_COPY += .js oqlhelp.html .txt |
25854 | 421 |
|
422 |
################################################################################ |
|
423 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
424 |
jdk.internal.jvmstat_COPY += aliasmap |
25854 | 425 |
|
426 |
################################################################################ |
|
427 |
||
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
428 |
# -parameters provides method's parameters information in class file, |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
429 |
# JVMCI compilers make use of that information for various sanity checks. |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
430 |
# Don't use Indy strings concatenation to have good JVMCI startup performance. |
44830 | 431 |
# The exports are needed since JVMCI is dynamically exported (see |
432 |
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo). |
|
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
433 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
434 |
jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -Xlint:-exports -XDstringConcat=inline |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
435 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
436 |
################################################################################ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
437 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
438 |
jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \ |
44830 | 439 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \ |
440 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \ |
|
441 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \ |
|
442 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \ |
|
443 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \ |
|
444 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \ |
|
445 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \ |
|
446 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \ |
|
447 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \ |
|
448 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler \ |
|
449 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \ |
|
450 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \ |
|
451 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler \ |
|
452 |
# |
|
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
453 |
|
43925 | 454 |
jdk.internal.vm.compiler_EXCLUDES += \ |
49873 | 455 |
jdk.internal.vm.compiler.collections.test \ |
52578 | 456 |
jdk.tools.jaotc.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
457 |
org.graalvm.compiler.api.directives.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
458 |
org.graalvm.compiler.api.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
459 |
org.graalvm.compiler.asm.aarch64.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
460 |
org.graalvm.compiler.asm.amd64.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
461 |
org.graalvm.compiler.asm.sparc.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
462 |
org.graalvm.compiler.asm.test \ |
52578 | 463 |
org.graalvm.compiler.core.aarch64.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
464 |
org.graalvm.compiler.core.amd64.test \ |
52578 | 465 |
org.graalvm.compiler.core.jdk9.test \ |
466 |
org.graalvm.compiler.core.match.processor \ |
|
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
467 |
org.graalvm.compiler.core.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
468 |
org.graalvm.compiler.debug.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
469 |
org.graalvm.compiler.graph.test \ |
54601 | 470 |
org.graalvm.compiler.hotspot.aarch64.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
471 |
org.graalvm.compiler.hotspot.amd64.test \ |
54084 | 472 |
org.graalvm.compiler.hotspot.jdk9.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
473 |
org.graalvm.compiler.hotspot.lir.test \ |
48861 | 474 |
org.graalvm.compiler.hotspot.sparc.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
475 |
org.graalvm.compiler.hotspot.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
476 |
org.graalvm.compiler.jtt \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
477 |
org.graalvm.compiler.lir.jtt \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
478 |
org.graalvm.compiler.lir.test \ |
46199 | 479 |
org.graalvm.compiler.loop.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
480 |
org.graalvm.compiler.microbenchmarks \ |
52578 | 481 |
org.graalvm.compiler.nodeinfo.processor \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
482 |
org.graalvm.compiler.nodes.test \ |
52578 | 483 |
org.graalvm.compiler.options.processor \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
484 |
org.graalvm.compiler.options.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
485 |
org.graalvm.compiler.phases.common.test \ |
52578 | 486 |
org.graalvm.compiler.processor \ |
487 |
org.graalvm.compiler.replacements.jdk12.test \ |
|
488 |
org.graalvm.compiler.replacements.jdk9.test \ |
|
489 |
org.graalvm.compiler.replacements.processor \ |
|
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
490 |
org.graalvm.compiler.replacements.test \ |
52578 | 491 |
org.graalvm.compiler.serviceprovider.processor \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
492 |
org.graalvm.compiler.test \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
493 |
org.graalvm.compiler.virtual.bench \ |
46245 | 494 |
org.graalvm.micro.benchmarks \ |
46199 | 495 |
org.graalvm.util.test \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
496 |
# |
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
497 |
|
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
498 |
################################################################################ |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
499 |
|
44830 | 500 |
# -parameters provides method's parameters information in class file, |
501 |
# JVMCI compilers make use of that information for various sanity checks. |
|
502 |
# Don't use Indy strings concatenation to have good JAOTC startup performance. |
|
503 |
# The exports are needed since JVMCI is dynamically exported (see |
|
504 |
# jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo). |
|
505 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
506 |
jdk.aot_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \ |
44830 | 507 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \ |
508 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \ |
|
509 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \ |
|
510 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler,jdk.aot \ |
|
511 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler,jdk.aot \ |
|
512 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler,jdk.aot \ |
|
513 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler,jdk.aot \ |
|
514 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler,jdk.aot \ |
|
515 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler,jdk.aot \ |
|
516 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler,jdk.aot \ |
|
517 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler,jdk.aot \ |
|
518 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler,jdk.aot \ |
|
519 |
--add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler,jdk.aot \ |
|
520 |
# |
|
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
521 |
|
51436 | 522 |
jdk.aot_EXCLUDES += \ |
523 |
jdk.tools.jaotc.test |
|
524 |
# |
|
525 |
||
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
526 |
################################################################################ |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
527 |
|
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
528 |
sun.charsets_COPY += .dat |
25854 | 529 |
|
530 |
################################################################################ |
|
531 |
||
47064
c01273781922
8186983: CompileJavaModule.gmk overrides values from a custom extension gmk
erikj
parents:
46245
diff
changeset
|
532 |
jdk.localedata_COPY += _dict _th |
25854 | 533 |
# Exclude BreakIterator classes that are just used in compile process to generate |
534 |
# data files and shouldn't go in the product |
|
40783
eecdf7525f79
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
40611
diff
changeset
|
535 |
jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java |
50590
5fa19bad622d
8204973: Add build support for filtering translations
erikj
parents:
50428
diff
changeset
|
536 |
jdk.localedata_KEEP_ALL_TRANSLATIONS := true |
50113 | 537 |
################################################################################ |
538 |
||
539 |
# There is an issue in sjavac that triggers a warning in jdk.jfr that isn't |
|
540 |
# triggered without sjavac. |
|
541 |
ifeq ($(ENABLE_SJAVAC), yes) |
|
542 |
jdk.jfr_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
543 |
endif |
|
544 |
jdk.jfr_COPY := .xsd .xml .dtd |
|
545 |
jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline -Xlint:-exports |
|
25854 | 546 |
|
547 |
################################################################################ |
|
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
548 |
# If this is an imported module that has prebuilt classes, only compile |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
549 |
# module-info.java. |
54076
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
550 |
ifneq ($(IMPORT_MODULES_CLASSES), ) |
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
551 |
IMPORT_MODULE_DIR := $(IMPORT_MODULES_CLASSES)/$(MODULE) |
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
552 |
ifneq ($(wildcard $(IMPORT_MODULE_DIR)), ) |
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
553 |
$(MODULE)_INCLUDE_FILES := module-info.java |
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
554 |
endif |
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
555 |
else |
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
556 |
IMPORT_MODULE_DIR := |
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
557 |
endif |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
558 |
|
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
559 |
################################################################################ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
560 |
# Setup the compilation for the module |
25854 | 561 |
# |
37030 | 562 |
MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE)) |
25854 | 563 |
|
564 |
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying |
|
565 |
# JDK_FILTER at the make command line, only a subset of the JDK java files will |
|
566 |
# be recompiled. If multiple paths are separated by comma, convert that into a |
|
567 |
# space separated list. |
|
568 |
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER))) |
|
38847 | 569 |
ifeq ($(JDK_FILTER), ) |
570 |
FAIL_NO_SRC := true |
|
571 |
else |
|
572 |
# When using JDK_FILTER, most module java compilations will end up finding |
|
573 |
# no source files. Don't let that fail the build. |
|
574 |
FAIL_NO_SRC := false |
|
575 |
endif |
|
25854 | 576 |
|
37030 | 577 |
# Get the complete module source path. |
578 |
MODULESOURCEPATH := $(call GetModuleSrcPath) |
|
31014
a3b1e5a584bd
8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents:
30742
diff
changeset
|
579 |
|
37030 | 580 |
# Add imported modules to the modulepath |
581 |
MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) |
|
25854 | 582 |
|
43925 | 583 |
ifeq ($(MODULE), jdk.internal.vm.ci) |
584 |
## WORKAROUND jdk.internal.vm.ci source structure issue |
|
36506 | 585 |
JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
586 |
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ |
|
47217 | 587 |
$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) |
37030 | 588 |
MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) |
36506 | 589 |
endif |
590 |
||
43925 | 591 |
ifeq ($(MODULE), jdk.internal.vm.compiler) |
592 |
## WORKAROUND jdk.internal.vm.compiler source structure issue |
|
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
593 |
VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
594 |
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \ |
47217 | 595 |
$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
596 |
MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH)) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
597 |
endif |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42302
diff
changeset
|
598 |
|
42532 | 599 |
ifeq ($(MODULE), jdk.aot) |
600 |
## WORKAROUND jdk.aot source structure issue |
|
601 |
AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
|
602 |
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ |
|
47217 | 603 |
$(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src))) |
42532 | 604 |
MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH)) |
605 |
endif |
|
606 |
||
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
607 |
$(eval $(call SetupJavaCompilation, $(MODULE), \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
608 |
SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \ |
36506 | 609 |
MODULE := $(MODULE), \ |
610 |
SRC := $(wildcard $(MODULE_SRC_DIRS)), \ |
|
38847 | 611 |
INCLUDES := $(JDK_USER_DEFINED_FILTER), \ |
612 |
FAIL_NO_SRC := $(FAIL_NO_SRC), \ |
|
36506 | 613 |
BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \ |
614 |
HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \ |
|
47398
1fd27535bc57
8182285: Speeding up incremental build by hashing module APIs
erikj
parents:
47314
diff
changeset
|
615 |
CREATE_API_DIGEST := true, \ |
36506 | 616 |
ADD_JAVAC_FLAGS := \ |
617 |
$($(MODULE)_ADD_JAVAC_FLAGS) \ |
|
40241
59abac94e4f2
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39610
diff
changeset
|
618 |
--module-source-path $(MODULESOURCEPATH) \ |
59abac94e4f2
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39610
diff
changeset
|
619 |
--module-path $(MODULEPATH) \ |
40611
53ba2f7abd45
8160851: Remove old launcher module-related options
mchung
parents:
40241
diff
changeset
|
620 |
--system none, \ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
621 |
)) |
36506 | 622 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
623 |
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA) |
25854 | 624 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
625 |
# Declare dependencies between java compilations of different modules. |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
626 |
# Since the other modules are declared in different invocations of this file, |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
627 |
# use the macro to find the correct target file to depend on. |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
628 |
# Only the javac compilation actually depends on other modules so limit |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
629 |
# dependency declaration to that by using the *_COMPILE_TARGET variable. |
36506 | 630 |
$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \ |
47398
1fd27535bc57
8182285: Speeding up incremental build by hashing module APIs
erikj
parents:
47314
diff
changeset
|
631 |
$(call SetupJavaCompilationApiTarget, $d, \ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
632 |
$(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d))) |
25854 | 633 |
|
634 |
################################################################################ |
|
635 |
# Copy zh_HK properties files from zh_TW |
|
636 |
||
637 |
$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties |
|
638 |
$(install-file) |
|
639 |
||
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
640 |
CreateHkTargets = \ |
51207
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
641 |
$(call FilterExcludedTranslations, \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
642 |
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
643 |
$(subst /share/classes,, \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
644 |
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
645 |
) \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
646 |
), \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
647 |
.properties \ |
fc24da4898f1
8207243: Fix translation filtering to also support zh_HK and zh_TW
erikj
parents:
50878
diff
changeset
|
648 |
) |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
649 |
|
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
650 |
ifeq ($(MODULE), java.sql.rowset) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
651 |
TARGETS += $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES)) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
652 |
endif |
25854 | 653 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
654 |
ifeq ($(MODULE), java.rmi) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
655 |
TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES)) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
656 |
endif |
25854 | 657 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
658 |
################################################################################ |
36506 | 659 |
# If this is an imported module, copy the pre built classes and resources into |
660 |
# the modules output dir |
|
661 |
||
54076
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
662 |
ifneq ($(wildcard $(IMPORT_MODULE_DIR)), ) |
36506 | 663 |
$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ |
54380 | 664 |
$(call FindFiles, $(IMPORT_MODULE_DIR)) |
37037
4fbd14764fa7
8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents:
37030
diff
changeset
|
665 |
$(call MakeDir, $(@D)) |
4fbd14764fa7
8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents:
37030
diff
changeset
|
666 |
# Do not delete marker and build meta data files |
4fbd14764fa7
8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents:
37030
diff
changeset
|
667 |
$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*)) |
54076
4b4745d185eb
8220383: Incremental build is broken and inefficient
erikj
parents:
53683
diff
changeset
|
668 |
$(CP) -R $(IMPORT_MODULE_DIR)/* $(@D)/ |
36506 | 669 |
$(TOUCH) $@ |
670 |
||
671 |
TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker |
|
672 |
||
673 |
# Add this dependency to avoid a race between compiling module-info.java and |
|
674 |
# importing the classes. |
|
675 |
$($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker |
|
676 |
endif |
|
677 |
||
678 |
################################################################################ |
|
679 |
||
50313 | 680 |
ifeq ($(MODULE), jdk.scripting.nashorn) |
681 |
include CompileJavaModulesNashorn.gmk |
|
682 |
endif |
|
683 |
||
684 |
################################################################################ |
|
685 |
||
47314 | 686 |
$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk)) |
36506 | 687 |
|
688 |
################################################################################ |
|
25854 | 689 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
690 |
all: $(TARGETS) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
691 |
|
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
692 |
.PHONY: all |