Skip to content

Commit 1bd015f

Browse files
magicusmagicus
committed
8258407: Split up CompileJavaModules.gmk into make/modules/$M/Java.gmk
Reviewed-by: erikj
1 parent 2354882 commit 1bd015f

File tree

47 files changed

+1570
-562
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1570
-562
lines changed

‎make/CompileJavaModules.gmk

Lines changed: 31 additions & 562 deletions
Large diffs are not rendered by default.

‎make/modules/java.base/Java.gmk

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
27+
'-Xdoclint/package:java.*,javax.*'
28+
JAVAC_FLAGS += -XDstringConcat=inline
29+
COPY += .icu .dat .spp .nrm content-types.properties \
30+
hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
31+
CLEAN += intrinsic.properties
32+
33+
EXCLUDE_FILES += \
34+
$(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
35+
36+
EXCLUDES += java/lang/doc-files
37+
38+
# Exclude BreakIterator classes that are just used in compile process to generate
39+
# data files and shouldn't go in the product
40+
EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
41+
42+
ifeq ($(call isTargetOs, macosx aix), false)
43+
EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
44+
endif
45+
46+
ifeq ($(call isTargetOs, windows), true)
47+
EXCLUDE_FILES += \
48+
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
49+
#
50+
endif

‎make/modules/java.compiler/Java.gmk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected \
27+
'-Xdoclint/package:java.*,javax.*'

‎make/modules/java.datatransfer/Java.gmk

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected,-reference \
27+
'-Xdoclint/package:java.*,javax.*'
28+
COPY += flavormap.properties

‎make/modules/java.desktop/Java.gmk

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected,-reference \
27+
'-Xdoclint/package:java.*,javax.*'
28+
COPY += .gif .png .wav .txt .xml .css .pf
29+
CLEAN += iio-plugin.properties cursors.properties
30+
31+
EXCLUDES += \
32+
java/awt/doc-files \
33+
javax/swing/doc-files \
34+
javax/swing/text/doc-files \
35+
javax/swing/plaf/synth/doc-files \
36+
javax/swing/undo/doc-files \
37+
sun/awt/X11/doc-files \
38+
#
39+
40+
EXCLUDE_FILES += \
41+
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
42+
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
43+
javax/swing/plaf/nimbus/ScrollBarPainter.java \
44+
javax/swing/plaf/nimbus/SliderPainter.java \
45+
javax/swing/plaf/nimbus/SpinnerPainter.java \
46+
javax/swing/plaf/nimbus/SplitPanePainter.java \
47+
javax/swing/plaf/nimbus/TabbedPanePainter.java \
48+
sun/awt/resources/security-icon-bw16.png \
49+
sun/awt/resources/security-icon-bw24.png \
50+
sun/awt/resources/security-icon-bw32.png \
51+
sun/awt/resources/security-icon-bw48.png \
52+
sun/awt/resources/security-icon-interim16.png \
53+
sun/awt/resources/security-icon-interim24.png \
54+
sun/awt/resources/security-icon-interim32.png \
55+
sun/awt/resources/security-icon-interim48.png \
56+
sun/awt/resources/security-icon-yellow16.png \
57+
sun/awt/resources/security-icon-yellow24.png \
58+
sun/awt/resources/security-icon-yellow32.png \
59+
sun/awt/resources/security-icon-yellow48.png \
60+
sun/awt/X11/java-icon16.png \
61+
sun/awt/X11/java-icon24.png \
62+
sun/awt/X11/java-icon32.png \
63+
sun/awt/X11/java-icon48.png \
64+
.template \
65+
#
66+
67+
ifeq ($(call isTargetOs, macosx), true)
68+
# exclude all X11 on Mac.
69+
EXCLUDES += \
70+
sun/awt/X11 \
71+
sun/java2d/x11 \
72+
sun/java2d/jules \
73+
sun/java2d/xr \
74+
com/sun/java/swing/plaf/gtk \
75+
#
76+
EXCLUDE_FILES += \
77+
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
78+
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
79+
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
80+
$(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
81+
#
82+
else
83+
# TBD: figure out how to eliminate this long list
84+
EXCLUDE_FILES += \
85+
sun/awt/X11/ScreenFormat.java \
86+
sun/awt/X11/XArc.java \
87+
sun/awt/X11/XChar2b.java \
88+
sun/awt/X11/XCharStruct.java \
89+
sun/awt/X11/XClassHint.java \
90+
sun/awt/X11/XComposeStatus.java \
91+
sun/awt/X11/XExtCodes.java \
92+
sun/awt/X11/XFontProp.java \
93+
sun/awt/X11/XFontSetExtents.java \
94+
sun/awt/X11/XFontStruct.java \
95+
sun/awt/X11/XGCValues.java \
96+
sun/awt/X11/XHostAddress.java \
97+
sun/awt/X11/XIMCallback.java \
98+
sun/awt/X11/XIMHotKeyTrigger.java \
99+
sun/awt/X11/XIMHotKeyTriggers.java \
100+
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
101+
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
102+
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
103+
sun/awt/X11/XIMStatusDrawCallbackStruct.java \
104+
sun/awt/X11/XIMStringConversionCallbackStruct.java \
105+
sun/awt/X11/XIMStringConversionText.java \
106+
sun/awt/X11/XIMStyles.java \
107+
sun/awt/X11/XIMText.java \
108+
sun/awt/X11/XIMValuesList.java \
109+
sun/awt/X11/XImage.java \
110+
sun/awt/X11/XKeyboardControl.java \
111+
sun/awt/X11/XKeyboardState.java \
112+
sun/awt/X11/XOMCharSetList.java \
113+
sun/awt/X11/XOMFontInfo.java \
114+
sun/awt/X11/XOMOrientation.java \
115+
sun/awt/X11/XPoint.java \
116+
sun/awt/X11/XRectangle.java \
117+
sun/awt/X11/XSegment.java \
118+
sun/awt/X11/XStandardColormap.java \
119+
sun/awt/X11/XTextItem.java \
120+
sun/awt/X11/XTextItem16.java \
121+
sun/awt/X11/XTextProperty.java \
122+
sun/awt/X11/XTimeCoord.java \
123+
sun/awt/X11/XWindowChanges.java \
124+
sun/awt/X11/XdbeSwapInfo.java \
125+
sun/awt/X11/XmbTextItem.java \
126+
sun/awt/X11/XwcTextItem.java
127+
endif
128+
129+
ifeq ($(call isTargetOs, windows), true)
130+
EXCLUDES += com/sun/java/swing/plaf/gtk
131+
endif
132+
133+
ifeq ($(call isTargetOs, windows macosx), false)
134+
EXCLUDE_FILES += sun/awt/AWTCharset.java
135+
endif
136+
137+
# These files do not appear in the build result of the old build. This
138+
# is because they are generated sources, but the AUTO_JAVA_FILES won't
139+
# pick them up since they aren't generated when the source dirs are
140+
# searched and they aren't referenced by any other classes so they won't
141+
# be picked up by implicit compilation. On a rebuild, they are picked up
142+
# and compiled. Exclude them here to produce the same rt.jar as the old
143+
# build does when building just once.
144+
EXCLUDE_FILES += \
145+
javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
146+
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
147+
javax/swing/plaf/nimbus/ScrollBarPainter.java \
148+
javax/swing/plaf/nimbus/SliderPainter.java \
149+
javax/swing/plaf/nimbus/SpinnerPainter.java \
150+
javax/swing/plaf/nimbus/SplitPanePainter.java \
151+
javax/swing/plaf/nimbus/TabbedPanePainter.java \
152+
#

‎make/modules/java.instrument/Java.gmk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected,-accessibility \
27+
'-Xdoclint/package:java.*,javax.*'

‎make/modules/java.logging/Java.gmk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
27+
'-Xdoclint/package:java.*,javax.*'

‎make/modules/java.management.rmi/Java.gmk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected \
27+
'-Xdoclint/package:javax.*'

‎make/modules/java.management/Java.gmk

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#
2+
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
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+
DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
27+
'-Xdoclint/package:java.*,javax.*'

0 commit comments

Comments
 (0)