| author | ntv |
| Tue, 17 Nov 2015 10:44:22 -0500 | |
| changeset 33847 | 7857fc64d0c0 |
| parent 33045 | 00f484891bcf |
| child 33723 | b09ccef0313a |
| permissions | -rw-r--r-- |
| 25854 | 1 |
# |
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
2 |
# Copyright (c) 2014, 2015, 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. |
|
36 |
$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk)) |
|
37 |
||
38 |
################################################################################ |
|
39 |
# Module specific build settings |
|
40 |
||
41 |
java.activation_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
42 |
||
43 |
################################################################################ |
|
44 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
45 |
java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
27240
a2a7d337e3b7
8048124: Read hijra-config-umalqura.properties as a resource
rriggs
parents:
27137
diff
changeset
|
46 |
java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties |
| 25854 | 47 |
java.base_CLEAN := intrinsic.properties |
48 |
||
49 |
java.base_EXCLUDES += java/lang/doc-files |
|
50 |
||
51 |
# Exclude BreakIterator classes that are just used in compile process to generate |
|
52 |
# data files and shouldn't go in the product |
|
53 |
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java |
|
54 |
||
55 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
|
30095
0034766ccb09
8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents:
29863
diff
changeset
|
56 |
java.base_EXCLUDE_FILES += sun/nio/fs/GnomeFileTypeDetector.java |
| 25854 | 57 |
endif |
58 |
||
59 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
|
60 |
java.base_EXCLUDE_FILES += \ |
|
61 |
SolarisLoginModule.java \ |
|
62 |
SolarisSystem.java \ |
|
63 |
# |
|
64 |
endif |
|
65 |
||
66 |
ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), ) |
|
67 |
# |
|
68 |
# only solaris, macosx and aix |
|
69 |
# |
|
70 |
java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java |
|
71 |
endif |
|
72 |
||
73 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
74 |
java.base_EXCLUDE_FILES += \ |
|
75 |
sun/nio/ch/AbstractPollSelectorImpl.java \ |
|
76 |
sun/nio/ch/PollSelectorProvider.java \ |
|
77 |
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ |
|
78 |
# |
|
79 |
endif |
|
80 |
||
81 |
################################################################################ |
|
82 |
||
|
29437
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
83 |
java.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
84 |
|
|
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
85 |
################################################################################ |
|
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
86 |
|
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
87 |
java.datatransfer_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
28903
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
88 |
java.datatransfer_COPY := flavormap.properties |
|
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
89 |
|
|
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
90 |
################################################################################ |
|
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
91 |
|
|
30426
3595be2840ac
8075771: Enable "missing" doclint check in build of the java.desktop module
darcy
parents:
30425
diff
changeset
|
92 |
java.desktop_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
28903
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
93 |
java.desktop_COPY := .gif .png .wav .txt .xml .css .pf |
|
29169
9a91cf20c223
8039269: images/cursors should not be in ${java.home}/lib
serb
parents:
28903
diff
changeset
|
94 |
java.desktop_CLEAN := iio-plugin.properties cursors.properties |
| 25854 | 95 |
|
96 |
java.desktop_EXCLUDES += \ |
|
97 |
java/awt/doc-files \ |
|
98 |
javax/swing/doc-files \ |
|
99 |
javax/swing/text/doc-files \ |
|
100 |
javax/swing/plaf/synth/doc-files \ |
|
101 |
javax/swing/undo/doc-files \ |
|
102 |
sun/awt/X11/doc-files \ |
|
103 |
# |
|
104 |
||
105 |
# The exception handling of swing beaninfo |
|
106 |
# These resources violates the convention of having code and resources together under |
|
107 |
# $(JDK_TOPDIR)/src/.../classes directories |
|
108 |
$(eval $(call SetupCopyFiles,COPY_BEANINFO, \ |
|
109 |
SRC := $(JDK_TOPDIR)/make/data/swingbeaninfo/images, \ |
|
110 |
DEST := $(JDK_OUTPUTDIR)/modules/java.desktop/javax/swing/beaninfo/images, \ |
|
111 |
FILES := $(wildcard $(JDK_TOPDIR)/make/data/swingbeaninfo/images/*.gif))) |
|
112 |
||
113 |
java.desktop_COPY_EXTRA += $(COPY_BEANINFO) |
|
114 |
||
115 |
java.desktop_EXCLUDE_FILES += \ |
|
116 |
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
|
117 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
118 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
119 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
120 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
121 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
122 |
javax/swing/plaf/nimbus/TabbedPanePainter.java \ |
|
123 |
sun/awt/resources/security-icon-bw16.png \ |
|
124 |
sun/awt/resources/security-icon-bw24.png \ |
|
125 |
sun/awt/resources/security-icon-bw32.png \ |
|
126 |
sun/awt/resources/security-icon-bw48.png \ |
|
127 |
sun/awt/resources/security-icon-interim16.png \ |
|
128 |
sun/awt/resources/security-icon-interim24.png \ |
|
129 |
sun/awt/resources/security-icon-interim32.png \ |
|
130 |
sun/awt/resources/security-icon-interim48.png \ |
|
131 |
sun/awt/resources/security-icon-yellow16.png \ |
|
132 |
sun/awt/resources/security-icon-yellow24.png \ |
|
133 |
sun/awt/resources/security-icon-yellow32.png \ |
|
134 |
sun/awt/resources/security-icon-yellow48.png \ |
|
135 |
sun/awt/X11/java-icon16.png \ |
|
136 |
sun/awt/X11/java-icon24.png \ |
|
137 |
sun/awt/X11/java-icon32.png \ |
|
138 |
sun/awt/X11/java-icon48.png \ |
|
139 |
.template \ |
|
140 |
# |
|
141 |
||
142 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
143 |
# exclude all X11 on Mac. |
|
|
29671
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
144 |
java.desktop_EXCLUDES += \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
145 |
sun/awt/X11 \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
146 |
sun/java2d/x11 \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
147 |
sun/java2d/jules \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
148 |
sun/java2d/xr \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
149 |
com/sun/java/swing/plaf/gtk \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
150 |
# |
| 25854 | 151 |
java.desktop_EXCLUDE_FILES += \ |
|
29671
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
152 |
$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
153 |
$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
154 |
$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \ |
|
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
155 |
$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \ |
| 25854 | 156 |
# |
157 |
else |
|
158 |
# TBD: figure out how to eliminate this long list |
|
159 |
java.desktop_EXCLUDE_FILES += \ |
|
160 |
sun/awt/X11/ScreenFormat.java \ |
|
161 |
sun/awt/X11/XArc.java \ |
|
162 |
sun/awt/X11/XChar2b.java \ |
|
163 |
sun/awt/X11/XCharStruct.java \ |
|
164 |
sun/awt/X11/XClassHint.java \ |
|
165 |
sun/awt/X11/XComposeStatus.java \ |
|
166 |
sun/awt/X11/XExtCodes.java \ |
|
167 |
sun/awt/X11/XFontProp.java \ |
|
168 |
sun/awt/X11/XFontSetExtents.java \ |
|
169 |
sun/awt/X11/XFontStruct.java \ |
|
170 |
sun/awt/X11/XGCValues.java \ |
|
171 |
sun/awt/X11/XHostAddress.java \ |
|
172 |
sun/awt/X11/XIMCallback.java \ |
|
173 |
sun/awt/X11/XIMHotKeyTrigger.java \ |
|
174 |
sun/awt/X11/XIMHotKeyTriggers.java \ |
|
175 |
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ |
|
176 |
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ |
|
177 |
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ |
|
178 |
sun/awt/X11/XIMStatusDrawCallbackStruct.java \ |
|
179 |
sun/awt/X11/XIMStringConversionCallbackStruct.java \ |
|
180 |
sun/awt/X11/XIMStringConversionText.java \ |
|
181 |
sun/awt/X11/XIMStyles.java \ |
|
182 |
sun/awt/X11/XIMText.java \ |
|
183 |
sun/awt/X11/XIMValuesList.java \ |
|
184 |
sun/awt/X11/XImage.java \ |
|
185 |
sun/awt/X11/XKeyboardControl.java \ |
|
186 |
sun/awt/X11/XKeyboardState.java \ |
|
187 |
sun/awt/X11/XOMCharSetList.java \ |
|
188 |
sun/awt/X11/XOMFontInfo.java \ |
|
189 |
sun/awt/X11/XOMOrientation.java \ |
|
190 |
sun/awt/X11/XPoint.java \ |
|
191 |
sun/awt/X11/XRectangle.java \ |
|
192 |
sun/awt/X11/XSegment.java \ |
|
193 |
sun/awt/X11/XStandardColormap.java \ |
|
194 |
sun/awt/X11/XTextItem.java \ |
|
195 |
sun/awt/X11/XTextItem16.java \ |
|
196 |
sun/awt/X11/XTextProperty.java \ |
|
197 |
sun/awt/X11/XTimeCoord.java \ |
|
198 |
sun/awt/X11/XWindowChanges.java \ |
|
199 |
sun/awt/X11/XdbeSwapInfo.java \ |
|
200 |
sun/awt/X11/XmbTextItem.java \ |
|
201 |
sun/awt/X11/XwcTextItem.java |
|
202 |
endif |
|
203 |
||
204 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
205 |
java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk |
|
206 |
endif |
|
207 |
||
208 |
ifdef BUILD_HEADLESS_ONLY |
|
209 |
java.desktop_EXCLUDES += sun/applet |
|
210 |
endif |
|
211 |
||
212 |
# Why is this in the open source tree? |
|
213 |
ifdef OPENJDK |
|
214 |
java.desktop_EXCLUDES += sun/dc |
|
215 |
endif |
|
216 |
||
217 |
# Used on windows and macosx |
|
218 |
ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), ) |
|
219 |
java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java |
|
220 |
endif |
|
221 |
||
222 |
# These files do not appear in the build result of the old build. This |
|
223 |
# is because they are generated sources, but the AUTO_JAVA_FILES won't |
|
224 |
# pick them up since they aren't generated when the source dirs are |
|
225 |
# searched and they aren't referenced by any other classes so they won't |
|
226 |
# be picked up by implicit compilation. On a rebuild, they are picked up |
|
227 |
# and compiled. Exclude them here to produce the same rt.jar as the old |
|
228 |
# build does when building just once. |
|
229 |
java.desktop_EXCLUDE_FILES += \ |
|
230 |
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
|
231 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
232 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
233 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
234 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
235 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
236 |
javax/swing/plaf/nimbus/TabbedPanePainter.java \ |
|
237 |
# |
|
238 |
||
239 |
################################################################################ |
|
240 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
241 |
java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 27560 | 242 |
java.scripting_COPY := .js |
243 |
java.scripting_CLEAN := .properties |
|
244 |
||
245 |
################################################################################ |
|
246 |
||
| 29863 | 247 |
java.instrument_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
248 |
||
249 |
################################################################################ |
|
250 |
||
251 |
java.logging_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
252 |
||
253 |
################################################################################ |
|
254 |
||
255 |
java.management_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
256 |
||
257 |
################################################################################ |
|
258 |
||
259 |
java.prefs_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
|
260 |
||
261 |
################################################################################ |
|
262 |
||
263 |
java.transaction_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
|
264 |
||
265 |
################################################################################ |
|
266 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
267 |
java.sql_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 25854 | 268 |
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
269 |
||
270 |
################################################################################ |
|
271 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
272 |
java.sql.rowset_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 25854 | 273 |
java.sql.rowset_CLEAN_FILES := $(wildcard \ |
274 |
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \ |
|
275 |
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties) |
|
276 |
||
277 |
################################################################################ |
|
278 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
279 |
java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 25854 | 280 |
java.rmi_CLEAN_FILES := $(wildcard \ |
281 |
$(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ |
|
282 |
$(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) |
|
283 |
||
284 |
################################################################################ |
|
285 |
||
286 |
java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
287 |
||
288 |
java.corba_COPY := .prp |
|
289 |
java.corba_CLEAN := .properties |
|
290 |
||
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
291 |
java.corba_EXCLUDES += \ |
| 25854 | 292 |
com/sun/corba/se/PortableActivationIDL \ |
293 |
com/sun/tools/corba/se/logutil \ |
|
294 |
# |
|
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
295 |
java.corba_EXCLUDE_FILES += \ |
| 25854 | 296 |
com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ |
297 |
com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ |
|
298 |
com/sun/org/omg/CORBA/IDLTypeOperations.java \ |
|
299 |
com/sun/org/omg/CORBA/IRObjectOperations.java \ |
|
300 |
org/omg/PortableInterceptor/UNKNOWN.java \ |
|
301 |
com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ |
|
302 |
com/sun/corba/se/impl/presentation/rmi/jndi.properties \ |
|
303 |
# |
|
304 |
||
305 |
################################################################################ |
|
306 |
||
307 |
java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
308 |
java.xml_CLEAN := .properties |
|
309 |
||
310 |
################################################################################ |
|
311 |
||
312 |
java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
313 |
java.xml.bind_CLEAN := .properties |
|
314 |
||
315 |
################################################################################ |
|
316 |
||
317 |
java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
318 |
java.xml.soap_CLEAN := .properties |
|
319 |
||
320 |
################################################################################ |
|
321 |
||
322 |
java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
323 |
java.xml.ws_COPY := .xml |
|
324 |
java.xml.ws_CLEAN := .properties |
|
325 |
||
326 |
################################################################################ |
|
327 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
328 |
java.naming_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 25854 | 329 |
java.naming_CLEAN := jndiprovider.properties |
330 |
||
331 |
################################################################################ |
|
332 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
333 |
java.security.saaj_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 25854 | 334 |
java.security.saaj_CLEAN := .properties |
335 |
||
336 |
################################################################################ |
|
337 |
||
| 29863 | 338 |
java.security.jgss_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
339 |
||
340 |
################################################################################ |
|
341 |
||
342 |
java.smartcardio_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
|
343 |
||
344 |
################################################################################ |
|
345 |
||
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
346 |
java.xml.crypto_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
| 25854 | 347 |
java.xml.crypto_COPY := .dtd .xml |
348 |
java.xml.crypto_CLEAN := .properties |
|
349 |
||
350 |
################################################################################ |
|
351 |
||
352 |
jdk.charsets_COPY := .dat |
|
353 |
||
354 |
################################################################################ |
|
355 |
||
|
29437
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
356 |
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*' |
| 25854 | 357 |
jdk.compiler_COPY := javax.tools.JavaCompilerTool |
| 27560 | 358 |
jdk.compiler_CLEAN_FILES := $(wildcard \ |
359 |
$(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ |
|
360 |
sun/tools/serialver/resources)) |
|
| 25854 | 361 |
|
362 |
################################################################################ |
|
363 |
||
|
31512
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
364 |
jdk.internal.le_COPY := .properties |
|
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
365 |
|
|
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
366 |
################################################################################ |
|
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
367 |
|
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27586
diff
changeset
|
368 |
jdk.jcmd_COPY := _options |
| 25854 | 369 |
|
370 |
################################################################################ |
|
371 |
||
372 |
jdk.javadoc_COPY := .xml .css .js |
|
373 |
||
374 |
################################################################################ |
|
375 |
||
376 |
jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
377 |
jdk.rmic_CLEAN := .properties |
|
378 |
||
379 |
################################################################################ |
|
380 |
||
381 |
# No SCTP implementation on Mac OS X or AIX. These classes should be excluded. |
|
382 |
SCTP_IMPL_CLASSES = \ |
|
383 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \ |
|
384 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \ |
|
385 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \ |
|
386 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \ |
|
387 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ |
|
388 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ |
|
389 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \ |
|
390 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \ |
|
391 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \ |
|
392 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \ |
|
393 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java |
|
394 |
||
395 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
396 |
jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) |
| 25854 | 397 |
endif |
398 |
||
399 |
ifeq ($(OPENJDK_TARGET_OS),aix) |
|
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
400 |
jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) |
| 25854 | 401 |
endif |
402 |
||
403 |
################################################################################ |
|
404 |
||
405 |
jdk.jconsole_COPY := .gif .png |
|
406 |
||
407 |
jdk.jconsole_CLEAN_FILES := $(wildcard \ |
|
408 |
$(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties) |
|
409 |
||
410 |
################################################################################ |
|
411 |
||
| 30742 | 412 |
jdk.jdeps_CLEAN_FILES := $(wildcard \ |
413 |
$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \ |
|
414 |
$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties) |
|
415 |
||
416 |
################################################################################ |
|
417 |
||
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
418 |
jdk.jdi_EXCLUDES += \ |
| 25854 | 419 |
com/sun/tools/example/debug/bdi \ |
420 |
com/sun/tools/example/debug/event \ |
|
421 |
com/sun/tools/example/debug/gui \ |
|
422 |
com/sun/jdi/doc-files \ |
|
423 |
# |
|
424 |
||
425 |
jdk.jdi_EXCLUDE_FILES += jdi-overview.html |
|
426 |
||
427 |
################################################################################ |
|
428 |
||
429 |
jdk.dev_CLEAN_FILES := $(wildcard \ |
|
430 |
$(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \ |
|
431 |
com/sun/tools/script/shell)) |
|
432 |
||
433 |
jdk.dev_COPY := .js oqlhelp.html .txt |
|
434 |
||
435 |
################################################################################ |
|
436 |
||
437 |
jdk.jvmstat_COPY := aliasmap |
|
438 |
||
439 |
################################################################################ |
|
440 |
||
|
33045
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
441 |
jdk.vm.ci_EXCLUDE_FILES += \ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
442 |
jdk/vm/ci/options/processor/OptionProcessor.java \ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
443 |
jdk/vm/ci/service/processor/ServiceProviderProcessor.java \ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
444 |
# |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
445 |
|
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
446 |
jdk.vm.ci_EXCLUDES += \ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
447 |
META-INF/jvmci.options \ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
448 |
META-INF/jvmci.providers \ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
449 |
# |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
450 |
|
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
451 |
################################################################################ |
|
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
452 |
|
| 25854 | 453 |
jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
454 |
jdk.xml.bind_CLEAN := .properties |
|
455 |
jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java |
|
456 |
||
457 |
################################################################################ |
|
458 |
||
459 |
jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
460 |
jdk.xml.ws_CLEAN := .properties |
|
461 |
||
462 |
################################################################################ |
|
463 |
||
464 |
sun.charsets_COPY := .dat |
|
465 |
||
466 |
################################################################################ |
|
467 |
||
468 |
jdk.localedata_COPY := _dict _th |
|
469 |
# Exclude BreakIterator classes that are just used in compile process to generate |
|
470 |
# data files and shouldn't go in the product |
|
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
471 |
jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java |
| 25854 | 472 |
|
473 |
################################################################################ |
|
474 |
# Setup the compilation of each module |
|
475 |
# |
|
476 |
# Do not include nashorn src here since it needs to be compiled separately due |
|
477 |
# to nasgen. |
|
478 |
# |
|
479 |
# Order src dirs in order of override with the most important first. Generated |
|
480 |
# source before static source and platform specific source before shared. |
|
481 |
# |
|
482 |
# To use this variable, use $(call ALL_SRC_DIRS,module) with no space. |
|
483 |
GENERATED_SRC_DIRS += \ |
|
| 27560 | 484 |
$(SUPPORT_OUTPUTDIR)/gensrc/$1 \ |
485 |
$(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$1 \ |
|
| 25854 | 486 |
# |
487 |
||
488 |
OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes |
|
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27397
diff
changeset
|
489 |
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
|
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27397
diff
changeset
|
490 |
OS_TYPE_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_TYPE)/classes |
| 25854 | 491 |
endif |
492 |
||
493 |
SHARE_SRC_DIRS += \ |
|
|
33045
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
494 |
$(HOTSPOT_TOPDIR)/src/$1/share/classes \ |
| 25854 | 495 |
$(JDK_TOPDIR)/src/$1/share/classes \ |
496 |
$(LANGTOOLS_TOPDIR)/src/$1/share/classes \ |
|
497 |
$(CORBA_TOPDIR)/src/$1/share/classes \ |
|
498 |
$(JAXP_TOPDIR)/src/$1/share/classes \ |
|
499 |
$(JAXWS_TOPDIR)/src/$1/share/classes \ |
|
|
32067
ab09cdb2ccb8
8133347: Add makefiles support and basic session, persistence history navigation with jline
sundar
parents:
32066
diff
changeset
|
500 |
$(NASHORN_TOPDIR)/src/$1/share/classes \ |
| 25854 | 501 |
# |
502 |
||
503 |
ALL_SRC_DIRS = \ |
|
504 |
$(GENERATED_SRC_DIRS) \ |
|
505 |
$(OS_SRC_DIRS) \ |
|
|
27586
e7cfdc266a70
8058631: Rename posix to unix in build system to match file name changes
ihse
parents:
27397
diff
changeset
|
506 |
$(OS_TYPE_SRC_DIRS) \ |
| 25854 | 507 |
$(SHARE_SRC_DIRS) \ |
508 |
# |
|
509 |
||
510 |
# Find all modules with java sources. Filter out nashorn since it needs to be |
|
511 |
# compiled separately. |
|
512 |
ALL_JAVA_MODULES := $(filter-out jdk.scripting.nashorn, $(call FindJavaModules)) |
|
513 |
JAVA_MODULES := $(ALL_JAVA_MODULES) |
|
514 |
||
515 |
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying |
|
516 |
# JDK_FILTER at the make command line, only a subset of the JDK java files will |
|
517 |
# be recompiled. If multiple paths are separated by comma, convert that into a |
|
518 |
# space separated list. |
|
519 |
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER))) |
|
520 |
||
|
31014
a3b1e5a584bd
8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents:
30742
diff
changeset
|
521 |
# Create an empty directory to set the bootclasspath to. |
|
32066
9df3d0e44e64
8129562: JDK 9 build using boot-jdk classes instead of newly compiled classes
jlahoda
parents:
31512
diff
changeset
|
522 |
EMPTY_DIR := $(SUPPORT_OUTPUTDIR)/empty-dir |
|
9df3d0e44e64
8129562: JDK 9 build using boot-jdk classes instead of newly compiled classes
jlahoda
parents:
31512
diff
changeset
|
523 |
$(call MakeDir, $(EMPTY_DIR)) |
|
31014
a3b1e5a584bd
8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents:
30742
diff
changeset
|
524 |
|
| 25854 | 525 |
# This macro sets up compilation of a module and declares dependencies for it. |
526 |
# Param 1 - module name |
|
527 |
define SetupModuleCompilation |
|
528 |
# Find the module dependencies by parsing modules.list file |
|
529 |
$1_DEPS := $$(call FindDepsForModule, $1) |
|
530 |
||
| 31310 | 531 |
$1_CLASSPATH := $$(foreach d,$$($1_DEPS), $$(if $$($$d_BIN), $$($$d_BIN), \ |
532 |
$(JDK_OUTPUTDIR)/modules/$$d)) |
|
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27586
diff
changeset
|
533 |
# When crypto classes are prebuilt, need to look for classes already in |
|
27135
cc1917dc458c
8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced
erikj
parents:
26284
diff
changeset
|
534 |
# output dir. |
|
cc1917dc458c
8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced
erikj
parents:
26284
diff
changeset
|
535 |
ifneq ($(BUILD_CRYPTO), true) |
|
cc1917dc458c
8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced
erikj
parents:
26284
diff
changeset
|
536 |
$1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1 |
|
cc1917dc458c
8060766: build of jdk9-b33 seems broken due to how security zip files are interfaced
erikj
parents:
26284
diff
changeset
|
537 |
endif |
| 25854 | 538 |
ifeq ($1, jdk.hotspot.agent) |
539 |
## The source of this module is compiled elsewhere, hotspot, and imported. |
|
540 |
## Service types are required in the classpath when compiing module-info |
|
541 |
$1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent) |
|
542 |
endif |
|
|
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32067
diff
changeset
|
543 |
$1_JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) -endorseddirs $(EMPTY_DIR) $$($1_ADD_JAVAC_FLAGS) |
| 25854 | 544 |
|
545 |
$$(eval $$(call SetupJavaCompilation,$1, \ |
|
546 |
SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \ |
|
|
33045
00f484891bcf
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32559
diff
changeset
|
547 |
SRC := $$(if $$($1_SRC), $$($1_SRC), $$(wildcard $$(call ALL_SRC_DIRS,$1))), \ |
| 31310 | 548 |
INCLUDES := $(JDK_USER_DEFINED_FILTER),\ |
549 |
BIN := $$(if $$($1_BIN), $$($1_BIN), $(JDK_OUTPUTDIR)/modules/$1), \ |
|
| 27560 | 550 |
HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$1, \ |
|
32460
9e9bffb3029a
8065912: Better handling of classpath in build-infra
ihse
parents:
32067
diff
changeset
|
551 |
CLASSPATH := $$($1_CLASSPATH), \ |
| 31310 | 552 |
ADD_JAVAC_FLAGS := $$($1_ADD_JAVAC_FLAGS) $$($1_JAVAC_FLAGS))) |
| 25854 | 553 |
|
554 |
$1: $$($1) $$($1_COPY_EXTRA) |
|
555 |
||
556 |
# Declare dependencies between java compilation of different modules. |
|
557 |
# Since not all modules have been declared yet, or might be declared |
|
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27586
diff
changeset
|
558 |
# in different invocations of this file, use the macro to find the |
| 25854 | 559 |
# correct target file to depend on. |
560 |
# Only the javac compilation actually depends on other modules so limit |
|
561 |
# dependency declaration to that by using the *_COMPILE_TARGET variable. |
|
562 |
$$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \ |
|
| 31310 | 563 |
$$(call SetupJavaCompilationCompileTarget, $$d, \ |
564 |
$$(if $$($$d_BIN), $$($$d_BIN), $(JDK_OUTPUTDIR)/modules/$$d))) |
|
| 25854 | 565 |
endef |
566 |
||
567 |
# Setup compilation for each module |
|
568 |
$(foreach m,$(JAVA_MODULES),$(eval $(call SetupModuleCompilation,$m))) |
|
569 |
||
570 |
################################################################################ |
|
571 |
# Copy zh_HK properties files from zh_TW |
|
572 |
||
573 |
$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties |
|
574 |
$(install-file) |
|
575 |
||
576 |
define CreateHkTargets |
|
577 |
$(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \ |
|
578 |
$(subst /share/classes,, \ |
|
579 |
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)))) |
|
580 |
endef |
|
581 |
||
582 |
java.sql.rowset: $(call CreateHkTargets, $(java.sql.rowset_CLEAN_FILES)) |
|
583 |
java.rmi: $(call CreateHkTargets, $(java.rmi_CLEAN_FILES)) |
|
584 |
||
585 |
all: $(JAVA_MODULES) |
|
586 |
||
587 |
.PHONY: all $(JAVA_MODULES) |