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