author | sundar |
Tue, 25 Feb 2014 18:56:10 +0530 | |
changeset 23083 | 8c74590d5df1 |
parent 22611 | 4dd8f4f14e2c |
child 22937 | f28798de1e6f |
child 23276 | add6f5c93bc6 |
permissions | -rw-r--r-- |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
1 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
2 |
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
4 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
10 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
15 |
# accompanied this code). |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
16 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
20 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
23 |
# questions. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
24 |
# |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
25 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
26 |
default: all |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
27 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
28 |
include $(SPEC) |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
29 |
include MakeBase.gmk |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
30 |
include JavaCompilation.gmk |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
31 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
32 |
# Setup the java compilers for the JDK build. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
33 |
include Setup.gmk |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
34 |
|
12892 | 35 |
JARS := |
36 |
EXFILES := |
|
37 |
EXCLUDES := |
|
38 |
||
39 |
########################################################################################## |
|
40 |
||
20547 | 41 |
EXCLUDES += com/sun/pept \ |
42 |
com/sun/tools/example/trace \ |
|
43 |
com/sun/tools/example/debug/bdi \ |
|
44 |
com/sun/tools/example/debug/event \ |
|
45 |
com/sun/tools/example/debug/gui |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
46 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
47 |
ifdef OPENJDK |
20547 | 48 |
EXCLUDES += sun/dc \ |
49 |
com/sun/jmx/snmp \ |
|
50 |
sun/management/snmp \ |
|
51 |
com/sun/script |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
52 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
53 |
|
12892 | 54 |
ifndef OPENJDK |
20547 | 55 |
# There exists two versions of this file... |
56 |
EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java |
|
13702 | 57 |
|
20547 | 58 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
59 |
# This gets built on unix platforms implicitly in the old build even though |
|
60 |
# it's excluded in the closed build. |
|
61 |
EXCLUDES += sun/java2d/pisces |
|
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
62 |
|
20547 | 63 |
# AccessBridge is compiled separately below. |
64 |
EXFILES += AccessBridge.java \ |
|
65 |
AccessBridgeLoader.java \ |
|
66 |
com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java |
|
67 |
# This seems to never be built |
|
68 |
EXCLUDES += com/sun/java/accessibility/extensions |
|
69 |
endif |
|
13702 | 70 |
|
12892 | 71 |
endif |
72 |
||
20547 | 73 |
ifneq ($(OPENJDK_TARGET_OS), solaris) |
74 |
# Exclude Solaris nio and two security related files in src/share/classes |
|
75 |
EXFILES += SolarisAclFileAttributeView.java \ |
|
76 |
SolarisFileStore.java \ |
|
77 |
SolarisFileSystem.java \ |
|
78 |
SolarisFileSystemProvider.java \ |
|
79 |
SolarisNativeDispatcher.java \ |
|
80 |
SolarisUserDefinedFileAttributeView.java \ |
|
81 |
SolarisWatchService.java \ |
|
82 |
SolarisAclFileAttributeView.java \ |
|
83 |
SolarisLoginModule.java \ |
|
84 |
SolarisSystem.java \ |
|
85 |
sun/nio/ch/DevPollArrayWrapper.java \ |
|
86 |
sun/nio/ch/DevPollSelectorImpl.java \ |
|
87 |
sun/nio/ch/DevPollSelectorProvider.java \ |
|
88 |
sun/nio/ch/EventPortSelectorImpl.java \ |
|
89 |
sun/nio/ch/EventPortSelectorProvider.java \ |
|
90 |
sun/nio/ch/EventPortWrapper.java \ |
|
91 |
sun/nio/ch/SolarisAsynchronousChannelProvider.java \ |
|
92 |
sun/nio/ch/SolarisEventPort.java \ |
|
93 |
sun/tools/attach/SolarisAttachProvider.java \ |
|
94 |
sun/tools/attach/SolarisVirtualMachine.java |
|
15128
296bb1620e00
8005355: build-infra: Java security signing (need a top-level make target).
erikj
parents:
14708
diff
changeset
|
95 |
|
20547 | 96 |
EXCLUDES += com/oracle/security |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
97 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
98 |
|
21130 | 99 |
EXFILES += WrapperGenerator.java |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
100 |
|
20547 | 101 |
ifneq ($(OPENJDK_TARGET_OS), windows) |
102 |
# Exclude Window security related files in src/share/classes |
|
103 |
EXFILES += NTLoginModule.java \ |
|
104 |
NTSystem.java |
|
13702 | 105 |
else |
20547 | 106 |
EXFILES += UnixLoginModule.java \ |
107 |
UnixSystem.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
108 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
109 |
|
20547 | 110 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
111 |
# Don't build GTK L&F on Windows |
|
112 |
EXCLUDES += com/sun/java/swing/plaf/gtk |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
113 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
114 |
|
20547 | 115 |
ifneq ($(OPENJDK_TARGET_OS), linux) |
116 |
EXFILES += sun/tools/attach/LinuxAttachProvider.java \ |
|
117 |
sun/tools/attach/LinuxVirtualMachine.java \ |
|
118 |
sun/nio/ch/EPoll.java \ |
|
119 |
sun/nio/ch/EPollArrayWrapper.java \ |
|
120 |
sun/nio/ch/EPollPort.java \ |
|
121 |
sun/nio/ch/EPollSelectorImpl.java \ |
|
122 |
sun/nio/ch/EPollSelectorProvider.java \ |
|
123 |
sun/nio/ch/LinuxAsynchronousChannelProvider.java \ |
|
124 |
sun/nio/fs/LinuxDosFileAttributeView.java \ |
|
125 |
sun/nio/fs/LinuxFileStore.java \ |
|
126 |
sun/nio/fs/LinuxFileSystem.java \ |
|
127 |
sun/nio/fs/LinuxFileSystemProvider.java \ |
|
128 |
sun/nio/fs/MagicFileTypeDetector.java \ |
|
129 |
sun/nio/fs/LinuxNativeDispatcher.java \ |
|
130 |
sun/nio/fs/LinuxUserDefinedFileAttributeView.java \ |
|
131 |
sun/nio/fs/LinuxWatchService.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
132 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
133 |
|
20547 | 134 |
ifneq ($(OPENJDK_TARGET_OS), macosx) |
135 |
EXFILES += sun/nio/ch/BsdAsynchronousChannelProvider.java \ |
|
136 |
sun/nio/ch/KQueue.java \ |
|
137 |
sun/nio/ch/KQueuePort.java \ |
|
138 |
sun/nio/fs/BsdFileStore.java \ |
|
139 |
sun/nio/fs/BsdFileSystem.java \ |
|
140 |
sun/nio/fs/BsdFileSystemProvider.java \ |
|
141 |
sun/nio/fs/BsdNativeDispatcher.java \ |
|
142 |
sun/nio/fs/MacOSXFileSystemProvider.java \ |
|
143 |
sun/nio/fs/MacOSXFileSystem.java \ |
|
144 |
sun/nio/fs/MacOSXNativeDispatcher.java \ |
|
145 |
sun/tools/attach/BsdAttachProvider.java \ |
|
146 |
sun/tools/attach/BsdVirtualMachine.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
147 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
148 |
|
22593
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
149 |
ifneq ($(OPENJDK_TARGET_OS),aix) |
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
150 |
EXFILES+=sun/nio/ch/AixAsynchronousChannelProvider.java \ |
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
151 |
sun/nio/ch/AixPollPort.java \ |
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
152 |
sun/nio/fs/AixFileStore.java \ |
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
153 |
sun/nio/fs/AixFileSystem.java \ |
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
154 |
sun/nio/fs/AixFileSystemProvider.java \ |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
155 |
sun/nio/fs/AixNativeDispatcher.java \ |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
156 |
sun/tools/attach/AixAttachProvider.java \ |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
157 |
sun/tools/attach/AixVirtualMachine.java |
22593
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
158 |
endif |
938340719ac2
8024900: PPC64: Enable new build on AIX (jdk part)
simonis
parents:
17922
diff
changeset
|
159 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
160 |
# Exclude BreakIterator classes that are just used in compile process to generate |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
161 |
# data files and shouldn't go in the product |
20547 | 162 |
EXFILES += sun/text/resources/BreakIteratorRules.java \ |
163 |
sun/text/resources/BreakIteratorRules_th.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
164 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
165 |
# TODO: Add BUILD_HEADLESS_ONLY to configure? |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
166 |
ifdef BUILD_HEADLESS_ONLY |
20547 | 167 |
EXCLUDES += sun/applet |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
168 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
169 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
170 |
ifdef OPENJDK |
20547 | 171 |
EXCLUDES += sun/java2d/cmm/kcms |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
172 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
173 |
|
12892 | 174 |
# Used on windows and macosx |
20547 | 175 |
ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx)) |
176 |
EXFILES += sun/awt/AWTCharset.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
177 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
178 |
|
21130 | 179 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
180 |
# exclude all X11 on Mac, we can't exclude some like below or we'll have compilation errors |
|
181 |
EXCLUDES += sun/awt/X11 |
|
182 |
else |
|
183 |
# TBD: figure out how to eliminate this long list |
|
20547 | 184 |
EXFILES += sun/awt/X11/ScreenFormat.java \ |
185 |
sun/awt/X11/XArc.java \ |
|
186 |
sun/awt/X11/XChar2b.java \ |
|
187 |
sun/awt/X11/XCharStruct.java \ |
|
188 |
sun/awt/X11/XClassHint.java \ |
|
189 |
sun/awt/X11/XComposeStatus.java \ |
|
190 |
sun/awt/X11/XExtCodes.java \ |
|
191 |
sun/awt/X11/XFontProp.java \ |
|
192 |
sun/awt/X11/XFontSetExtents.java \ |
|
193 |
sun/awt/X11/XFontStruct.java \ |
|
194 |
sun/awt/X11/XGCValues.java \ |
|
195 |
sun/awt/X11/XHostAddress.java \ |
|
196 |
sun/awt/X11/XIMCallback.java \ |
|
197 |
sun/awt/X11/XIMHotKeyTrigger.java \ |
|
198 |
sun/awt/X11/XIMHotKeyTriggers.java \ |
|
199 |
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ |
|
200 |
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ |
|
201 |
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ |
|
202 |
sun/awt/X11/XIMStatusDrawCallbackStruct.java \ |
|
203 |
sun/awt/X11/XIMStringConversionCallbackStruct.java \ |
|
204 |
sun/awt/X11/XIMStringConversionText.java \ |
|
205 |
sun/awt/X11/XIMStyles.java \ |
|
206 |
sun/awt/X11/XIMText.java \ |
|
207 |
sun/awt/X11/XIMValuesList.java \ |
|
208 |
sun/awt/X11/XImage.java \ |
|
209 |
sun/awt/X11/XKeyboardControl.java \ |
|
210 |
sun/awt/X11/XKeyboardState.java \ |
|
211 |
sun/awt/X11/XOMCharSetList.java \ |
|
212 |
sun/awt/X11/XOMFontInfo.java \ |
|
213 |
sun/awt/X11/XOMOrientation.java \ |
|
214 |
sun/awt/X11/XPoint.java \ |
|
215 |
sun/awt/X11/XRectangle.java \ |
|
216 |
sun/awt/X11/XSegment.java \ |
|
217 |
sun/awt/X11/XStandardColormap.java \ |
|
218 |
sun/awt/X11/XTextItem.java \ |
|
219 |
sun/awt/X11/XTextItem16.java \ |
|
220 |
sun/awt/X11/XTextProperty.java \ |
|
221 |
sun/awt/X11/XTimeCoord.java \ |
|
222 |
sun/awt/X11/XWindowChanges.java \ |
|
223 |
sun/awt/X11/XdbeSwapInfo.java \ |
|
224 |
sun/awt/X11/XmbTextItem.java \ |
|
225 |
sun/awt/X11/XwcTextItem.java |
|
12892 | 226 |
endif |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
227 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
228 |
# Exclude another implicitly not included file. |
20547 | 229 |
EXFILES += sun/util/locale/AsciiUtil.java |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
230 |
|
22605
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
231 |
ifeq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx aix)) |
20547 | 232 |
# |
22605
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
233 |
# only solaris, macosx and aix |
20547 | 234 |
# |
235 |
EXFILES += sun/nio/fs/PollingWatchService.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
236 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
237 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
238 |
# TODO: Fix when converting NIO |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
239 |
# Exclude *-linux-arm.java and *-linux-ppc.java from closed. |
20547 | 240 |
EXFILES += -linux-arm.java \ |
241 |
-linux-ppc.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
242 |
|
13164 | 243 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
20547 | 244 |
EXFILES += sun/nio/ch/AbstractPollSelectorImpl.java \ |
245 |
sun/nio/ch/PollSelectorProvider.java \ |
|
246 |
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
247 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
248 |
|
15130
14a47a69bc62
8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents:
15128
diff
changeset
|
249 |
# These files do not appear in the build result of the old build. This |
14a47a69bc62
8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents:
15128
diff
changeset
|
250 |
# is because they are generated sources, but the AUTO_JAVA_FILES won't |
20547 | 251 |
# pick them up since they aren't generated when the source dirs are |
15130
14a47a69bc62
8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents:
15128
diff
changeset
|
252 |
# searched and they aren't referenced by any other classes so they won't |
14a47a69bc62
8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents:
15128
diff
changeset
|
253 |
# be picked up by implicit compilation. On a rebuild, they are picked up |
20547 | 254 |
# and compiled. Exclude them here to produce the same rt.jar as the old |
15130
14a47a69bc62
8005694: build-infra: Cleanup of misc changes in build-infra
erikj
parents:
15128
diff
changeset
|
255 |
# build does when building just once. |
20547 | 256 |
EXFILES += javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ |
257 |
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ |
|
258 |
javax/swing/plaf/nimbus/ScrollBarPainter.java \ |
|
259 |
javax/swing/plaf/nimbus/SliderPainter.java \ |
|
260 |
javax/swing/plaf/nimbus/SpinnerPainter.java \ |
|
261 |
javax/swing/plaf/nimbus/SplitPanePainter.java \ |
|
262 |
javax/swing/plaf/nimbus/TabbedPanePainter.java |
|
12892 | 263 |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
264 |
# Acquire a list of files that should be copied straight over to the classes. |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
265 |
include CopyIntoClasses.gmk |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
266 |
# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
267 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
268 |
ifndef OPENJDK |
20547 | 269 |
CLOSED_SRC_DIRS := $(JDK_TOPDIR)/src/closed/share/classes \ |
270 |
$(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
271 |
endif |
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
272 |
|
12892 | 273 |
MACOSX_SRC_DIRS := |
20547 | 274 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
275 |
MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes |
|
12892 | 276 |
|
20547 | 277 |
# this files are duplicated in MACOSX_SRC_DIRS |
278 |
EXFILES += $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \ |
|
279 |
$(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \ |
|
280 |
$(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \ |
|
281 |
$(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \ |
|
282 |
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \ |
|
20884 | 283 |
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java \ |
284 |
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ |
|
285 |
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ |
|
286 |
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java |
|
13164 | 287 |
|
12892 | 288 |
endif |
289 |
||
21128
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
290 |
# The security classes should not end up in the classes directory as that will prevent them |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
291 |
# from working when running the exploded jdk image. Compile them separately to a different |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
292 |
# directory from where the jars can be created. |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
293 |
SECURITY_PKGS := \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
294 |
com/oracle/security/ucrypto \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
295 |
com/sun/crypto/provider \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
296 |
javax/crypto \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
297 |
sun/security/ec \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
298 |
sun/security/internal \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
299 |
sun/security/mscapi \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
300 |
sun/security/pkcs11 \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
301 |
# |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
302 |
|
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
303 |
AIX_SRC_DIRS := |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
304 |
ifeq ($(OPENJDK_TARGET_OS),aix) |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
305 |
AIX_SRC_DIRS += $(JDK_TOPDIR)/src/aix/classes |
22605
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
306 |
|
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
307 |
# these files are duplicated in AIX_SRC_DIRS |
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
308 |
EXFILES += $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ |
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
309 |
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ |
dba3d6b22818
8031581: PPC64: Addons and fixes for AIX to pass the jdk regression tests
simonis
parents:
22598
diff
changeset
|
310 |
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
311 |
endif |
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
312 |
|
12892 | 313 |
# The exception handling of swing beaninfo |
314 |
# These resources violates the convention of having code and resources together under |
|
315 |
# $(JDK_TOPDIR)/src/.../classes directories |
|
21805 | 316 |
$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif |
16636
1cc691bcfe50
8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents:
15334
diff
changeset
|
317 |
$(call install-file) |
12892 | 318 |
|
13702 | 319 |
# The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying |
320 |
# JDK_FILTER at the make command line, only a subset of the JDK java files will |
|
321 |
# be recompiled. If multiple paths are separated by comma, convert that into a |
|
322 |
# space separated list. |
|
20547 | 323 |
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER))) |
13702 | 324 |
|
21128
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
325 |
ifeq ($(ENABLE_SJAVAC),yes) |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
326 |
# With sjavac enabled, excluded sources are not even considered for linking. |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
327 |
# Explicitly add the security sources to sourcepath for linking. |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
328 |
BUILD_JDK_SOURCEPATH:=$(patsubst %,-i$(SPACE)%.*,$(subst /,.,$(SECURITY_PKGS))) \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
329 |
-sourcepath $(JDK_TOPDIR)/src/share/classes |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
330 |
endif |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
331 |
|
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
332 |
$(eval $(call SetupJavaCompilation,BUILD_JDK,\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
333 |
SETUP:=GENERATE_JDKBYTECODE,\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
334 |
SRC:=$(JDK_TOPDIR)/src/share/classes \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
335 |
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
336 |
$(MACOSX_SRC_DIRS) \ |
22595
aaa6b141196c
8028066: PPC64: 8025715 changes broke AIX build after sync
simonis
parents:
22594
diff
changeset
|
337 |
$(AIX_SRC_DIRS) \ |
21128
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
338 |
$(JDK_OUTPUTDIR)/gensrc \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
339 |
$(JDK_OUTPUTDIR)/gensrc_no_srczip \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
340 |
$(CLOSED_SRC_DIRS),\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
341 |
INCLUDES:=$(JDK_USER_DEFINED_FILTER),\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
342 |
EXCLUDES:=$(EXCLUDES) $(SECURITY_PKGS),\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
343 |
EXCLUDE_FILES:=$(EXFILES),\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
344 |
BIN:=$(JDK_OUTPUTDIR)/classes,\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
345 |
COPY:=$(COPY_PATTERNS),\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
346 |
COPY_FILES:=$(COPY_FILES),\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
347 |
HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers,\ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
348 |
ADD_JAVAC_FLAGS:=$(BUILD_JDK_SOURCEPATH))) |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
349 |
|
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
350 |
########################################################################################## |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
351 |
|
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
352 |
$(eval $(call SetupJavaCompilation,BUILD_SECURITY, \ |
20547 | 353 |
SETUP := GENERATE_JDKBYTECODE, \ |
354 |
SRC := $(JDK_TOPDIR)/src/share/classes \ |
|
21128
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
355 |
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
356 |
$(MACOSX_SRC_DIRS) \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
357 |
$(CLOSED_SRC_DIRS), \ |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
358 |
INCLUDES := $(SECURITY_PKGS), \ |
20547 | 359 |
EXCLUDES := $(EXCLUDES), \ |
360 |
EXCLUDE_FILES := $(EXFILES), \ |
|
21128
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
361 |
BIN := $(JDK_OUTPUTDIR)/classes_security, \ |
20547 | 362 |
HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers)) |
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
363 |
|
21128
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
364 |
$(BUILD_SECURITY): $(BUILD_JDK) |
2a7460bba7a5
8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents:
20884
diff
changeset
|
365 |
|
12892 | 366 |
########################################################################################## |
367 |
||
368 |
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin: |
|
369 |
$(MKDIR) -p $(@D) |
|
370 |
$(TOUCH) $@ |
|
371 |
||
372 |
########################################################################################## |
|
373 |
||
13164 | 374 |
|
375 |
########################################################################################## |
|
376 |
||
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
377 |
ifndef OPENJDK |
20547 | 378 |
ifeq ($(OPENJDK_TARGET_OS), windows) |
379 |
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) |
|
380 |
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32, \ |
|
381 |
SETUP := GENERATE_JDKBYTECODE, \ |
|
382 |
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ |
|
383 |
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \ |
|
384 |
BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit)) |
|
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
385 |
|
20547 | 386 |
$(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK) |
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
387 |
|
20547 | 388 |
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY, \ |
389 |
SETUP := GENERATE_JDKBYTECODE, \ |
|
390 |
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ |
|
391 |
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \ |
|
392 |
BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy)) |
|
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
393 |
|
20547 | 394 |
$(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK) |
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
395 |
|
20547 | 396 |
else |
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
397 |
|
20547 | 398 |
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64, \ |
399 |
SETUP := GENERATE_JDKBYTECODE, \ |
|
400 |
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \ |
|
401 |
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \ |
|
402 |
BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit)) |
|
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
403 |
|
20547 | 404 |
$(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK) |
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
405 |
|
20547 | 406 |
endif |
407 |
endif |
|
15324
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
408 |
endif |
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
409 |
|
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
410 |
########################################################################################## |
74584166bb07
8000839: Integrate the Java Access Bridge with Java Runtime
raginip
parents:
14708
diff
changeset
|
411 |
|
22611
4dd8f4f14e2c
8033111: Clean up left-over JObjC code in build system
ihse
parents:
22607
diff
changeset
|
412 |
all: $(BUILD_JDK) $(BUILD_SECURITY) $(COPY_EXTRA) \ |
20547 | 413 |
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \ |
414 |
$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \ |
|
415 |
$(BUILD_ACCESSBRIDGE_LEGACY) |
|
12317
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
416 |
|
9670c1610c53
7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff
changeset
|
417 |
.PHONY: all |