author | dpochepk |
Tue, 20 Dec 2016 17:35:20 +0300 | |
changeset 42898 | af1346a135ce |
parent 42302 | bf171114688b |
child 42525 | 2c85d6ba308d |
child 42531 | 37ee95196b17 |
permissions | -rw-r--r-- |
25854 | 1 |
# |
36787
402e5e40f6e5
7179078: Remove @beaninfo processing from the makefiles
serb
parents:
36506
diff
changeset
|
2 |
# Copyright (c) 2014, 2016, 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 |
||
35366 | 45 |
java.base_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline |
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 |
||
36506 | 49 |
java.base_EXCLUDE_FILES += \ |
50 |
$(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java |
|
51 |
||
25854 | 52 |
java.base_EXCLUDES += java/lang/doc-files |
53 |
||
54 |
# Exclude BreakIterator classes that are just used in compile process to generate |
|
55 |
# data files and shouldn't go in the product |
|
56 |
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java |
|
57 |
||
34108
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
58 |
ifneq ($(filter solaris macosx linux windows,$(OPENJDK_TARGET_OS)), ) |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
59 |
java.base_EXCLUDE_FILES += \ |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
60 |
sun/nio/ch/AbstractPollSelectorImpl.java \ |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
61 |
sun/nio/ch/PollSelectorImpl.java \ |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
62 |
sun/nio/ch/PollSelectorProvider.java \ |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
63 |
# |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
64 |
endif |
671dd84efa14
8142872: Remove support for sun.nio.ch.PollSelectorProvider from 9
robm
parents:
34102
diff
changeset
|
65 |
|
25854 | 66 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
67 |
java.base_EXCLUDE_FILES += \ |
|
68 |
SolarisLoginModule.java \ |
|
69 |
SolarisSystem.java \ |
|
70 |
# |
|
71 |
endif |
|
72 |
||
73 |
ifeq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), ) |
|
74 |
# |
|
75 |
# only solaris, macosx and aix |
|
76 |
# |
|
77 |
java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java |
|
78 |
endif |
|
79 |
||
80 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
81 |
java.base_EXCLUDE_FILES += \ |
|
82 |
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ |
|
83 |
# |
|
84 |
endif |
|
85 |
||
86 |
################################################################################ |
|
87 |
||
29437
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
88 |
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
|
89 |
|
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
90 |
################################################################################ |
807b7c4a4e62
8075035: Turn on doclint checking of modules in the langtools repo
darcy
parents:
29313
diff
changeset
|
91 |
|
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
92 |
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
|
93 |
java.datatransfer_COPY := flavormap.properties |
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
94 |
|
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
95 |
################################################################################ |
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
96 |
|
37399
ab8e0abb7578
8145468: update java.lang APIs with new deprecations
smarks
parents:
37037
diff
changeset
|
97 |
java.desktop_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference \ |
42137
f6e23798622f
8169518: Suppress Deprecation warnings for deprecated Swing APIs
prr
parents:
41872
diff
changeset
|
98 |
'-Xdoclint/package:java.*,javax.*' -Xlint:exports |
28903
2bf89d675e57
8056298: Separate java.awt.datatransfer from the desktop module
serb
parents:
27602
diff
changeset
|
99 |
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
|
100 |
java.desktop_CLEAN := iio-plugin.properties cursors.properties |
25854 | 101 |
|
102 |
java.desktop_EXCLUDES += \ |
|
103 |
java/awt/doc-files \ |
|
104 |
javax/swing/doc-files \ |
|
105 |
javax/swing/text/doc-files \ |
|
106 |
javax/swing/plaf/synth/doc-files \ |
|
107 |
javax/swing/undo/doc-files \ |
|
108 |
sun/awt/X11/doc-files \ |
|
109 |
# |
|
110 |
||
111 |
java.desktop_EXCLUDE_FILES += \ |
|
112 |
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
|
113 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
114 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
115 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
116 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
117 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
118 |
javax/swing/plaf/nimbus/TabbedPanePainter.java \ |
|
119 |
sun/awt/resources/security-icon-bw16.png \ |
|
120 |
sun/awt/resources/security-icon-bw24.png \ |
|
121 |
sun/awt/resources/security-icon-bw32.png \ |
|
122 |
sun/awt/resources/security-icon-bw48.png \ |
|
123 |
sun/awt/resources/security-icon-interim16.png \ |
|
124 |
sun/awt/resources/security-icon-interim24.png \ |
|
125 |
sun/awt/resources/security-icon-interim32.png \ |
|
126 |
sun/awt/resources/security-icon-interim48.png \ |
|
127 |
sun/awt/resources/security-icon-yellow16.png \ |
|
128 |
sun/awt/resources/security-icon-yellow24.png \ |
|
129 |
sun/awt/resources/security-icon-yellow32.png \ |
|
130 |
sun/awt/resources/security-icon-yellow48.png \ |
|
131 |
sun/awt/X11/java-icon16.png \ |
|
132 |
sun/awt/X11/java-icon24.png \ |
|
133 |
sun/awt/X11/java-icon32.png \ |
|
134 |
sun/awt/X11/java-icon48.png \ |
|
135 |
.template \ |
|
136 |
# |
|
137 |
||
138 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
139 |
# exclude all X11 on Mac. |
|
29671
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
140 |
java.desktop_EXCLUDES += \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
141 |
sun/awt/X11 \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
142 |
sun/java2d/x11 \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
143 |
sun/java2d/jules \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
144 |
sun/java2d/xr \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
145 |
com/sun/java/swing/plaf/gtk \ |
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
146 |
# |
25854 | 147 |
java.desktop_EXCLUDE_FILES += \ |
29671
2f05f44dfe01
8075277: JDK is still building X11 related Java files on OSX
prr
parents:
29169
diff
changeset
|
148 |
$(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
|
149 |
$(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
|
150 |
$(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
|
151 |
$(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \ |
25854 | 152 |
# |
153 |
else |
|
154 |
# TBD: figure out how to eliminate this long list |
|
155 |
java.desktop_EXCLUDE_FILES += \ |
|
156 |
sun/awt/X11/ScreenFormat.java \ |
|
157 |
sun/awt/X11/XArc.java \ |
|
158 |
sun/awt/X11/XChar2b.java \ |
|
159 |
sun/awt/X11/XCharStruct.java \ |
|
160 |
sun/awt/X11/XClassHint.java \ |
|
161 |
sun/awt/X11/XComposeStatus.java \ |
|
162 |
sun/awt/X11/XExtCodes.java \ |
|
163 |
sun/awt/X11/XFontProp.java \ |
|
164 |
sun/awt/X11/XFontSetExtents.java \ |
|
165 |
sun/awt/X11/XFontStruct.java \ |
|
166 |
sun/awt/X11/XGCValues.java \ |
|
167 |
sun/awt/X11/XHostAddress.java \ |
|
168 |
sun/awt/X11/XIMCallback.java \ |
|
169 |
sun/awt/X11/XIMHotKeyTrigger.java \ |
|
170 |
sun/awt/X11/XIMHotKeyTriggers.java \ |
|
171 |
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ |
|
172 |
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ |
|
173 |
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ |
|
174 |
sun/awt/X11/XIMStatusDrawCallbackStruct.java \ |
|
175 |
sun/awt/X11/XIMStringConversionCallbackStruct.java \ |
|
176 |
sun/awt/X11/XIMStringConversionText.java \ |
|
177 |
sun/awt/X11/XIMStyles.java \ |
|
178 |
sun/awt/X11/XIMText.java \ |
|
179 |
sun/awt/X11/XIMValuesList.java \ |
|
180 |
sun/awt/X11/XImage.java \ |
|
181 |
sun/awt/X11/XKeyboardControl.java \ |
|
182 |
sun/awt/X11/XKeyboardState.java \ |
|
183 |
sun/awt/X11/XOMCharSetList.java \ |
|
184 |
sun/awt/X11/XOMFontInfo.java \ |
|
185 |
sun/awt/X11/XOMOrientation.java \ |
|
186 |
sun/awt/X11/XPoint.java \ |
|
187 |
sun/awt/X11/XRectangle.java \ |
|
188 |
sun/awt/X11/XSegment.java \ |
|
189 |
sun/awt/X11/XStandardColormap.java \ |
|
190 |
sun/awt/X11/XTextItem.java \ |
|
191 |
sun/awt/X11/XTextItem16.java \ |
|
192 |
sun/awt/X11/XTextProperty.java \ |
|
193 |
sun/awt/X11/XTimeCoord.java \ |
|
194 |
sun/awt/X11/XWindowChanges.java \ |
|
195 |
sun/awt/X11/XdbeSwapInfo.java \ |
|
196 |
sun/awt/X11/XmbTextItem.java \ |
|
197 |
sun/awt/X11/XwcTextItem.java |
|
198 |
endif |
|
199 |
||
200 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
|
201 |
java.desktop_EXCLUDES += com/sun/java/swing/plaf/gtk |
|
202 |
endif |
|
203 |
||
204 |
ifdef BUILD_HEADLESS_ONLY |
|
205 |
java.desktop_EXCLUDES += sun/applet |
|
206 |
endif |
|
207 |
||
208 |
# Used on windows and macosx |
|
209 |
ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), ) |
|
210 |
java.desktop_EXCLUDE_FILES += sun/awt/AWTCharset.java |
|
211 |
endif |
|
212 |
||
213 |
# These files do not appear in the build result of the old build. This |
|
214 |
# is because they are generated sources, but the AUTO_JAVA_FILES won't |
|
215 |
# pick them up since they aren't generated when the source dirs are |
|
216 |
# searched and they aren't referenced by any other classes so they won't |
|
217 |
# be picked up by implicit compilation. On a rebuild, they are picked up |
|
218 |
# and compiled. Exclude them here to produce the same rt.jar as the old |
|
219 |
# build does when building just once. |
|
220 |
java.desktop_EXCLUDE_FILES += \ |
|
221 |
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
|
222 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
223 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
224 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
225 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
226 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
227 |
javax/swing/plaf/nimbus/TabbedPanePainter.java \ |
|
228 |
# |
|
229 |
||
230 |
################################################################################ |
|
231 |
||
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
232 |
java.scripting_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
27560 | 233 |
java.scripting_COPY := .js |
234 |
java.scripting_CLEAN := .properties |
|
235 |
||
236 |
################################################################################ |
|
237 |
||
29863 | 238 |
java.instrument_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
239 |
||
240 |
################################################################################ |
|
241 |
||
242 |
java.logging_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
243 |
||
244 |
################################################################################ |
|
245 |
||
246 |
java.management_ADD_JAVAC_FLAGS := -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*' |
|
247 |
||
248 |
################################################################################ |
|
249 |
||
250 |
java.prefs_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
|
251 |
||
252 |
################################################################################ |
|
253 |
||
254 |
java.transaction_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
|
255 |
||
256 |
################################################################################ |
|
257 |
||
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
258 |
java.sql_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
25854 | 259 |
java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
260 |
||
261 |
################################################################################ |
|
262 |
||
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
263 |
java.sql.rowset_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
25854 | 264 |
java.sql.rowset_CLEAN_FILES := $(wildcard \ |
265 |
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \ |
|
266 |
$(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties) |
|
267 |
||
268 |
################################################################################ |
|
269 |
||
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
270 |
java.rmi_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
25854 | 271 |
java.rmi_CLEAN_FILES := $(wildcard \ |
272 |
$(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \ |
|
273 |
$(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties) |
|
274 |
||
275 |
################################################################################ |
|
276 |
||
277 |
java.corba_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
278 |
||
279 |
java.corba_COPY := .prp |
|
280 |
java.corba_CLEAN := .properties |
|
281 |
||
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
282 |
java.corba_EXCLUDES += \ |
25854 | 283 |
com/sun/corba/se/PortableActivationIDL \ |
284 |
com/sun/tools/corba/se/logutil \ |
|
285 |
# |
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
286 |
java.corba_EXCLUDE_FILES += \ |
25854 | 287 |
com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ |
288 |
com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ |
|
289 |
com/sun/org/omg/CORBA/IDLTypeOperations.java \ |
|
290 |
com/sun/org/omg/CORBA/IRObjectOperations.java \ |
|
291 |
org/omg/PortableInterceptor/UNKNOWN.java \ |
|
292 |
com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ |
|
293 |
com/sun/corba/se/impl/presentation/rmi/jndi.properties \ |
|
294 |
# |
|
295 |
||
296 |
################################################################################ |
|
297 |
||
298 |
java.xml_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
299 |
java.xml_CLEAN := .properties |
|
300 |
||
301 |
################################################################################ |
|
302 |
||
303 |
java.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
304 |
java.xml.bind_CLEAN := .properties |
|
305 |
||
306 |
################################################################################ |
|
307 |
||
308 |
java.xml.soap_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
309 |
java.xml.soap_CLEAN := .properties |
|
310 |
||
311 |
################################################################################ |
|
312 |
||
313 |
java.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
314 |
java.xml.ws_COPY := .xml |
|
315 |
java.xml.ws_CLEAN := .properties |
|
316 |
||
317 |
################################################################################ |
|
318 |
||
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
319 |
java.naming_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' -Xlint:-exports |
25854 | 320 |
java.naming_CLEAN := jndiprovider.properties |
321 |
||
322 |
################################################################################ |
|
323 |
||
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
324 |
java.security.saaj_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
25854 | 325 |
java.security.saaj_CLEAN := .properties |
326 |
||
327 |
################################################################################ |
|
328 |
||
29863 | 329 |
java.security.jgss_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
330 |
||
331 |
################################################################################ |
|
332 |
||
333 |
java.smartcardio_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
|
334 |
||
335 |
################################################################################ |
|
336 |
||
29313
36f48966bc7a
8072734: Turn on doclint checking in the build of modules in the jdk repo
darcy
parents:
29169
diff
changeset
|
337 |
java.xml.crypto_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*' |
25854 | 338 |
java.xml.crypto_COPY := .dtd .xml |
339 |
java.xml.crypto_CLEAN := .properties |
|
340 |
||
341 |
################################################################################ |
|
342 |
||
343 |
jdk.charsets_COPY := .dat |
|
344 |
||
345 |
################################################################################ |
|
346 |
||
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
347 |
jdk.accessibility_ADD_JAVAC_FLAGS := -Xlint:-exports |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
348 |
|
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
349 |
################################################################################ |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
350 |
|
41661 | 351 |
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*' \ |
36506 | 352 |
-XDstringConcat=inline |
27560 | 353 |
jdk.compiler_CLEAN_FILES := $(wildcard \ |
354 |
$(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ |
|
355 |
sun/tools/serialver/resources)) |
|
25854 | 356 |
|
357 |
################################################################################ |
|
358 |
||
34116
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33723
diff
changeset
|
359 |
jdk.hotspot.agent_ADD_JAVAC_FLAGS := $(DISABLE_WARNINGS),-overrides |
36290 | 360 |
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
|
361 |
|
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33723
diff
changeset
|
362 |
################################################################################ |
b746e382da18
8142336: Convert the SA agent build to modular build-infra makefiles
erikj
parents:
33723
diff
changeset
|
363 |
|
41870
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
364 |
jdk.editpad_COPY := .properties |
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
365 |
|
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
366 |
################################################################################ |
5a5934e56107
8168974: Editor support: include properties file in image
rfield
parents:
41661
diff
changeset
|
367 |
|
31512
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
368 |
jdk.internal.le_COPY := .properties |
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
369 |
|
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
370 |
################################################################################ |
756e4c77cd2d
8080679: Include jline in JDK for Java and JavaScript REPLs
jlahoda
parents:
31310
diff
changeset
|
371 |
|
27595
cff167b3bfa2
8065914: Various improvements and cleanup of build system
ihse
parents:
27586
diff
changeset
|
372 |
jdk.jcmd_COPY := _options |
25854 | 373 |
|
374 |
################################################################################ |
|
375 |
||
34099
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
376 |
jdk.dynalink_CLEAN := .properties |
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
377 |
|
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
378 |
################################################################################ |
64da21aa58f6
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33723
diff
changeset
|
379 |
|
33723
b09ccef0313a
8142367: Allow files with .png extension to be copied for javadoc
bpatel
parents:
33045
diff
changeset
|
380 |
jdk.javadoc_COPY := .xml .css .js .png |
25854 | 381 |
|
382 |
################################################################################ |
|
383 |
||
384 |
jdk.rmic_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
385 |
jdk.rmic_CLEAN := .properties |
|
386 |
||
387 |
################################################################################ |
|
388 |
||
389 |
# No SCTP implementation on Mac OS X or AIX. These classes should be excluded. |
|
390 |
SCTP_IMPL_CLASSES = \ |
|
391 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \ |
|
392 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \ |
|
393 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \ |
|
394 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \ |
|
395 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ |
|
396 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ |
|
397 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \ |
|
398 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \ |
|
399 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \ |
|
400 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \ |
|
401 |
$(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java |
|
402 |
||
403 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
404 |
jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) |
25854 | 405 |
endif |
406 |
||
407 |
ifeq ($(OPENJDK_TARGET_OS),aix) |
|
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
408 |
jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) |
25854 | 409 |
endif |
410 |
||
411 |
################################################################################ |
|
412 |
||
413 |
jdk.jconsole_COPY := .gif .png |
|
414 |
||
415 |
jdk.jconsole_CLEAN_FILES := $(wildcard \ |
|
416 |
$(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties) |
|
417 |
||
418 |
################################################################################ |
|
419 |
||
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
|
420 |
jdk.jdeps_COPY := .txt |
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
|
421 |
|
30742 | 422 |
jdk.jdeps_CLEAN_FILES := $(wildcard \ |
423 |
$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \ |
|
424 |
$(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties) |
|
425 |
||
426 |
################################################################################ |
|
427 |
||
27397
25afb1340d37
8064372: CompileJavaModules overwrites settings from custom
rriggs
parents:
27240
diff
changeset
|
428 |
jdk.jdi_EXCLUDES += \ |
25854 | 429 |
com/sun/tools/example/debug/bdi \ |
430 |
com/sun/tools/example/debug/event \ |
|
431 |
com/sun/tools/example/debug/gui \ |
|
432 |
com/sun/jdi/doc-files \ |
|
433 |
# |
|
434 |
||
435 |
jdk.jdi_EXCLUDE_FILES += jdi-overview.html |
|
436 |
||
437 |
################################################################################ |
|
438 |
||
439 |
jdk.dev_CLEAN_FILES := $(wildcard \ |
|
440 |
$(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \ |
|
441 |
com/sun/tools/script/shell)) |
|
442 |
||
443 |
jdk.dev_COPY := .js oqlhelp.html .txt |
|
444 |
||
445 |
################################################################################ |
|
446 |
||
447 |
jdk.jvmstat_COPY := aliasmap |
|
448 |
||
449 |
################################################################################ |
|
450 |
||
41271
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
451 |
jdk.vm.ci_ADD_JAVAC_FLAGS := -Xlint:-exports |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
452 |
|
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
453 |
################################################################################ |
7d6ee074cd12
8153362: Add javac -Xlint warning to list exposed types which are not accessible
jlahoda
parents:
40783
diff
changeset
|
454 |
|
25854 | 455 |
jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
456 |
jdk.xml.bind_CLEAN := .properties |
|
457 |
jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java |
|
458 |
||
459 |
################################################################################ |
|
460 |
||
461 |
jdk.xml.ws_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS |
|
462 |
jdk.xml.ws_CLEAN := .properties |
|
463 |
||
464 |
################################################################################ |
|
465 |
||
466 |
sun.charsets_COPY := .dat |
|
467 |
||
468 |
################################################################################ |
|
469 |
||
470 |
jdk.localedata_COPY := _dict _th |
|
471 |
# Exclude BreakIterator classes that are just used in compile process to generate |
|
472 |
# 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
|
473 |
jdk.localedata_EXCLUDE_FILES += sun/text/resources/ext/BreakIteratorRules_th.java |
25854 | 474 |
|
475 |
################################################################################ |
|
41658
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
476 |
# 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
|
477 |
# module-info.java. |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
478 |
ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
479 |
$(MODULE)_INCLUDE_FILES := module-info.java |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
480 |
endif |
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
481 |
|
14de1ab85d25
8062810: Examine src.zip in JDK image and decide if source classes should be organized by module
erikj
parents:
41656
diff
changeset
|
482 |
################################################################################ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
483 |
# Setup the compilation for the module |
25854 | 484 |
# |
37030 | 485 |
MODULE_SRC_DIRS := $(call FindModuleSrcDirs, $(MODULE)) |
25854 | 486 |
|
487 |
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying |
|
488 |
# JDK_FILTER at the make command line, only a subset of the JDK java files will |
|
489 |
# be recompiled. If multiple paths are separated by comma, convert that into a |
|
490 |
# space separated list. |
|
491 |
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER))) |
|
38847 | 492 |
ifeq ($(JDK_FILTER), ) |
493 |
FAIL_NO_SRC := true |
|
494 |
else |
|
495 |
# When using JDK_FILTER, most module java compilations will end up finding |
|
496 |
# no source files. Don't let that fail the build. |
|
497 |
FAIL_NO_SRC := false |
|
498 |
endif |
|
25854 | 499 |
|
37030 | 500 |
# Get the complete module source path. |
501 |
MODULESOURCEPATH := $(call GetModuleSrcPath) |
|
31014
a3b1e5a584bd
8054717: SJavac should track changes in the public apis of classpath classes!
alundblad
parents:
30742
diff
changeset
|
502 |
|
37030 | 503 |
# Add imported modules to the modulepath |
504 |
MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) |
|
25854 | 505 |
|
36506 | 506 |
ifeq ($(MODULE), jdk.vm.ci) |
507 |
## WORKAROUND jdk.vm.ci source structure issue |
|
508 |
JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ |
|
509 |
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ |
|
510 |
$(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src))) |
|
37030 | 511 |
MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) |
36506 | 512 |
endif |
513 |
||
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
514 |
$(eval $(call SetupJavaCompilation, $(MODULE), \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
515 |
SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \ |
36506 | 516 |
MODULE := $(MODULE), \ |
517 |
SRC := $(wildcard $(MODULE_SRC_DIRS)), \ |
|
38847 | 518 |
INCLUDES := $(JDK_USER_DEFINED_FILTER), \ |
519 |
FAIL_NO_SRC := $(FAIL_NO_SRC), \ |
|
36506 | 520 |
BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \ |
521 |
HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \ |
|
522 |
ADD_JAVAC_FLAGS := \ |
|
523 |
$($(MODULE)_ADD_JAVAC_FLAGS) \ |
|
40241
59abac94e4f2
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39610
diff
changeset
|
524 |
--module-source-path $(MODULESOURCEPATH) \ |
59abac94e4f2
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39610
diff
changeset
|
525 |
--module-path $(MODULEPATH) \ |
40611
53ba2f7abd45
8160851: Remove old launcher module-related options
mchung
parents:
40241
diff
changeset
|
526 |
--system none, \ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
527 |
)) |
36506 | 528 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
529 |
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA) |
25854 | 530 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
531 |
# 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
|
532 |
# 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
|
533 |
# 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
|
534 |
# 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
|
535 |
# dependency declaration to that by using the *_COMPILE_TARGET variable. |
36506 | 536 |
$($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \ |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
537 |
$(call SetupJavaCompilationCompileTarget, $d, \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
538 |
$(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d))) |
25854 | 539 |
|
540 |
################################################################################ |
|
541 |
# Copy zh_HK properties files from zh_TW |
|
542 |
||
543 |
$(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties |
|
544 |
$(install-file) |
|
545 |
||
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
546 |
CreateHkTargets = \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
547 |
$(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
548 |
$(subst /share/classes,, \ |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
549 |
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)))) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
550 |
|
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
551 |
ifeq ($(MODULE), java.sql.rowset) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
552 |
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
|
553 |
endif |
25854 | 554 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
555 |
ifeq ($(MODULE), java.rmi) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
556 |
TARGETS += $(call CreateHkTargets, $(java.rmi_CLEAN_FILES)) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
557 |
endif |
25854 | 558 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
559 |
################################################################################ |
36506 | 560 |
# If this is an imported module, copy the pre built classes and resources into |
561 |
# the modules output dir |
|
562 |
||
563 |
ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), ) |
|
564 |
$(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \ |
|
565 |
$(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE)) |
|
37037
4fbd14764fa7
8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents:
37030
diff
changeset
|
566 |
$(call MakeDir, $(@D)) |
4fbd14764fa7
8154430: Imported modules rebuilt on second run when nothing has changed
erikj
parents:
37030
diff
changeset
|
567 |
# 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
|
568 |
$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*)) |
36506 | 569 |
$(CP) -R $(IMPORT_MODULES_CLASSES)/$(MODULE)/* $(@D)/ |
570 |
$(TOUCH) $@ |
|
571 |
||
572 |
TARGETS += $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker |
|
573 |
||
574 |
# Add this dependency to avoid a race between compiling module-info.java and |
|
575 |
# importing the classes. |
|
576 |
$($(MODULE)_COMPILE_TARGET): $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker |
|
577 |
endif |
|
578 |
||
579 |
################################################################################ |
|
580 |
||
581 |
$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk)) |
|
582 |
||
583 |
################################################################################ |
|
25854 | 584 |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
585 |
all: $(TARGETS) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
586 |
|
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
34099
diff
changeset
|
587 |
.PHONY: all |